There is no need to reload the playlist on every single cycle of the manage thread...

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

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 7a8d41b8af8965658c38eea4ff5969e3abd1dfd7..b59df439d11c5023db725849b8ff67615de33282 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -121,16 +121,16 @@
     intf_thread_t * p_intf = VLCIntf;
     playlist_t * p_playlist = pl_Yield( p_intf );
 
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
     if( playlist_IsEmpty( p_playlist ) )
     {
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        vlc_object_unlock( p_playlist );
         vlc_object_release( p_playlist );
         [o_main intfOpenFileGeneric: (id)sender];
     }
     else
     {
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        vlc_object_unlock( p_playlist );
         vlc_object_release( p_playlist );
     }
 
@@ -224,8 +224,8 @@
         config_PutInt( p_playlist, "random", 0 );
     }
 
-    p_intf->p_sys->b_playmode_update = VLC_TRUE;
-    p_intf->p_sys->b_intf_update = VLC_TRUE;
+    p_intf->p_sys->b_playmode_update = true;
+    p_intf->p_sys->b_intf_update = true;
     vlc_object_release( p_playlist );
 }
 
@@ -271,8 +271,8 @@
         [self repeatOne];
  
         /* prepare core communication */
-        repeating.b_bool = VLC_TRUE;
-        looping.b_bool = VLC_FALSE;
+        repeating.b_bool = true;
+        looping.b_bool = false;
         config_PutInt( p_playlist, "repeat", 1 );
         config_PutInt( p_playlist, "loop", 0 );
  
@@ -287,8 +287,8 @@
         [self repeatAll];
  
         /* prepare core communication */
-        repeating.b_bool = VLC_FALSE;
-        looping.b_bool = VLC_TRUE;
+        repeating.b_bool = false;
+        looping.b_bool = true;
         config_PutInt( p_playlist, "repeat", 0 );
         config_PutInt( p_playlist, "loop", 1 );
  
@@ -303,8 +303,8 @@
         [self repeatOff];
  
         /* prepare core communication */
-        repeating.b_bool = VLC_FALSE;
-        looping.b_bool = VLC_FALSE;
+        repeating.b_bool = false;
+        looping.b_bool = false;
         config_PutInt( p_playlist, "repeat", 0 );
         config_PutInt( p_playlist, "loop", 0 );
  
@@ -315,8 +315,8 @@
     /* communicate with core and the main intf loop */
     var_Set( p_playlist, "repeat", repeating );
     var_Set( p_playlist, "loop", looping );
-    p_intf->p_sys->b_playmode_update = VLC_TRUE;
-    p_intf->p_sys->b_intf_update = VLC_TRUE;
+    p_intf->p_sys->b_playmode_update = true;
+    p_intf->p_sys->b_intf_update = true;
 
     vlc_object_release( p_playlist );
 }
@@ -346,8 +346,8 @@
         config_PutInt( p_playlist, "repeat", 0 );
     }
  
-    p_intf->p_sys->b_playmode_update = VLC_TRUE;
-    p_intf->p_sys->b_intf_update = VLC_TRUE;
+    p_intf->p_sys->b_playmode_update = true;
+    p_intf->p_sys->b_intf_update = true;
     vlc_object_release( p_playlist );
 }
 
@@ -375,8 +375,8 @@
         config_PutInt( p_playlist, "loop", 0 );
     }
 
-    p_intf->p_sys->b_playmode_update = VLC_TRUE;
-    p_intf->p_sys->b_intf_update = VLC_TRUE;
+    p_intf->p_sys->b_playmode_update = true;
+    p_intf->p_sys->b_intf_update = true;
     vlc_object_release( p_playlist );
 }
 
@@ -623,7 +623,7 @@
         [self setupVarMenu: o_menu forMenuItem: o_mi target:p_object
                         var:psz_variable selector:pf_callback];
  
-        if( text.psz_string ) free( text.psz_string );
+        free( text.psz_string );
         return;
     }
 
@@ -645,12 +645,12 @@
         break;
 
     default:
-        if( text.psz_string ) free( text.psz_string );
+        free( text.psz_string );
         return;
     }
 
     if( ( i_type & VLC_VAR_TYPE ) == VLC_VAR_STRING ) free( val.psz_string );
-    if( text.psz_string ) free( text.psz_string );
+    free( text.psz_string );
 }
 
 
@@ -793,7 +793,7 @@
         var_Set( p_object, strdup([o_data name]), [o_data value] );
         vlc_object_release( p_object );
         [o_pool release];
-        return VLC_TRUE;
+        return true;
     }
     [o_pool release];
     return VLC_EGENERIC;
@@ -886,7 +886,7 @@
     intf_thread_t * p_intf = VLCIntf;
     playlist_t * p_playlist = pl_Yield( p_intf );
 
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
 
 #define p_input p_playlist->p_input
 
@@ -997,7 +997,7 @@
         [o_main setupMenus]; /* Make sure video menu is up to date */
     }
 
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist );
     vlc_object_release( p_playlist );
 
     return( bEnabled );