Mercurial > mplayer.hg

changeset 35535:dad7efd97bbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Relocate mixer assignment. It need to be set only during a GUI_SET_MIXER call.
author ib
date Sun, 09 Dec 2012 12:16:14 +0000
parents 4cdbc26e4191
children 1c2cb32a4af9
files gui/interface.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Sun Dec 09 09:07:00 2012 +0000
+++ b/gui/interface.c	Sun Dec 09 12:16:14 2012 +0000
@@ -352,9 +352,6 @@
     plItem *next = NULL;
     int msg, state;
 
-    if (guiInfo.mpcontext)
-        mixer = mpctx_get_mixer(guiInfo.mpcontext);
-
     switch (what) {
     case GUI_SET_CONTEXT:
         guiInfo.mpcontext = data;
@@ -740,6 +737,10 @@
         break;
 
     case GUI_SET_MIXER:
+
+        if (guiInfo.mpcontext)
+            mixer = mpctx_get_mixer(guiInfo.mpcontext);
+
         if (mixer) {
             float l, r;
             static float last_balance = -1;