From: Francois Cartegnie Date: Tue, 30 Mar 2010 17:31:14 +0000 (+0200) Subject: audio_intf: fix initial value on increment (fixes #3482) X-Git-Tag: 1.1.0-pre1~160 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4fe0627faa22938f1753a637cc15fafbc415a078;p=vlc audio_intf: fix initial value on increment (fixes #3482) Signed-off-by: Rémi Denis-Courmont --- diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c index d5e0ba78d4..f7c0f489e6 100644 --- a/src/audio_output/intf.c +++ b/src/audio_output/intf.c @@ -106,12 +106,14 @@ int doVolumeChanges( unsigned action, vlc_object_t * p_object, int i_nb_steps, b_var_mute = var_GetBool( p_object, "volume-muted"); - const bool b_unmute_condition = ( /* Also unmute on increments */ + const bool b_unmute_condition = ( b_var_mute + && ( /* Unmute: on increments */ ( action == INCREMENT_VOLUME ) || /* On explicit unmute */ - ( ( action == SET_MUTE ) && ( b_var_mute && !b_mute ) ) + ( ( action == SET_MUTE ) && !b_mute ) || /* On toggle from muted */ - ( ( action == TOGGLE_MUTE ) && b_var_mute ) ); + ( action == TOGGLE_MUTE ) + )); const bool b_mute_condition = ( !b_var_mute && ( /* explicit */