# HG changeset patch # User ib # Date 1387318339 0 # Node ID 9a28d5c4320af55a599c5fd4f7ea756e25006d38 # Parent e626f90df47e5b9648b3512f6c7341a5028b3d1f Provide GUI_SET_MIXER call with argument. This follows the other GUI_SET calls, all of which are having respective arguments. diff -r e626f90df47e -r 9a28d5c4320a gui/interface.c --- 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; diff -r e626f90df47e -r 9a28d5c4320a mplayer.c --- 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