[MPlayer-cvslog] r37042 - in trunk: gui/interface.c gui/interface.h gui/win32/interface.c mplayer.c

[ib]

Author: ib
Date: Sat Mar 22 20:53:49 2014
New Revision: 37042

Log:
Cosmetic: Rename GUI_SET_MIXER GUI_SET_VOLUME_BALANCE.

It's not the mixer the GUI is interested in.

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

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sat Mar 22 20:48:39 2014	(r37041)
+++ trunk/gui/interface.c	Sat Mar 22 20:53:49 2014	(r37042)
@@ -736,7 +736,7 @@ int gui(int what, void *data)
 
         break;
 
-    case GUI_SET_MIXER:
+    case GUI_SET_VOLUME_BALANCE:
 
         mixer = data;
 

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Sat Mar 22 20:48:39 2014	(r37041)
+++ trunk/gui/interface.h	Sat Mar 22 20:53:49 2014	(r37042)
@@ -48,9 +48,9 @@ enum {
     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
 };
 

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Sat Mar 22 20:48:39 2014	(r37041)
+++ trunk/gui/win32/interface.c	Sat Mar 22 20:53:49 2014	(r37042)
@@ -743,7 +743,7 @@ int gui(int what, void *data)
         }
         case GUI_RUN_MESSAGE:
           break;
-        case GUI_SET_MIXER:
+        case GUI_SET_VOLUME_BALANCE:
         {
             if(audio_out)
             {

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sat Mar 22 20:48:39 2014	(r37041)
+++ trunk/mplayer.c	Sat Mar 22 20:53:49 2014	(r37042)
@@ -4035,7 +4035,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, &mpctx->mixer);
+                gui(GUI_SET_VOLUME_BALANCE, &mpctx->mixer);
                 gui(GUI_REDRAW, 0);
                 if (guiInfo.Playing == GUI_STOP)
                     break;                  // STOP