changeset 33726:a800f30c40d1

Cosmetic: Rename gui() parameter. Change it from 'type' to 'what' to point out that it is a request.

--- a/gui/interface.c	Tue Jul 05 10:47:51 2011 +0000
+++ b/gui/interface.c	Tue Jul 05 10:54:16 2011 +0000
@@ -548,7 +548,7 @@
     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 @@
     if (guiInfo.mpcontext)
         mixer = mpctx_get_mixer(guiInfo.mpcontext);
 
-    switch (type) {
+    switch (what) {
     case GMP_SET_CONTEXT:
         guiInfo.mpcontext = arg;
         break;

--- a/gui/interface.h	Tue Jul 05 10:47:51 2011 +0000
+++ b/gui/interface.h	Tue Jul 05 10:54:16 2011 +0000
@@ -235,7 +235,7 @@
 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);

--- a/gui/win32/interface.c	Tue Jul 05 10:47:51 2011 +0000
+++ b/gui/win32/interface.c	Tue Jul 05 10:54:16 2011 +0000
@@ -481,7 +481,7 @@
 }
 
 /* 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 @@
         playtree = mpctx_get_playtree_iter(guiInfo.mpcontext);
     }
 
-    switch (type)
+    switch (what)
     {
         case GMP_PREPARATION:
         {
@@ -750,7 +750,7 @@
           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;
 }