Mercurial > mplayer.hg

changeset 33695:60093217cb01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename guiGetEvent type guiSetDefaults guiNewFile. It is the counterpart to type guiEndFile.
author ib
date Wed, 29 Jun 2011 14:31:17 +0000
parents 45553d0f65c6
children 24d919fb6778
files gui/interface.c gui/interface.h gui/win32/interface.c mplayer.c
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Wed Jun 29 14:24:39 2011 +0000
+++ b/gui/interface.c	Wed Jun 29 14:31:17 2011 +0000
@@ -579,7 +579,7 @@
         uiState();
         break;
 
-    case guiSetDefaults:
+    case guiNewFile:
 
 // if ( guiInfo.Playing == 1 && guiInfo.FilenameChanged )
         if (guiInfo.FilenameChanged) {
@@ -616,7 +616,7 @@
 
     case guiPreparation:
 
-        guiGetEvent(guiSetDefaults, NULL);
+        guiGetEvent(guiNewFile, NULL);
 
         switch (guiInfo.StreamType) {
         case STREAMTYPE_PLAYLIST:
--- a/gui/interface.h	Wed Jun 29 14:24:39 2011 +0000
+++ b/gui/interface.h	Wed Jun 29 14:31:17 2011 +0000
@@ -46,7 +46,7 @@
 #define guiSetStream       9
 #define guiReDraw          10
 #define guiSetMixer        11
-#define guiSetDefaults     12
+#define guiNewFile         12
 #define guiSetVideo        13
 #define guiPreparation     16
 #define guiSetAfilter      17
--- a/gui/win32/interface.c	Wed Jun 29 14:24:39 2011 +0000
+++ b/gui/win32/interface.c	Wed Jun 29 14:31:17 2011 +0000
@@ -506,7 +506,7 @@
     {
         case guiPreparation:
         {
-            guiGetEvent(guiSetDefaults, NULL);
+            guiGetEvent(guiNewFile, NULL);
             guiInfo.DiskChanged = 0;
             guiInfo.FilenameChanged = 0;
             guiInfo.NewPlay = 0;
@@ -656,7 +656,7 @@
             }
             break;
         }
-        case guiSetDefaults:
+        case guiNewFile:
         {
             audio_id = -1;
             video_id = -1;
--- a/mplayer.c	Wed Jun 29 14:24:39 2011 +0000
+++ b/mplayer.c	Wed Jun 29 14:31:17 2011 +0000
@@ -3090,7 +3090,7 @@
 #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);