[vlc-devel] commit: libvlc: fix volume on sound increment when muted ( Francois Cartegnie )

[git version control]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Jan 12 22:48:16 2010 +0100| [bf6b2d1d910e1d0837e19dbb27f3615084ead90b] | committer: Jean-Baptiste Kempf 

libvlc: fix volume on sound increment when muted

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bf6b2d1d910e1d0837e19dbb27f3615084ead90b
---

 src/audio_output/intf.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 0424b88..db55c4a 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;