Fix live detection on win32

[vlc] / src / playlist / tree.c

diff --git a/src/playlist/tree.c b/src/playlist/tree.c
index 4b4b95bbe64b69159c494f00a31feafb55f2b442..d79ec49b4a2ed2fc652dba222610049c3e24f003 100644 (file)
--- 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,7 +59,7 @@ 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;
 
     if( !psz_name ) psz_name = _("Undefined");
@@ -67,9 +67,9 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist,
     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_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 +98,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 +134,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 )
@@ -171,7 +173,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 +199,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 +224,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++ )
@@ -244,6 +248,7 @@ int playlist_NodeRemoveItem( playlist_t *p_playlist,
  */
 int playlist_NodeChildrenCount( playlist_t *p_playlist, playlist_item_t*p_node)
 {
+    PL_ASSERT_LOCKED;
     int i;
     int i_nb = 0;
 
@@ -272,6 +277,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 +309,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,
@@ -323,6 +331,7 @@ void playlist_NodesPairCreate( playlist_t *p_playlist, const char *psz_name,
 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 )
     {
@@ -356,6 +365,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-- )
@@ -375,24 +385,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
  *
@@ -406,6 +398,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 );
@@ -447,6 +440,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 ),