Mercurial > mplayer.hg

changeset 33595:60bfc6c89777

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revise guiGetEvent() calls. Add cast where it is semantically better, remove cast where it isn't necessary.
author ib
date Sun, 19 Jun 2011 23:32:17 +0000
parents eaf69021b2ea
children cb7c33804101
files gui/interface.c gui/ui/actions.c gui/ui/gtk/fileselect.c gui/win32/interface.c
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Sun Jun 19 23:03:30 2011 +0000
+++ b/gui/interface.c	Sun Jun 19 23:32:17 2011 +0000
@@ -664,7 +664,7 @@
         switch (stream->type) {
 #ifdef CONFIG_DVDREAD
         case STREAMTYPE_DVD:
-            guiGetEvent(guiSetDVD, (char *)stream->priv);
+            guiGetEvent(guiSetDVD, stream->priv);
             break;
 #endif
 
--- a/gui/ui/actions.c	Sun Jun 19 23:03:30 2011 +0000
+++ b/gui/ui/actions.c	Sun Jun 19 23:32:17 2011 +0000
@@ -128,7 +128,7 @@
         } 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);
--- a/gui/ui/gtk/fileselect.c	Sun Jun 19 23:03:30 2011 +0000
+++ b/gui/ui/gtk/fileselect.c	Sun Jun 19 23:32:17 2011 +0000
@@ -510,7 +510,7 @@
   }
  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 )
--- a/gui/win32/interface.c	Sun Jun 19 23:03:30 2011 +0000
+++ b/gui/win32/interface.c	Sun Jun 19 23:32:17 2011 +0000
@@ -174,7 +174,7 @@
             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 @@
             {
 #ifdef CONFIG_DVDREAD
                 case STREAMTYPE_DVD:
-                    guiGetEvent(guiSetDVD, (char *) stream->priv);
+                    guiGetEvent(guiSetDVD, stream->priv);
                     break;
 #endif
             }