[MPlayer-cvslog] r33683 - in trunk/gui: interface.c ui/actions.c ui/gtk/fileselect.c win32/interface.c

[ib]

Author: ib
Date: Mon Jun 20 01:32:17 2011
New Revision: 33683

Log:
Revise guiGetEvent() calls.

Add cast where it is semantically better,
remove cast where it isn't necessary.

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/gtk/fileselect.c
   trunk/gui/win32/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Mon Jun 20 01:03:30 2011	(r33682)
+++ trunk/gui/interface.c	Mon Jun 20 01:32:17 2011	(r33683)
@@ -664,7 +664,7 @@ int guiGetEvent(int type, void *arg)
         switch (stream->type) {
 #ifdef CONFIG_DVDREAD
         case STREAMTYPE_DVD:
-            guiGetEvent(guiSetDVD, (char *)stream->priv);
+            guiGetEvent(guiSetDVD, stream->priv);
             break;
 #endif
 

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Mon Jun 20 01:03:30 2011	(r33682)
+++ trunk/gui/ui/actions.c	Mon Jun 20 01:32:17 2011	(r33683)
@@ -128,7 +128,7 @@ void uiEnd(void)
         } else
             wsVisibleWindow(&guiApp.subWindow, wsHideWindow);
 
-        guiGetEvent(guiCEvent, guiSetStop);
+        guiGetEvent(guiCEvent, (void *)guiSetStop);
         uiSubRender = 1;
         wsSetBackgroundRGB(&guiApp.subWindow, guiApp.sub.R, guiApp.sub.G, guiApp.sub.B);
         wsClearWindow(guiApp.subWindow);

Modified: trunk/gui/ui/gtk/fileselect.c
==============================================================================
--- trunk/gui/ui/gtk/fileselect.c	Mon Jun 20 01:03:30 2011	(r33682)
+++ trunk/gui/ui/gtk/fileselect.c	Mon Jun 20 01:32:17 2011	(r33683)
@@ -510,7 +510,7 @@ static void fs_Ok_released( GtkButton * 
   }
  if ( i ) fsTopList_items=g_list_prepend( fsTopList_items,(gchar *)get_current_dir_name_utf8() );
  if ( uiMainAutoPlay ) { uiMainAutoPlay=0; uiEventHandling( evPlay,0 ); }
-  else guiGetEvent( guiCEvent,guiSetStop );
+  else guiGetEvent( guiCEvent,(void *) guiSetStop );
 }
 
 static void fs_Cancel_released( GtkButton * button,gpointer user_data )

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Mon Jun 20 01:03:30 2011	(r33682)
+++ trunk/gui/win32/interface.c	Mon Jun 20 01:32:17 2011	(r33683)
@@ -174,7 +174,7 @@ static void guiSetEvent(int event)
             GetVolumeInformation(dvd_device, dvdname, MAX_PATH, NULL, NULL, NULL, NULL, 0);
             capitalize(dvdname);
             mp_msg(MSGT_GPLAYER, MSGL_V, "Opening DVD %s -> %s\n", dvd_device, dvdname);
-            guiGetEvent(guiSetParameters, (char *) STREAMTYPE_DVD);
+            guiGetEvent(guiSetParameters, (void *) STREAMTYPE_DVD);
             mygui->playlist->clear_playlist(mygui->playlist);
             mygui->playlist->add_track(mygui->playlist, filename, NULL, dvdname, 0);
             mygui->startplay(mygui);
@@ -631,7 +631,7 @@ int guiGetEvent(int type, void *arg)
             {
 #ifdef CONFIG_DVDREAD
                 case STREAMTYPE_DVD:
-                    guiGetEvent(guiSetDVD, (char *) stream->priv);
+                    guiGetEvent(guiSetDVD, stream->priv);
                     break;
 #endif
             }