Mercurial > mplayer.hg

changeset 33670:3b3e2d2f68c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename guiGetEvent type guiSetVolume guiSetMixer.
author ib
date Tue, 28 Jun 2011 17:36:19 +0000
parents e7ef5b755462
children a460339acfdf
files gui/interface.c gui/interface.h gui/win32/interface.c mplayer.c
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Tue Jun 28 17:23:37 2011 +0000
+++ b/gui/interface.c	Tue Jun 28 17:36:19 2011 +0000
@@ -684,7 +684,7 @@
         uiEventHandling(evRedraw, 0);
         break;
 
-    case guiSetVolume:
+    case guiSetMixer:
         if (mixer) {
             float l, r;
 
--- a/gui/interface.h	Tue Jun 28 17:23:37 2011 +0000
+++ b/gui/interface.h	Tue Jun 28 17:36:19 2011 +0000
@@ -46,7 +46,7 @@
 #define guiSetVideoWindow  8
 #define guiSetStream       9
 #define guiReDraw          10
-#define guiSetVolume       11
+#define guiSetMixer        11
 #define guiSetDefaults     12
 #define guiSetVideo        13
 #define guiPreparation     16
--- a/gui/win32/interface.c	Tue Jun 28 17:23:37 2011 +0000
+++ b/gui/win32/interface.c	Tue Jun 28 17:36:19 2011 +0000
@@ -731,7 +731,7 @@
             if(gtkAutoSyncOn) autosync = gtkAutoSync;
             break;
         }
-        case guiSetVolume:
+        case guiSetMixer:
         {
             if(audio_out)
             {
--- a/mplayer.c	Tue Jun 28 17:23:37 2011 +0000
+++ b/mplayer.c	Tue Jun 28 17:36:19 2011 +0000
@@ -3995,7 +3995,7 @@
                 else if (mpctx->sh_audio)
                     guiInfo.TimeSec = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
                 guiInfo.LengthInSec = demuxer_get_time_length(mpctx->demuxer);
-                guiGetEvent(guiSetVolume, NULL);
+                guiGetEvent(guiSetMixer, NULL);
                 guiGetEvent(guiReDraw, NULL);
                 if (guiInfo.Playing == GUI_STOP)
                     break;                  // STOP