Use pl_Locked and pl_Unlocked

[vlc] / src / playlist / item.c

diff --git a/src/playlist/item.c b/src/playlist/item.c
index c4e9cac55f4c0f280b3ac2526ad64a7db27e2a4d..6146af93e25b67a7b02366b6a1485f4d3fd20cec 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -87,19 +87,19 @@ static void input_item_subitem_added( const vlc_event_t * p_event,
         if( p_item_in_category->i_children == -1 )
         {
             p_item_in_category = playlist_ItemToNode( p_playlist,
-                    p_item_in_category, true );
+                    p_item_in_category, pl_Locked );
             p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST;
         }
 
         int i_ret = playlist_BothAddInput( p_playlist, p_child,
                 p_item_in_category,
                 PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END,
-                NULL, NULL,  true );
+                NULL, NULL, pl_Locked );
 
         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 );
@@ -313,7 +313,7 @@ void playlist_Clear( playlist_t * p_playlist, bool b_locked )
 int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id )
 {
     playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id,
-                                                    true );
+                                                    pl_Locked );
     if( !p_item ) return VLC_EGENERIC;
     return DeleteInner( p_playlist, p_item, true );
 }