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

[ib]

Author: ib
Date: Wed Jun 29 16:31:17 2011
New Revision: 33783

Log:
Rename guiGetEvent type guiSetDefaults guiNewFile.

It is the counterpart to type guiEndFile.

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

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Wed Jun 29 16:24:39 2011	(r33782)
+++ trunk/gui/interface.c	Wed Jun 29 16:31:17 2011	(r33783)
@@ -579,7 +579,7 @@ int guiGetEvent(int type, void *arg)
         uiState();
         break;
 
-    case guiSetDefaults:
+    case guiNewFile:
 
 // if ( guiInfo.Playing == 1 && guiInfo.FilenameChanged )
         if (guiInfo.FilenameChanged) {
@@ -616,7 +616,7 @@ int guiGetEvent(int type, void *arg)
 
     case guiPreparation:
 
-        guiGetEvent(guiSetDefaults, NULL);
+        guiGetEvent(guiNewFile, NULL);
 
         switch (guiInfo.StreamType) {
         case STREAMTYPE_PLAYLIST:

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Wed Jun 29 16:24:39 2011	(r33782)
+++ trunk/gui/interface.h	Wed Jun 29 16:31:17 2011	(r33783)
@@ -46,7 +46,7 @@ extern int use_gui;             // this 
 #define guiSetStream       9
 #define guiReDraw          10
 #define guiSetMixer        11
-#define guiSetDefaults     12
+#define guiNewFile         12
 #define guiSetVideo        13
 #define guiPreparation     16
 #define guiSetAfilter      17

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Wed Jun 29 16:24:39 2011	(r33782)
+++ trunk/gui/win32/interface.c	Wed Jun 29 16:31:17 2011	(r33783)
@@ -506,7 +506,7 @@ int guiGetEvent(int type, void *arg)
     {
         case guiPreparation:
         {
-            guiGetEvent(guiSetDefaults, NULL);
+            guiGetEvent(guiNewFile, NULL);
             guiInfo.DiskChanged = 0;
             guiInfo.FilenameChanged = 0;
             guiInfo.NewPlay = 0;
@@ -656,7 +656,7 @@ int guiGetEvent(int type, void *arg)
             }
             break;
         }
-        case guiSetDefaults:
+        case guiNewFile:
         {
             audio_id = -1;
             video_id = -1;

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Jun 29 16:24:39 2011	(r33782)
+++ trunk/mplayer.c	Wed Jun 29 16:31:17 2011	(r33783)
@@ -3090,7 +3090,7 @@ play_next_file:
 #ifdef CONFIG_GUI
     if (use_gui) {
         mpctx->file_format = DEMUXER_TYPE_UNKNOWN;
-        guiGetEvent(guiSetDefaults, 0);
+        guiGetEvent(guiNewFile, 0);
         while (guiInfo.Playing != GUI_PLAY) {
             mp_cmd_t *cmd;
             usec_sleep(20000);