vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Oct 22 20:14:54 2013 +0300| [4dd7f02c1633ab201913a94340194eafa94928a9] | committer: Rémi Denis-Courmont
hotkeys: show intended rather than current mute status > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4dd7f02c1633ab201913a94340194eafa94928a9 --- modules/control/hotkeys.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index e23156e..ec21bec 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -286,18 +286,24 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) break; } case ACTIONID_VOL_MUTE: - if( playlist_MuteToggle( p_playlist ) == 0 ) + { + int mute = playlist_MuteGet( p_playlist ); + if( mute < 0 ) + break; + mute = !mute; + if( playlist_MuteSet( p_playlist, mute ) ) + break; + + float vol = playlist_VolumeGet( p_playlist ); + if( mute || vol == 0.f ) { - float vol = playlist_VolumeGet( p_playlist ); - if( playlist_MuteGet( p_playlist ) > 0 || vol == 0.f ) - { - ClearChannels( p_intf, p_vout ); - DisplayIcon( p_vout, OSD_MUTE_ICON ); - } - else - DisplayVolume( p_intf, p_vout, vol ); + ClearChannels( p_intf, p_vout ); + DisplayIcon( p_vout, OSD_MUTE_ICON ); } + else + DisplayVolume( p_intf, p_vout, vol ); break; + } case ACTIONID_AUDIODEVICE_CYCLE: { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
