# HG changeset patch # User ib # Date 1395518029 0 # Node ID cbaa08dbc9aab76aa946b5ded2d0644aacfd6fe7 # Parent 22750a12bdc7c2f665ca7fb7d22759a3b25d8650 Cosmetic: Rename GUI_SET_MIXER GUI_SET_VOLUME_BALANCE. It's not the mixer the GUI is interested in. diff -r 22750a12bdc7 -r cbaa08dbc9aa gui/interface.c --- 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; diff -r 22750a12bdc7 -r cbaa08dbc9aa gui/interface.h --- 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 }; diff -r 22750a12bdc7 -r cbaa08dbc9aa gui/win32/interface.c --- 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) { diff -r 22750a12bdc7 -r cbaa08dbc9aa mplayer.c --- 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