Skip to content

V
vlc-2-2
Commit 75975b30 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

macosx: Don't take the playlist lock blindly, where there is no use for it.

parent 44e4691e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
modules/gui/macosx/controls.m
View file @ 75975b30
...@@ -888,8 +888,6 @@ ...@@ -888,8 +888,6 @@
intf_thread_t * p_intf = VLCIntf; intf_thread_t * p_intf = VLCIntf;
playlist_t * p_playlist = pl_Yield( p_intf ); playlist_t * p_playlist = pl_Yield( p_intf );
vlc_object_lock( p_playlist );
#define p_input p_playlist->p_input #define p_input p_playlist->p_input
if( [[o_mi title] isEqualToString: _NS("Faster")] || if( [[o_mi title] isEqualToString: _NS("Faster")] ||
...@@ -916,7 +914,9 @@ ...@@ -916,7 +914,9 @@
[[o_mi title] isEqualToString: _NS("Next")] ) [[o_mi title] isEqualToString: _NS("Next")] )
{ {
/** \todo fix i_size use */ /** \todo fix i_size use */
PL_LOCK;
bEnabled = p_playlist->items.i_size > 1; bEnabled = p_playlist->items.i_size > 1;
PL_UNLOCK;
} }
else if( [[o_mi title] isEqualToString: _NS("Random")] ) else if( [[o_mi title] isEqualToString: _NS("Random")] )
{ {
...@@ -999,7 +999,6 @@ ...@@ -999,7 +999,6 @@
[o_main setupMenus]; /* Make sure video menu is up to date */ [o_main setupMenus]; /* Make sure video menu is up to date */
} }
vlc_object_unlock( p_playlist );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
return( bEnabled ); return( bEnabled );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment