[MPlayer-cvslog] r33736 - in trunk: command.c libvo/x11_common.c mplayer.c

[ib]

Author: ib
Date: Mon Jun 27 12:29:34 2011
New Revision: 33736

Log:
Cast arg in guiGetEvent() to void * or remove cast where unnecessary.

Modified:
   trunk/command.c
   trunk/libvo/x11_common.c
   trunk/mplayer.c

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Mon Jun 27 12:04:05 2011	(r33735)
+++ trunk/command.c	Mon Jun 27 12:29:34 2011	(r33736)
@@ -1075,7 +1075,7 @@ static int mp_property_fullscreen(m_opti
     case M_PROPERTY_STEP_DOWN:
 #ifdef CONFIG_GUI
         if (use_gui)
-            guiGetEvent(guiIEvent, (char *) MP_CMD_VO_FULLSCREEN);
+            guiGetEvent(guiIEvent, (void *) MP_CMD_VO_FULLSCREEN);
         else
 #endif
         if (vo_config_count)

Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c	Mon Jun 27 12:04:05 2011	(r33735)
+++ trunk/libvo/x11_common.c	Mon Jun 27 12:29:34 2011	(r33736)
@@ -821,7 +821,7 @@ int vo_x11_check_events(Display * mydisp
 #ifdef CONFIG_GUI
         if (use_gui)
         {
-            guiGetEvent(0, (char *) &Event);
+            guiGetEvent(0, &Event);
             if (vo_window != Event.xany.window)
                 continue;
         }

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Mon Jun 27 12:04:05 2011	(r33735)
+++ trunk/mplayer.c	Mon Jun 27 12:29:34 2011	(r33736)
@@ -584,7 +584,7 @@ void uninit_player(unsigned int mask)
             uninit_audio(mpctx->sh_audio);
 #ifdef CONFIG_GUI
         if (use_gui)
-            guiGetEvent(guiSetAfilter, (char *)NULL);
+            guiGetEvent(guiSetAfilter, NULL);
 #endif
         mpctx->sh_audio      = NULL;
         mpctx->mixer.afilter = NULL;
@@ -1334,7 +1334,7 @@ static int build_afilter_chain(sh_audio_
     if (!sh_audio) {
 #ifdef CONFIG_GUI
         if (use_gui)
-            guiGetEvent(guiSetAfilter, (char *)NULL);
+            guiGetEvent(guiSetAfilter, NULL);
 #endif
         mpctx->mixer.afilter = NULL;
         return 0;
@@ -1359,7 +1359,7 @@ static int build_afilter_chain(sh_audio_
     mpctx->mixer.afilter = sh_audio->afilter;
 #ifdef CONFIG_GUI
     if (use_gui)
-        guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter);
+        guiGetEvent(guiSetAfilter, sh_audio->afilter);
 #endif
     return result;
 }
@@ -3097,7 +3097,7 @@ play_next_file:
             guiEventHandling();
             guiGetEvent(guiReDraw, NULL);
             if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) {
-                guiGetEvent(guiIEvent, (char *)cmd->id);
+                guiGetEvent(guiIEvent, (void *)cmd->id);
                 mp_cmd_free(cmd);
             }
         }
@@ -3244,7 +3244,7 @@ play_next_file:
 
 #ifdef CONFIG_GUI
     if (use_gui)
-        guiGetEvent(guiSetStream, (char *)mpctx->stream);
+        guiGetEvent(guiSetStream, mpctx->stream);
 #endif
 
     if (mpctx->file_format == DEMUXER_TYPE_PLAYLIST) {
@@ -3679,13 +3679,13 @@ goto_enable_cache:
         if (use_gui) {
             guiInfo.AudioChannels = mpctx->sh_audio ? mpctx->sh_audio->channels : 0;
             if (!mpctx->sh_video && mpctx->sh_audio)
-                guiGetEvent(guiSetAudioOnly, (char *)1);
+                guiGetEvent(guiSetAudioOnly, (void *)1);
             else
-                guiGetEvent(guiSetAudioOnly, (char *)0);
-            guiGetEvent(guiSetFileFormat, (char *)mpctx->demuxer->file_format);
-            if (guiGetEvent(guiSetValues, (char *)mpctx->sh_video))
+                guiGetEvent(guiSetAudioOnly, (void *)0);
+            guiGetEvent(guiSetFileFormat, (void *)mpctx->demuxer->file_format);
+            if (guiGetEvent(guiSetValues, mpctx->sh_video))
                 goto goto_next_file;
-            guiGetEvent(guiSetDemuxer, (char *)mpctx->demuxer);
+            guiGetEvent(guiSetDemuxer, mpctx->demuxer);
         }
 #endif