Mercurial > mplayer.hg

changeset 36946:cbaa08dbc9aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Rename GUI_SET_MIXER GUI_SET_VOLUME_BALANCE. It's not the mixer the GUI is interested in.
author ib
date Sat, 22 Mar 2014 19:53:49 +0000
parents 22750a12bdc7
children 382af432ec40
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	Sat Mar 22 19:48:39 2014 +0000
+++ b/gui/interface.c	Sat Mar 22 19:53:49 2014 +0000
@@ -736,7 +736,7 @@
 
         break;
 
-    case GUI_SET_MIXER:
+    case GUI_SET_VOLUME_BALANCE:
 
         mixer = data;
 
--- a/gui/interface.h	Sat Mar 22 19:48:39 2014 +0000
+++ b/gui/interface.h	Sat Mar 22 19:53:49 2014 +0000
@@ -48,9 +48,9 @@
     GUI_SETUP_VIDEO_WINDOW,
     GUI_SET_AUDIO,
     GUI_SET_CONTEXT,
-    GUI_SET_MIXER,
     GUI_SET_STATE,
     GUI_SET_STREAM,
+    GUI_SET_VOLUME_BALANCE,
     GUI_SET_VIDEO
 };
 
--- a/gui/win32/interface.c	Sat Mar 22 19:48:39 2014 +0000
+++ b/gui/win32/interface.c	Sat Mar 22 19:53:49 2014 +0000
@@ -743,7 +743,7 @@
         }
         case GUI_RUN_MESSAGE:
           break;
-        case GUI_SET_MIXER:
+        case GUI_SET_VOLUME_BALANCE:
         {
             if(audio_out)
             {
--- a/mplayer.c	Sat Mar 22 19:48:39 2014 +0000
+++ b/mplayer.c	Sat Mar 22 19:53:49 2014 +0000
@@ -4035,7 +4035,7 @@
                 else if (mpctx->sh_audio)
                     guiInfo.ElapsedTime = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
                 guiInfo.RunningTime = demuxer_get_time_length(mpctx->demuxer);
-                gui(GUI_SET_MIXER, &mpctx->mixer);
+                gui(GUI_SET_VOLUME_BALANCE, &mpctx->mixer);
                 gui(GUI_REDRAW, 0);
                 if (guiInfo.Playing == GUI_STOP)
                     break;                  // STOP