]> git.sesse.net Git - vlc/blobdiff - src/playlist/tree.c
macosx: Ask to send a mail to our bugreport ML if a crash log is detected.
[vlc] / src / playlist / tree.c
index bda4c49709119e09340dc479e1a6fb9df0a9acc5..d79ec49b4a2ed2fc652dba222610049c3e24f003 100644 (file)
@@ -173,24 +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 );
 
-        /* Check if it is the current node */
-        if( p_playlist->status.p_node == p_root )
-        {
-            /* Hack we don't call playlist_Control for lock reasons */
-            p_playlist->request.i_status = PLAYLIST_STOPPED;
-            p_playlist->request.b_request = true;
-            p_playlist->request.p_item = NULL;
-            p_playlist->request.p_node = NULL;
-            msg_Info( p_playlist, "stopping playback" );
-            vlc_object_signal_maybe( VLC_OBJECT(p_playlist) );
-
-            PL_DEBUG( "marking %s for further deletion", PLI_NAME( p_root ) );
-            p_root->i_flags |= PLAYLIST_REMOVE_FLAG;
-        }
-        else
-            playlist_ItemDelete( p_root );
-
-
+        playlist_ItemRelease( p_root );
     }
     return VLC_SUCCESS;
 }
@@ -402,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
  *