Renamed "seekable" into "can-seek" (for consistency).

[vlc] / modules / gui / macosx / controls.m

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 83c406fb46195ad73cd9e06fb1f7c797783264af..8ce9ee1d1905efacd7a818b4b10da963dbc87c6b 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -143,7 +143,7 @@
 - (IBAction)play:(id)sender
 {
     intf_thread_t * p_intf = VLCIntf;
-    playlist_t * p_playlist = pl_Yield( p_intf );
+    playlist_t * p_playlist = pl_Hold( p_intf );
     bool empty;
 
     PL_LOCK;
@@ -158,9 +158,7 @@
     var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE );
 }
 
-/* Small helper method (Private) */
-
-- (id)_voutView
+- (id)voutView
 {
     id window;
     id voutView = nil;
@@ -176,8 +174,8 @@
         /* We have a detached vout */
         else if( [[window className] isEqualToString: @"VLCVoutWindow"] )
         {
-            msg_Dbg( VLCIntf, "detached vout controls.m call getVoutView" );
-            voutView = [window getVoutView];
+            msg_Dbg( VLCIntf, "detached vout controls.m call voutView" );
+            voutView = [window voutView];
         }
     }
     return [[voutView retain] autorelease];
@@ -189,7 +187,7 @@
     var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP );
     /* Close the window directly, because we do know that there
      * won't be anymore video. It's currently waiting a bit. */
-    [[[self _voutView] window] orderOut:self];
+    [[[self voutView] window] orderOut:self];
 }
 
 - (IBAction)faster:(id)sender
@@ -220,7 +218,7 @@
 {
     vlc_value_t val;
     intf_thread_t * p_intf = VLCIntf;
-    playlist_t * p_playlist = pl_Yield( p_intf );
+    playlist_t * p_playlist = pl_Hold( p_intf );
 
     var_Get( p_playlist, "random", &val );
     val.b_bool = !val.b_bool;
@@ -260,7 +258,7 @@
 - (void)shuffle
 {
     vlc_value_t val;
-    playlist_t *p_playlist = pl_Yield( VLCIntf );
+    playlist_t *p_playlist = pl_Hold( VLCIntf );
     var_Get( p_playlist, "random", &val );
     [o_btn_shuffle setState: val.b_bool];
     vlc_object_release( p_playlist );
@@ -270,7 +268,7 @@
 {
     vlc_value_t looping,repeating;
     intf_thread_t * p_intf = VLCIntf;
-    playlist_t * p_playlist = pl_Yield( p_intf );
+    playlist_t * p_playlist = pl_Hold( p_intf );
 
     var_Get( p_playlist, "repeat", &repeating );
     var_Get( p_playlist, "loop", &looping );
@@ -338,7 +336,7 @@
 {
     vlc_value_t val;
     intf_thread_t * p_intf = VLCIntf;
-    playlist_t * p_playlist = pl_Yield( p_intf );
+    playlist_t * p_playlist = pl_Hold( p_intf );
 
     var_Get( p_playlist, "repeat", &val );
     if (!val.b_bool)
@@ -367,7 +365,7 @@
 {
     vlc_value_t val;
     intf_thread_t * p_intf = VLCIntf;
-    playlist_t * p_playlist = pl_Yield( p_intf );
+    playlist_t * p_playlist = pl_Hold( p_intf );
 
     var_Get( p_playlist, "loop", &val );
     if (!val.b_bool)
@@ -506,7 +504,7 @@
     }
     else
     {
-        playlist_t * p_playlist = pl_Yield( VLCIntf );
+        playlist_t * p_playlist = pl_Hold( VLCIntf );
 
         if( [o_title isEqualToString: _NS("Fullscreen")] ||
             [sender isKindOfClass:[NSButton class]] )
@@ -927,7 +925,7 @@
     BOOL bEnabled = TRUE;
     vlc_value_t val;
     intf_thread_t * p_intf = VLCIntf;
-    playlist_t * p_playlist = pl_Yield( p_intf );
+    playlist_t * p_playlist = pl_Hold( p_intf );
     input_thread_t * p_input = playlist_CurrentInput( p_playlist );
 
     if( [[o_mi title] isEqualToString: _NS("Faster")] ||
@@ -985,7 +983,7 @@
     {
         if( p_input != NULL )
         {
-            var_Get( p_input, "seekable", &val);
+            var_Get( p_input, "can-seek", &val);
             bEnabled = val.b_bool;
         }
         else bEnabled = FALSE;