Commit 8c341e8c authored by David Fuhrmann's avatar David Fuhrmann

macosx: remove now unneeded volume osd hack

(cherry picked from commit 506ef92b)
Signed-off-by: default avatarDavid Fuhrmann <david.fuhrmann@googlemail.com>
parent bbb63fe9
...@@ -470,17 +470,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil; ...@@ -470,17 +470,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
} }
} }
- (void)displayVolume
{
vout_thread_t *p_vout = getVout();
if( p_vout )
{
vout_OSDMessage( p_vout, SPU_DEFAULT_CHANNEL, _( "Volume %d%%" ),
[self volume]*100/AOUT_VOLUME_DEFAULT );
vlc_object_release( p_vout );
}
}
- (void)volumeUp - (void)volumeUp
{ {
intf_thread_t *p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
...@@ -488,7 +477,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil; ...@@ -488,7 +477,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
return; return;
aout_VolumeUp( pl_Get( p_intf ), 1, NULL ); aout_VolumeUp( pl_Get( p_intf ), 1, NULL );
[self displayVolume];
} }
- (void)volumeDown - (void)volumeDown
...@@ -498,7 +486,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil; ...@@ -498,7 +486,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
return; return;
aout_VolumeDown( pl_Get( p_intf ), 1, NULL ); aout_VolumeDown( pl_Get( p_intf ), 1, NULL );
[self displayVolume];
} }
- (void)mute - (void)mute
...@@ -508,19 +495,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil; ...@@ -508,19 +495,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
return; return;
aout_ToggleMute( pl_Get( p_intf ), NULL ); aout_ToggleMute( pl_Get( p_intf ), NULL );
vout_thread_t *p_vout = getVout();
if( p_vout )
{
if( [self isMuted] )
{
vout_OSDIcon( p_vout, SPU_DEFAULT_CHANNEL, OSD_MUTE_ICON );
}
else
[self displayVolume];
vlc_object_release( p_vout );
}
} }
- (BOOL)isMuted - (BOOL)isMuted
......
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