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

[ib]

Author: ib
Date: Tue Oct 10 21:27:01 2017
New Revision: 37996

Log:
Respect a volume change while in ReplayGain playback.

Don't unconditionally reset volume after the end of a ReplayGain
playback. If the user has changed volume in the meantime, proceed
with this new volume.

Modified:
   trunk/gui/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Tue Oct 10 19:57:36 2017	(r37995)
+++ trunk/gui/interface.c	Tue Oct 10 21:27:01 2017	(r37996)
@@ -1042,7 +1042,9 @@ int gui(int what, void *data)
         guiInfo.sh_video = NULL;
 
         if (guiInfo.LastVolume >= 0.0f) {
-            uiEvent(ivSetVolume, guiInfo.LastVolume);
+            if (guiInfo.Volume == guiInfo.ReplayGainVolume)
+                uiEvent(ivSetVolume, guiInfo.LastVolume);
+
             guiInfo.LastVolume = -1.0f;
         }