Skip to content

V
vlc-2-2
Commit 53dfe2b3 authored by David Fuhrmann's avatar David Fuhrmann Committed by Felix Paul Kühne
Browse files
Options

macosx: proper gui update when toogle mute state 

Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 1e042a44
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
modules/gui/macosx/MainWindow.m
View file @ 53dfe2b3
...@@ -750,10 +750,6 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -750,10 +750,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
else if (sender == o_volume_down_btn) else if (sender == o_volume_down_btn)
{ {
[[VLCCoreInteraction sharedInstance] mute]; [[VLCCoreInteraction sharedInstance] mute];
[o_volume_sld setIntValue: 0];
BOOL b_mute = ![[VLCCoreInteraction sharedInstance] isMuted];
[o_volume_sld setEnabled: b_mute];
[o_volume_up_btn setEnabled: b_mute];
} }
else else
[[VLCCoreInteraction sharedInstance] setVolume: AOUT_VOLUME_MAX]; [[VLCCoreInteraction sharedInstance] setVolume: AOUT_VOLUME_MAX];
...@@ -1096,13 +1092,19 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1096,13 +1092,19 @@ static VLCMainWindow *_o_sharedInstance = nil;
playlist_t * p_playlist = pl_Get( VLCIntf ); playlist_t * p_playlist = pl_Get( VLCIntf );
i_volume = aout_VolumeGet( p_playlist ); i_volume = aout_VolumeGet( p_playlist );
BOOL b_muted = [[VLCCoreInteraction sharedInstance] isMuted];
if( i_volume != i_lastShownVolume ) if( !b_muted )
{ {
i_lastShownVolume = i_volume; i_lastShownVolume = i_volume;
[o_volume_sld setIntValue: i_volume]; [o_volume_sld setIntValue: i_volume];
[o_fspanel setVolumeLevel: i_volume]; [o_fspanel setVolumeLevel: i_volume];
} }
else
[o_volume_sld setIntValue: 0];
[o_volume_sld setEnabled: !b_muted];
[o_volume_up_btn setEnabled: !b_muted];
} }
- (void)updateName - (void)updateName
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment