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

[ib]

Author: ib
Date: Tue Jun 28 19:36:19 2011
New Revision: 33758

Log:
Rename guiGetEvent type guiSetVolume guiSetMixer.

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	Tue Jun 28 19:23:37 2011	(r33757)
+++ trunk/gui/interface.c	Tue Jun 28 19:36:19 2011	(r33758)
@@ -684,7 +684,7 @@ int guiGetEvent(int type, void *arg)
         uiEventHandling(evRedraw, 0);
         break;
 
-    case guiSetVolume:
+    case guiSetMixer:
         if (mixer) {
             float l, r;
 

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Tue Jun 28 19:23:37 2011	(r33757)
+++ trunk/gui/interface.h	Tue Jun 28 19:36:19 2011	(r33758)
@@ -46,7 +46,7 @@ extern int use_gui;             // this 
 #define guiSetVideoWindow  8
 #define guiSetStream       9
 #define guiReDraw          10
-#define guiSetVolume       11
+#define guiSetMixer        11
 #define guiSetDefaults     12
 #define guiSetVideo        13
 #define guiPreparation     16

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Tue Jun 28 19:23:37 2011	(r33757)
+++ trunk/gui/win32/interface.c	Tue Jun 28 19:36:19 2011	(r33758)
@@ -731,7 +731,7 @@ int guiGetEvent(int type, void *arg)
             if(gtkAutoSyncOn) autosync = gtkAutoSync;
             break;
         }
-        case guiSetVolume:
+        case guiSetMixer:
         {
             if(audio_out)
             {

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Tue Jun 28 19:23:37 2011	(r33757)
+++ trunk/mplayer.c	Tue Jun 28 19:36:19 2011	(r33758)
@@ -3995,7 +3995,7 @@ goto_enable_cache:
                 else if (mpctx->sh_audio)
                     guiInfo.TimeSec = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
                 guiInfo.LengthInSec = demuxer_get_time_length(mpctx->demuxer);
-                guiGetEvent(guiSetVolume, NULL);
+                guiGetEvent(guiSetMixer, NULL);
                 guiGetEvent(guiReDraw, NULL);
                 if (guiInfo.Playing == GUI_STOP)
                     break;                  // STOP