Mercurial > mplayer.hg

changeset 36454:9a28d5c4320a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Provide GUI_SET_MIXER call with argument. This follows the other GUI_SET calls, all of which are having respective arguments.
author ib
date Tue, 17 Dec 2013 22:12:19 +0000
parents e626f90df47e
children c9fb71a139bb
files gui/interface.c mplayer.c
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Tue Dec 17 18:46:48 2013 +0000
+++ b/gui/interface.c	Tue Dec 17 22:12:19 2013 +0000
@@ -310,7 +310,7 @@
     dvd_priv_t *dvd;
 #endif
     int msg, state;
-    mixer_t *mixer = NULL;
+    mixer_t *mixer;
     plItem *next   = NULL;
 
     switch (what) {
@@ -696,7 +696,7 @@
             guiInfo.VideoHeight = 0;
         }
 
-        gui(GUI_SET_MIXER, 0);
+        gui(GUI_SET_MIXER, mpctx_get_mixer(guiInfo.mpcontext));
 
         if (gtkEnableAudioEqualizer) {
             equalizer_t eq;
@@ -730,8 +730,7 @@
 
     case GUI_SET_MIXER:
 
-        if (guiInfo.mpcontext)
-            mixer = mpctx_get_mixer(guiInfo.mpcontext);
+        mixer = data;
 
         if (mixer) {
             float l, r, b;
--- a/mplayer.c	Tue Dec 17 18:46:48 2013 +0000
+++ b/mplayer.c	Tue Dec 17 22:12:19 2013 +0000
@@ -4021,7 +4021,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, 0);
+                gui(GUI_SET_MIXER, &mpctx->mixer);
                 gui(GUI_REDRAW, 0);
                 if (guiInfo.Playing == GUI_STOP)
                     break;                  // STOP