[vlc-commits] macosx: remove now unneeded volume osd hack

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Fri May 25 18:51:47 2012 +0200| [8c341e8c37307b2b8fc9fbfa2ca5b4c40031cadd] | committer: David Fuhrmann

macosx: remove now unneeded volume osd hack
(cherry picked from commit 506ef92b9445bc3cf43dc5630c45958312e3cd84)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=8c341e8c37307b2b8fc9fbfa2ca5b4c40031cadd
---

 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