From: Pierre d'Herbemont <pdherbemont@videolan.org>
Date: Sat, 12 Jul 2008 12:15:30 +0000 (+0200)
Subject: macosx: One more direct playlist access removal.
X-Git-Tag: 0.9.0-test2~48
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5c3f5dbd9dbe2949d1b1dce648de516d82b95a3d;p=vlc

macosx: One more direct playlist access removal.
---

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 8b63c6570d..c68b57517b 100644
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -887,8 +887,7 @@
     vlc_value_t val;
     intf_thread_t * p_intf = VLCIntf;
     playlist_t * p_playlist = pl_Yield( p_intf );
-
-#define p_input p_playlist->p_input
+    input_thread_t * p_input = playlist_CurrentInput( p_playlist );
 
     if( [[o_mi title] isEqualToString: _NS("Faster")] ||
         [[o_mi title] isEqualToString: _NS("Slower")] )
@@ -908,6 +907,7 @@
         {
             bEnabled = FALSE;
         }
+        [o_main setupMenus]; /* Make sure input menu is up to date */
     }
     else if( [[o_mi title] isEqualToString: _NS("Previous")] ||
              [[o_mi title] isEqualToString: _NS("Next")] )
@@ -998,6 +998,7 @@
         [o_main setupMenus]; /* Make sure video menu is up to date */
     }
 
+    if( p_input ) vlc_object_release( p_input );
     vlc_object_release( p_playlist );
 
     return( bEnabled );