[MPlayer-cvslog] r36550 - in trunk: gui/interface.c mplayer.c

[ib]

Author: ib
Date: Tue Dec 17 23:12:19 2013
New Revision: 36550

Log:
Provide GUI_SET_MIXER call with argument.

This follows the other GUI_SET calls,
all of which are having respective arguments.

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

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Tue Dec 17 19:46:48 2013	(r36549)
+++ trunk/gui/interface.c	Tue Dec 17 23:12:19 2013	(r36550)
@@ -310,7 +310,7 @@ int gui(int what, void *data)
     dvd_priv_t *dvd;
 #endif
     int msg, state;
-    mixer_t *mixer = NULL;
+    mixer_t *mixer;
     plItem *next   = NULL;
 
     switch (what) {
@@ -696,7 +696,7 @@ int gui(int what, void *data)
             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 @@ int gui(int what, void *data)
 
     case GUI_SET_MIXER:
 
-        if (guiInfo.mpcontext)
-            mixer = mpctx_get_mixer(guiInfo.mpcontext);
+        mixer = data;
 
         if (mixer) {
             float l, r, b;

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Tue Dec 17 19:46:48 2013	(r36549)
+++ trunk/mplayer.c	Tue Dec 17 23:12:19 2013	(r36550)
@@ -4021,7 +4021,7 @@ goto_enable_cache:
                 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