# HG changeset patch # User ib # Date 1395412968 0 # Node ID fec1a036882c4abe23e8eb606af0d262bd09930b # Parent d762d49a47e0e922fd2f97a42c61836ea47b46fb Add an internal event to set volume. It does what the external one does except for triggering the OSD display. diff -r d762d49a47e0 -r fec1a036882c gui/app/app.h --- a/gui/app/app.h Fri Mar 21 14:33:50 2014 +0000 +++ b/gui/app/app.h Fri Mar 21 14:42:48 2014 +0000 @@ -81,6 +81,7 @@ ivSetDVDAudio, ivSetDVDSubtitle, ivPlayDVD, + ivSetVolume, ivShowPopUpMenu, ivHidePopUpMenu, ivRedraw diff -r d762d49a47e0 -r fec1a036882c gui/ui/actions.c --- a/gui/ui/actions.c Fri Mar 21 14:33:50 2014 +0000 +++ b/gui/ui/actions.c Fri Mar 21 14:42:48 2014 +0000 @@ -323,6 +323,7 @@ break; case evSetVolume: + case ivSetVolume: guiInfo.Volume = param; { float l = guiInfo.Volume * (100.0 - guiInfo.Balance) / 50.0; @@ -330,6 +331,9 @@ 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; diff -r d762d49a47e0 -r fec1a036882c gui/win32/skinload.h --- a/gui/win32/skinload.h Fri Mar 21 14:33:50 2014 +0000 +++ b/gui/win32/skinload.h Fri Mar 21 14:42:48 2014 +0000 @@ -192,6 +192,7 @@ ivSetDVDAudio, ivSetDVDSubtitle, ivPlayDVD, + ivSetVolume, ivShowPopUpMenu, ivHidePopUpMenu, ivRedraw