Use pl_Locked and pl_Unlocked.

[vlc] / src / playlist / item.c

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 5d09181b2285218bb7fb5a54ed9a9cab8b64c1b3..d9d9e9dd958288bafd5934e2b91e867ab7042272 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -99,7 +99,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event,
         if( i_ret == VLC_SUCCESS && b_play )
         {
             playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
-                          true, p_item_in_category, NULL );
+                          pl_Locked, p_item_in_category, NULL );
         }
     }
 
@@ -252,8 +252,8 @@ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id,
  * \param b_locked TRUE if the playlist is locked
  * \return VLC_SUCCESS or VLC_EGENERIC
  */
-int playlist_DeleteInputInParent( playlist_t *p_playlist, int i_input_id,
-                                  playlist_item_t *p_root, bool b_locked )
+int playlist_DeleteFromInputInParent( playlist_t *p_playlist, int i_input_id,
+                                      playlist_item_t *p_root, bool b_locked )
 {
     int i_ret;
     PL_LOCK_IF( !b_locked );
@@ -452,13 +452,10 @@ int playlist_BothAddInput( playlist_t *p_playlist,
     int i_top;
     assert( p_input );
 
-    PL_LOCK_IF( !b_locked );
-
     if( !vlc_object_alive( p_playlist ) )
-    {
-        PL_UNLOCK_IF( !b_locked );
         return VLC_EGENERIC;
-    }
+
+    PL_LOCK_IF( !b_locked );
 
     /* Add to category */
     p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input );