[MPlayer-cvslog] r33814 - in trunk/gui: interface.c interface.h win32/interface.c

[ib]

Author: ib
Date: Tue Jul  5 12:54:16 2011
New Revision: 33814

Log:
Cosmetic: Rename gui() parameter.

Change it from 'type' to 'what' to point out that it is a request.

Modified:
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/win32/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Tue Jul  5 12:47:51 2011	(r33813)
+++ trunk/gui/interface.c	Tue Jul  5 12:54:16 2011	(r33814)
@@ -548,7 +548,7 @@ static void add_vf(char *str)
     mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_AddingVideoFilter, str);
 }
 
-int gui(int type, void *arg)
+int gui(int what, void *arg)
 {
     mixer_t *mixer = NULL;
     stream_t *stream;
@@ -560,7 +560,7 @@ int gui(int type, void *arg)
     if (guiInfo.mpcontext)
         mixer = mpctx_get_mixer(guiInfo.mpcontext);
 
-    switch (type) {
+    switch (what) {
     case GMP_SET_CONTEXT:
         guiInfo.mpcontext = arg;
         break;

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Tue Jul  5 12:47:51 2011	(r33813)
+++ trunk/gui/interface.h	Tue Jul  5 12:54:16 2011	(r33814)
@@ -235,7 +235,7 @@ void *gtkSet(int cmd, float fparam, void
 void guiDone(void);
 void guiEventHandling(void);
 void guiExit(enum exit_reason how);
-int gui(int type, void *arg);
+int gui(int what, void *arg);
 void guiInit(void);
 void guiLoadFont(void);
 void guiLoadSubtitle(char *name);

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Tue Jul  5 12:47:51 2011	(r33813)
+++ trunk/gui/win32/interface.c	Tue Jul  5 12:54:16 2011	(r33814)
@@ -481,7 +481,7 @@ void guiDone(void)
 }
 
 /* this function gets called by mplayer to update the gui */
-int gui(int type, void *arg)
+int gui(int what, void *arg)
 {
     stream_t *stream = arg;
 #ifdef CONFIG_DVDREAD
@@ -497,7 +497,7 @@ int gui(int type, void *arg)
         playtree = mpctx_get_playtree_iter(guiInfo.mpcontext);
     }
 
-    switch (type)
+    switch (what)
     {
         case GMP_PREPARATION:
         {
@@ -750,7 +750,7 @@ int gui(int type, void *arg)
           break;
         }
         default:
-            mp_msg(MSGT_GPLAYER, MSGL_ERR, "[GUI] GOT UNHANDLED EVENT %i\n", type);
+            mp_msg(MSGT_GPLAYER, MSGL_ERR, "[GUI] GOT UNHANDLED EVENT %i\n", what);
     }
     return 1;
 }