[MPlayer-cvslog] r37029 - in trunk/gui: app/app.h ui/actions.c win32/skinload.h

[ib]

Author: ib
Date: Fri Mar 21 15:42:48 2014
New Revision: 37029

Log:
Add an internal event to set volume.

It does what the external one does except for
triggering the OSD display.

Modified:
   trunk/gui/app/app.h
   trunk/gui/ui/actions.c
   trunk/gui/win32/skinload.h

Modified: trunk/gui/app/app.h
==============================================================================
--- trunk/gui/app/app.h	Fri Mar 21 15:33:50 2014	(r37028)
+++ trunk/gui/app/app.h	Fri Mar 21 15:42:48 2014	(r37029)
@@ -81,6 +81,7 @@ enum {
     ivSetDVDAudio,
     ivSetDVDSubtitle,
     ivPlayDVD,
+    ivSetVolume,
     ivShowPopUpMenu,
     ivHidePopUpMenu,
     ivRedraw

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Fri Mar 21 15:33:50 2014	(r37028)
+++ trunk/gui/ui/actions.c	Fri Mar 21 15:42:48 2014	(r37029)
@@ -323,6 +323,7 @@ play:
         break;
 
     case evSetVolume:
+    case ivSetVolume:
         guiInfo.Volume = param;
         {
             float l = guiInfo.Volume * (100.0 - guiInfo.Balance) / 50.0;
@@ -330,6 +331,9 @@ play:
             mixer_setvolume(mixer, FFMIN(l, guiInfo.Volume), FFMIN(r, guiInfo.Volume));
         }
 
+        if (ev == evSetVolume)
+            break;
+
         if (osd_level) {
             osd_visible = (GetTimerMS() + 1000) | 1;
             vo_osd_progbar_type  = OSD_VOLUME;

Modified: trunk/gui/win32/skinload.h
==============================================================================
--- trunk/gui/win32/skinload.h	Fri Mar 21 15:33:50 2014	(r37028)
+++ trunk/gui/win32/skinload.h	Fri Mar 21 15:42:48 2014	(r37029)
@@ -192,6 +192,7 @@ enum
   ivSetDVDAudio,
   ivSetDVDSubtitle,
   ivPlayDVD,
+  ivSetVolume,
   ivShowPopUpMenu,
   ivHidePopUpMenu,
   ivRedraw