From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Tue, 12 Jan 2010 21:48:16 +0000 (+0100)
Subject: libvlc: fix volume on sound increment when muted
X-Git-Tag: 1.1.0-ff~1261
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bf6b2d1d910e1d0837e19dbb27f3615084ead90b;p=vlc

libvlc: fix volume on sound increment when muted

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 0424b888fb..db55c4ade4 100644
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -118,8 +118,9 @@ int doVolumeChanges( unsigned action, vlc_object_t * p_object, int i_nb_steps,
     {
         i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
 
-        i_volume = config_GetInt( p_object, "volume" )
-                   + i_volume_step * i_nb_steps;
+        if ( !b_unmute_condition )
+            i_volume = config_GetInt( p_object, "volume" );
+        i_volume += i_volume_step * i_nb_steps;
 
         if ( i_volume > AOUT_VOLUME_MAX )
             i_volume = AOUT_VOLUME_MAX;