[MPlayer-cvslog] r35629 - trunk/gui/interface.c

[ib]

Author: ib
Date: Sun Dec  9 13:16:14 2012
New Revision: 35629

Log:
Relocate mixer assignment.

It need to be set only during a GUI_SET_MIXER call.

Modified:
   trunk/gui/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Dec  9 10:07:00 2012	(r35628)
+++ trunk/gui/interface.c	Sun Dec  9 13:16:14 2012	(r35629)
@@ -352,9 +352,6 @@ int gui(int what, void *data)
     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 @@ int gui(int what, void *data)
         break;
 
     case GUI_SET_MIXER:
+
+        if (guiInfo.mpcontext)
+            mixer = mpctx_get_mixer(guiInfo.mpcontext);
+
         if (mixer) {
             float l, r;
             static float last_balance = -1;