X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Ftree.c;h=9937d0d927b9f08391beba77e1ae5df3d52cc261;hb=95d29a6c1325aaec104dc66b077046a1d5b6ab16;hp=32ef051be5999cde7fcacc6e3b6441df2ac441f2;hpb=52c18c4dec68158eedd655e0502820b7d7b6128f;p=vlc diff --git a/src/playlist/tree.c b/src/playlist/tree.c index 32ef051be5..9937d0d927 100644 --- a/src/playlist/tree.c +++ b/src/playlist/tree.c @@ -144,7 +144,7 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root, } /* Delete the children */ - for( i = p_root->i_children - 1 ; i >= 0; i-- ) + for( i = p_root->i_children - 1 ; i >= 0; i-- ) { if( p_root->pp_children[i]->i_children > -1 ) { @@ -333,30 +333,6 @@ playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist, /********************************************************************** * Tree walking functions **********************************************************************/ - -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-- ) - { - if( p_root->pp_children[i]->i_children == -1 ) - return p_root->pp_children[i]; - else if( p_root->pp_children[i]->i_children > 0) - { - p_item = playlist_GetLastLeaf( p_playlist, - p_root->pp_children[i] ); - if ( p_item != NULL ) - return p_item; - } - else if( i == 0 ) - return NULL; - } - return NULL; -} - /** * Finds the next item to play * @@ -415,7 +391,7 @@ playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist, PL_ASSERT_LOCKED; playlist_item_t *p_prev; - PL_DEBUG2( "finding previous os %s within %s", PLI_NAME( p_item ), + PL_DEBUG2( "finding previous of %s within %s", PLI_NAME( p_item ), PLI_NAME( p_root ) ); assert( p_root && p_root->i_children != -1 );