vlc | branch: master | David Fuhrmann <[email protected]> | Fri May 25 18:51:47 2012 +0200| [506ef92b9445bc3cf43dc5630c45958312e3cd84] | committer: David Fuhrmann
macosx: remove now unneeded volume osd hack > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=506ef92b9445bc3cf43dc5630c45958312e3cd84 --- modules/gui/macosx/CoreInteraction.m | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/modules/gui/macosx/CoreInteraction.m b/modules/gui/macosx/CoreInteraction.m index 475c389..580dd5d 100644 --- a/modules/gui/macosx/CoreInteraction.m +++ b/modules/gui/macosx/CoreInteraction.m @@ -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 { intf_thread_t *p_intf = VLCIntf; @@ -488,7 +477,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil; return; aout_VolumeUp( pl_Get( p_intf ), 1, NULL ); - [self displayVolume]; } - (void)volumeDown @@ -498,7 +486,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil; return; aout_VolumeDown( pl_Get( p_intf ), 1, NULL ); - [self displayVolume]; } - (void)mute @@ -508,19 +495,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil; return; 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 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
