[MPlayer-cvslog] r33747 - in trunk: command.c gui/interface.c gui/interface.h gui/win32/interface.c mplayer.c

[ib]

Author: ib
Date: Mon Jun 27 21:39:57 2011
New Revision: 33747

Log:
Rename guiGetEvent type guiIEvent guiRunCommand.

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

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Mon Jun 27 21:25:04 2011	(r33746)
+++ trunk/command.c	Mon Jun 27 21:39:57 2011	(r33747)
@@ -1075,7 +1075,7 @@ static int mp_property_fullscreen(m_opti
     case M_PROPERTY_STEP_DOWN:
 #ifdef CONFIG_GUI
         if (use_gui)
-            guiGetEvent(guiIEvent, (void *) MP_CMD_VO_FULLSCREEN);
+            guiGetEvent(guiRunCommand, (void *) MP_CMD_VO_FULLSCREEN);
         else
 #endif
         if (vo_config_count)

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Mon Jun 27 21:25:04 2011	(r33746)
+++ trunk/gui/interface.c	Mon Jun 27 21:39:57 2011	(r33747)
@@ -667,9 +667,9 @@ int guiGetEvent(int type, void *arg)
 
         break;
 
-    case guiIEvent:
+    case guiRunCommand:
 
-        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] guiIEvent: %d\n", (int)arg);
+        mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[interface] guiRunCommand: %d\n", (int)arg);
 
         switch ((int)arg) {
         case MP_CMD_QUIT:

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Mon Jun 27 21:25:04 2011	(r33746)
+++ trunk/gui/interface.h	Mon Jun 27 21:39:57 2011	(r33747)
@@ -38,7 +38,7 @@ extern int use_gui;             // this 
 
 #define guiXEvent          0
 #define guiSetState        1
-#define guiIEvent          2
+#define guiRunCommand      2
 #define guiSetDVD          3
 #define guiSetFileName     4
 #define guiSetAudioOnly    6

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Mon Jun 27 21:25:04 2011	(r33746)
+++ trunk/gui/win32/interface.c	Mon Jun 27 21:39:57 2011	(r33747)
@@ -678,7 +678,7 @@ int guiGetEvent(int type, void *arg)
             }
             break;
         }
-        case guiIEvent:
+        case guiRunCommand:
         {
             mp_msg(MSGT_GPLAYER,MSGL_V, "cmd: %d\n", (int) arg);
             /* MPlayer asks us to quit */

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Mon Jun 27 21:25:04 2011	(r33746)
+++ trunk/mplayer.c	Mon Jun 27 21:39:57 2011	(r33747)
@@ -3097,7 +3097,7 @@ play_next_file:
             guiEventHandling();
             guiGetEvent(guiReDraw, NULL);
             if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) {
-                guiGetEvent(guiIEvent, (void *)cmd->id);
+                guiGetEvent(guiRunCommand, (void *)cmd->id);
                 mp_cmd_free(cmd);
             }
         }