X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Ftree.c;h=1eab637c0ab5aa5467e2a02f5f29b8ea7d7d5101;hb=0ea77dfd682d73ec7e1b0c089dc52d1de8e9e690;hp=49d077630747ce9a497231f72a14e5cae80e4cf0;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc

diff --git a/src/playlist/tree.c b/src/playlist/tree.c
index 49d0776307..1eab637c0a 100644
--- a/src/playlist/tree.c
+++ b/src/playlist/tree.c
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <assert.h>
 #include "vlc_playlist.h"
 #include "playlist_internal.h"
@@ -59,17 +59,18 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist,
                                        playlist_item_t *p_parent, int i_flags,
                                        input_item_t *p_input )
 {
-    input_item_t *p_new_input;
+    input_item_t *p_new_input = NULL;
     playlist_item_t *p_item;
 
+    PL_ASSERT_LOCKED;
     if( !psz_name ) psz_name = _("Undefined");
 
     if( !p_input )
-        p_new_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), NULL,
-                                        psz_name, 0, NULL, -1, ITEM_TYPE_NODE );
-    p_item = playlist_ItemNewFromInput( VLC_OBJECT(p_playlist),
+        p_new_input = input_item_NewWithType( VLC_OBJECT(p_playlist), NULL,
+                                        psz_name, 0, NULL, 0, -1, ITEM_TYPE_NODE );
+    p_item = playlist_ItemNewFromInput( p_playlist,
                                         p_input ? p_input : p_new_input );
-    if( !p_input )
+    if( p_new_input )
         vlc_gc_decref( p_new_input );
 
     if( p_item == NULL )  return NULL;
@@ -98,6 +99,7 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist,
 int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root,
                         bool b_delete_items )
 {
+    PL_ASSERT_LOCKED;
     int i;
     if( p_root->i_children == -1 )
     {
@@ -133,6 +135,7 @@ int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root,
 int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
                          bool b_delete_items, bool b_force )
 {
+    PL_ASSERT_LOCKED;
     int i;
 
     if( p_root->i_children == -1 )
@@ -161,7 +164,7 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
     else
     {
         int i;
-        var_SetInteger( p_playlist, "item-deleted", p_root->i_id );
+        var_SetInteger( p_playlist, "playlist-item-deleted", p_root->i_id );
         ARRAY_BSEARCH( p_playlist->all_items, ->i_id, int,
                        p_root->i_id, i );
         if( i != -1 )
@@ -171,7 +174,7 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
         if( p_root->p_parent )
             playlist_NodeRemoveItem( p_playlist, p_root, p_root->p_parent );
 
-        playlist_ItemDelete( p_root );
+        playlist_ItemRelease( p_root );
     }
     return VLC_SUCCESS;
 }
@@ -197,6 +200,7 @@ int playlist_NodeInsert( playlist_t *p_playlist,
                          playlist_item_t *p_parent,
                          int i_position )
 {
+    PL_ASSERT_LOCKED;
    (void)p_playlist;
    assert( p_parent && p_parent->i_children != -1 );
    if( i_position == -1 ) i_position = p_parent->i_children ;
@@ -221,6 +225,7 @@ int playlist_NodeRemoveItem( playlist_t *p_playlist,
                         playlist_item_t *p_item,
                         playlist_item_t *p_parent )
 {
+    PL_ASSERT_LOCKED;
    (void)p_playlist;
 
    for(int i= 0; i< p_parent->i_children ; i++ )
@@ -234,34 +239,6 @@ int playlist_NodeRemoveItem( playlist_t *p_playlist,
    return VLC_SUCCESS;
 }
 
-
-/**
- * Count the children of a node
- *
- * \param p_playlist the playlist
- * \param p_node the node
- * \return the number of children
- */
-int playlist_NodeChildrenCount( playlist_t *p_playlist, playlist_item_t*p_node)
-{
-    int i;
-    int i_nb = 0;
-
-    if( p_node->i_children == -1 )
-        return 0;
-
-    i_nb = p_node->i_children;
-    for( i=0 ; i< p_node->i_children;i++ )
-    {
-        if( p_node->pp_children[i]->i_children == -1 )
-            break;
-        else
-            i_nb += playlist_NodeChildrenCount( p_playlist,
-                                                p_node->pp_children[i] );
-    }
-    return i_nb;
-}
-
 /**
  * Search a child of a node by its name
  *
@@ -272,6 +249,8 @@ int playlist_NodeChildrenCount( playlist_t *p_playlist, playlist_item_t*p_node)
 playlist_item_t *playlist_ChildSearchName( playlist_item_t *p_node,
                                            const char *psz_search )
 {
+    playlist_t * p_playlist = p_node->p_playlist; /* For assert_locked */
+    PL_ASSERT_LOCKED;
     int i;
 
     if( p_node->i_children < 0 )
@@ -302,6 +281,7 @@ void playlist_NodesPairCreate( playlist_t *p_playlist, const char *psz_name,
                                playlist_item_t **pp_node_one,
                                bool b_for_sd )
 {
+    PL_ASSERT_LOCKED;
     *pp_node_cat = playlist_NodeCreate( p_playlist, psz_name,
                                         p_playlist->p_root_category, 0, NULL );
     *pp_node_one = playlist_NodeCreate( p_playlist, psz_name,
@@ -319,18 +299,16 @@ void playlist_NodesPairCreate( playlist_t *p_playlist, const char *psz_name,
 /**
  * Get the node in the preferred tree from a node in one of category
  * or onelevel tree.
- * For example, for the SAP node, it will return the node in the category
- * tree if --playlist-tree is not set to never, because the SAP node prefers
- * category
  */
 playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
                                              playlist_item_t *p_node )
 {
+    PL_ASSERT_LOCKED;
     int i;
     if( p_node->p_parent == p_playlist->p_root_category )
     {
-        if( p_playlist->b_always_tree ||
-            p_node->p_input->b_prefers_tree ) return p_node;
+        if( pl_priv(p_playlist)->b_tree || p_node->p_input->b_prefers_tree )
+            return p_node;
         for( i = 0 ; i< p_playlist->p_root_onelevel->i_children; i++ )
         {
             if( p_playlist->p_root_onelevel->pp_children[i]->p_input->i_id ==
@@ -340,7 +318,7 @@ playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
     }
     else if( p_node->p_parent == p_playlist->p_root_onelevel )
     {
-        if( p_playlist->b_never_tree || !p_node->p_input->b_prefers_tree )
+        if( !pl_priv(p_playlist)->b_tree || !p_node->p_input->b_prefers_tree )
             return p_node;
         for( i = 0 ; i< p_playlist->p_root_category->i_children; i++ )
         {
@@ -359,6 +337,7 @@ playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
 playlist_item_t *playlist_GetLastLeaf(playlist_t *p_playlist,
                                       playlist_item_t *p_root )
 {
+    PL_ASSERT_LOCKED;
     int i;
     playlist_item_t *p_item;
     for ( i = p_root->i_children - 1; i >= 0; i-- )
@@ -378,24 +357,6 @@ playlist_item_t *playlist_GetLastLeaf(playlist_t *p_playlist,
     return NULL;
 }
 
-int playlist_GetAllEnabledChildren( playlist_t *p_playlist,
-                                    playlist_item_t *p_node,
-                                    playlist_item_t ***ppp_items )
-{
-    int i_count = 0;
-    playlist_item_t *p_next = NULL;
-    while( 1 )
-    {
-        p_next = playlist_GetNextLeaf( p_playlist, p_node,
-                                       p_next, true, false );
-        if( p_next )
-            INSERT_ELEM( *ppp_items, i_count, i_count, p_next );
-        else
-            break;
-    }
-    return i_count;
-}
-
 /**
  * Finds the next item to play
  *
@@ -409,6 +370,7 @@ playlist_item_t *playlist_GetNextLeaf( playlist_t *p_playlist,
                                        playlist_item_t *p_item,
                                        bool b_ena, bool b_unplayed )
 {
+    PL_ASSERT_LOCKED;
     playlist_item_t *p_next;
 
     assert( p_root && p_root->i_children != -1 );
@@ -450,6 +412,7 @@ playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist,
                                        playlist_item_t *p_item,
                                        bool b_ena, bool b_unplayed )
 {
+    PL_ASSERT_LOCKED;
     playlist_item_t *p_prev;
 
     PL_DEBUG2( "finding previous os %s within %s", PLI_NAME( p_item ),
@@ -489,41 +452,40 @@ playlist_item_t *GetNextItem( playlist_t *p_playlist,
                               playlist_item_t *p_root,
                               playlist_item_t *p_item )
 {
-    playlist_item_t *p_parent;
-    int i;
+    /* If the item is NULL, return the firt child of root */
+    if( p_item == NULL )
+    {
+        if( p_root->i_children > 0 )
+            return p_root->pp_children[0];
+        else
+            return NULL;
+    }
 
     /* Node with children, get the first one */
-    if( p_item && p_item->i_children > 0 )
+    if( p_item->i_children > 0 )
         return p_item->pp_children[0];
 
-    if( p_item != NULL )
-        p_parent = p_item->p_parent;
-    else
-        p_parent = p_root;
-    for( i= 0 ; i < p_parent->i_children ; i++ )
+    playlist_item_t* p_parent = p_item->p_parent;
+    for( int i = 0 ; i < p_parent->i_children ; i++ )
     {
-        if( p_item == NULL || p_parent->pp_children[i] == p_item )
+        if( p_parent->pp_children[i] == p_item )
         {
-            if( p_item == NULL )
-                i = -1;
-
-            if( i+1 >= p_parent->i_children )
+            // Return the next children
+            if( i + 1 < p_parent->i_children )
+                return p_parent->pp_children[i+1];
+            // We are the least one, so try to have uncles
+            else
             {
-                /* Was already the last sibling. Look for uncles */
                 PL_DEBUG2( "Current item is the last of the node,"
                            "looking for uncle from %s",
                             p_parent->p_input->psz_name );
-
                 if( p_parent == p_root )
                 {
                     PL_DEBUG2( "already at root" );
                     return NULL;
                 }
-                return GetNextUncle( p_playlist, p_item, p_root );
-            }
-            else
-            {
-                return  p_parent->pp_children[i+1];
+                else
+                    return GetNextUncle( p_playlist, p_item, p_root );
             }
         }
     }