playlist: make playlist_DeleteFromInput delete container nodes as well

and refactor playlist code for optimization

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 0dc9f1089befd87ae24f7fc03c2047020a723f47..f6a7528a521ac74890f8158ceece6a0f4d08a40c 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -35,8 +35,6 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
 static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
                            playlist_item_t *, playlist_item_t * );
 static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item );
-static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
-                        bool b_stop );
 
 static playlist_item_t *ItemToNode( playlist_t *, playlist_item_t *, bool );
 
@@ -239,24 +237,11 @@ int playlist_ItemRelease( playlist_item_t *p_item )
 static int DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input,
                             playlist_item_t *p_root, bool b_do_stop )
 {
-    int i;
     PL_ASSERT_LOCKED;
-    for( i = 0 ; i< p_root->i_children ; i++ )
-    {
-        if( p_root->pp_children[i]->i_children == -1 &&
-            p_root->pp_children[i]->p_input == p_input )
-        {
-            DeleteInner( p_playlist, p_root->pp_children[i], b_do_stop );
-            return VLC_SUCCESS;
-        }
-        else if( p_root->pp_children[i]->i_children >= 0 )
-        {
-            int i_ret = DeleteFromInput( p_playlist, p_input,
-                                         p_root->pp_children[i], b_do_stop );
-            if( i_ret == VLC_SUCCESS ) return VLC_SUCCESS;
-        }
-    }
-    return VLC_EGENERIC;
+    playlist_item_t *p_item = playlist_ItemFindFromInputAndRoot(
+        p_playlist, p_input, p_root, false );
+    if( !p_item ) return VLC_EGENERIC;
+    return playlist_DeleteItem( p_playlist, p_item, b_do_stop );
 }
 
 /**
@@ -332,7 +317,7 @@ int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id )
     PL_ASSERT_LOCKED;
     playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
     if( !p_item ) return VLC_EGENERIC;
-    return DeleteInner( p_playlist, p_item, true );
+    return playlist_DeleteItem( p_playlist, p_item, true );
 }
 
 /***************************************************************************
@@ -880,7 +865,7 @@ static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item )
 }
 
 /* Do the actual removal */
-static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
+int playlist_DeleteItem( playlist_t * p_playlist, playlist_item_t *p_item,
                         bool b_stop )
 {
     int i;
@@ -891,6 +876,7 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
     {
         return playlist_NodeDelete( p_playlist, p_item, true, false );
     }
+
     pl_priv(p_playlist)->b_reset_currently_playing = true;
     var_SetInteger( p_playlist, "playlist-item-deleted", i_id );
 

diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index 6a46b4945fff13dfc039f159c65bcce5d84511f7..efe3c5b5c7c724f37ee96d90d066c47d7a8fd19d 100644 (file)
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -145,6 +145,7 @@ int playlist_ItemRelease( playlist_item_t * );
 
 void playlist_NodesPairCreate( playlist_t *, const char *, playlist_item_t **, playlist_item_t **, bool );
 int playlist_NodeEmpty( playlist_t *, playlist_item_t *, bool );
+int playlist_DeleteItem( playlist_t * p_playlist, playlist_item_t *, bool);
 
 
 /**

diff --git a/src/playlist/tree.c b/src/playlist/tree.c
index 2ab2bacc758261833530675ac64e40d2c13399fc..54fb47e1afb7e48cfbd267f1c64ca94b1cb12128 100644 (file)
--- a/src/playlist/tree.c
+++ b/src/playlist/tree.c
@@ -153,8 +153,7 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
         }
         else if( b_delete_items )
         {
-            playlist_DeleteFromItemId( p_playlist,
-                                       p_root->pp_children[i]->i_id );
+            playlist_DeleteItem( p_playlist, p_root->pp_children[i], true );
         }
     }
     /* Delete the node */