X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Ftree.c;h=3f9b4262170c02dc64d2de164fd003f7f6a1e022;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=95efa4ed55dca5f0dc0e2d99ac3d36fa9aba5b6b;hpb=adb0d2e102ffa06eb6916bf2af37e0920d18ee92;p=vlc diff --git a/src/playlist/tree.c b/src/playlist/tree.c index 95efa4ed55..3f9b426217 100644 --- a/src/playlist/tree.c +++ b/src/playlist/tree.c @@ -1,7 +1,7 @@ /***************************************************************************** * tree.c : Playlist tree walking functions ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2007 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -22,7 +22,6 @@ *****************************************************************************/ #include #include -#include #include "vlc_playlist.h" #include "playlist_internal.h" @@ -47,10 +46,12 @@ playlist_item_t *GetPrevItem( playlist_t *p_playlist, * \param p_playlist the playlist * \paam psz_name the name of the node * \param p_parent the parent node to attach to or NULL if no attach + * \param p_flags miscellaneous flags * \return the new node */ -playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, char *psz_name, - playlist_item_t *p_parent ) +playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, + const char *psz_name, + playlist_item_t *p_parent, int i_flags ) { input_item_t *p_input; playlist_item_t *p_item; @@ -62,22 +63,15 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, char *psz_name, p_item = playlist_ItemNewFromInput( VLC_OBJECT(p_playlist), p_input ); p_item->i_children = 0; - if( p_item == NULL ) - { - return NULL; - } - INSERT_ELEM( p_playlist->pp_all_items, - p_playlist->i_all_size, - p_playlist->i_all_size, - p_item ); + if( p_item == NULL ) return NULL; + + ARRAY_APPEND(p_playlist->all_items, p_item); if( p_parent != NULL ) - { playlist_NodeAppend( p_playlist, p_item, p_parent ); - } - playlist_SendAddNotify( p_playlist, p_item->i_id, - p_parent ? p_parent->i_id : -1 ); + p_parent ? p_parent->i_id : -1, + !( i_flags & PLAYLIST_NO_REBUILD )); return p_item; } @@ -156,23 +150,16 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root, } else { - var_SetInteger( p_playlist, "item-deleted", p_root->p_input->i_id ); - for( i = 0 ; i< p_playlist->i_all_size; i ++ ) - { - if( p_playlist->pp_all_items[i]->p_input->i_id == - p_root->p_input->i_id ) - { - REMOVE_ELEM( p_playlist->pp_all_items, p_playlist->i_all_size, - i ); - break; - } - } + int i; + var_SetInteger( p_playlist, "item-deleted", p_root->i_id ); + ARRAY_BSEARCH( p_playlist->all_items, ->p_input->i_id, int, + p_root->p_input->i_id, i ); + if( i != -1 ) + ARRAY_REMOVE( p_playlist->all_items, i ); /* Remove the item from its parent */ if( p_root->p_parent ) - { playlist_NodeRemoveItem( p_playlist, p_root, p_root->p_parent ); - } playlist_ItemDelete( p_root ); } @@ -200,6 +187,7 @@ int playlist_NodeInsert( playlist_t *p_playlist, playlist_item_t *p_parent, int i_position ) { + (void)p_playlist; assert( p_parent && p_parent->i_children != -1 ); if( i_position == -1 ) i_position = p_parent->i_children ; @@ -223,8 +211,9 @@ int playlist_NodeRemoveItem( playlist_t *p_playlist, playlist_item_t *p_item, playlist_item_t *p_parent ) { - int i; - for( i= 0; i< p_parent->i_children ; i++ ) + (void)p_playlist; + + for(int i= 0; i< p_parent->i_children ; i++ ) { if( p_parent->pp_children[i] == p_item ) { @@ -299,15 +288,15 @@ playlist_item_t *playlist_ChildSearchName( playlist_item_t *p_node, * \param pp_node_one pointer to return the node in onelevel tree * \param b_for_sd For Services Discovery ? (make node read-only and unskipping) */ -void playlist_NodesPairCreate( playlist_t *p_playlist, char *psz_name, +void playlist_NodesPairCreate( playlist_t *p_playlist, const char *psz_name, playlist_item_t **pp_node_cat, playlist_item_t **pp_node_one, vlc_bool_t b_for_sd ) { *pp_node_cat = playlist_NodeCreate( p_playlist, psz_name, - p_playlist->p_root_category ); + p_playlist->p_root_category, 0 ); *pp_node_one = playlist_NodeCreate( p_playlist, psz_name, - p_playlist->p_root_onelevel ); + p_playlist->p_root_onelevel, 0 ); (*pp_node_one)->p_input->i_id = (*pp_node_cat)->p_input->i_id; if( b_for_sd ) { @@ -320,7 +309,7 @@ void playlist_NodesPairCreate( playlist_t *p_playlist, char *psz_name, /** * Get the node in the preferred tree from a node in one of category - * or onelevel tree. + * 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 @@ -415,14 +404,8 @@ playlist_item_t *playlist_GetNextLeaf( playlist_t *p_playlist, assert( p_root && p_root->i_children != -1 ); -#ifdef PLAYLIST_DEBUG - if( p_item != NULL ) - msg_Dbg( p_playlist, "finding next of %s within %s", - p_item->p_input->psz_name, p_root->p_input->psz_name ); - else - msg_Dbg( p_playlist, "finding something to play within %s", - p_root->p_input->psz_name ); -#endif + PL_DEBUG2( "finding next of %s within %s", + PLI_NAME( p_item ), PLI_NAME( p_root ) ); /* Now, walk the tree until we find a suitable next item */ p_next = p_item; @@ -441,10 +424,7 @@ playlist_item_t *playlist_GetNextLeaf( playlist_t *p_playlist, if( b_ena_ok && b_unplayed_ok ) break; } } -#ifdef PLAYLIST_DEBUG - if( p_next == NULL ) - msg_Dbg( p_playlist, "At end of node" ); -#endif + if( p_next == NULL ) PL_DEBUG2( "at end of node" ); return p_next; } @@ -463,14 +443,8 @@ playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist, { playlist_item_t *p_prev; -#ifdef PLAYLIST_DEBUG - if( p_item != NULL ) - msg_Dbg( p_playlist, "finding previous of %s within %s", - p_item->p_input->psz_name, p_root->p_input->psz_name ); - else - msg_Dbg( p_playlist, "finding previous to play within %s", - p_root->p_input->psz_name ); -#endif + PL_DEBUG2( "finding previous os %s within %s", PLI_NAME( p_item ), + PLI_NAME( p_root ) ); assert( p_root && p_root->i_children != -1 ); /* Now, walk the tree until we find a suitable previous item */ @@ -490,10 +464,7 @@ playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist, if( b_ena_ok && b_unplayed_ok ) break; } } -#ifdef PLAYLIST_DEBUG - if( p_prev == NULL ) - msg_Dbg( p_playlist, "At beginning of node" ); -#endif + if( p_prev == NULL ) PL_DEBUG2( "at beginning of node" ); return p_prev; } @@ -520,7 +491,6 @@ playlist_item_t *GetNextItem( playlist_t *p_playlist, p_parent = p_item->p_parent; else p_parent = p_root; - for( i= 0 ; i < p_parent->i_children ; i++ ) { if( p_item == NULL || p_parent->pp_children[i] == p_item ) @@ -531,13 +501,13 @@ playlist_item_t *GetNextItem( playlist_t *p_playlist, if( i+1 >= p_parent->i_children ) { /* Was already the last sibling. Look for uncles */ - PL_DEBUG( "Current item is the last of the node," - "looking for uncle from %s", - p_parent->p_input->psz_name ); + 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_DEBUG( "already at root" ); + PL_DEBUG2( "already at root" ); return NULL; } return GetNextUncle( p_playlist, p_item, p_root ); @@ -548,7 +518,6 @@ playlist_item_t *GetNextItem( playlist_t *p_playlist, } } } - msg_Err( p_playlist, "I should not be here" ); return NULL; } @@ -559,6 +528,8 @@ playlist_item_t *GetNextUncle( playlist_t *p_playlist, playlist_item_t *p_item, playlist_item_t *p_grandparent; vlc_bool_t b_found = VLC_FALSE; + (void)p_playlist; + if( p_parent != NULL ) { p_grandparent = p_parent->p_parent; @@ -569,9 +540,9 @@ playlist_item_t *GetNextUncle( playlist_t *p_playlist, playlist_item_t *p_item, { if( p_parent == p_grandparent->pp_children[i] ) { - PL_DEBUG( "parent %s found as child %i of grandparent %s", - p_parent->p_input->psz_name, i, - p_grandparent->p_input->psz_name ); + PL_DEBUG2( "parent %s found as child %i of grandparent %s", + p_parent->p_input->psz_name, i, + p_grandparent->p_input->psz_name ); b_found = VLC_TRUE; break; } @@ -603,6 +574,8 @@ playlist_item_t *GetPrevUncle( playlist_t *p_playlist, playlist_item_t *p_item, playlist_item_t *p_grandparent; vlc_bool_t b_found = VLC_FALSE; + (void)p_playlist; + if( p_parent != NULL ) { p_grandparent = p_parent->p_parent; @@ -666,12 +639,12 @@ playlist_item_t *GetPrevItem( playlist_t *p_playlist, if( i-1 < 0 ) { /* Was already the first sibling. Look for uncles */ - PL_DEBUG( "current item is the first of its node," - "looking for uncle from %s", - p_parent->p_input->psz_name ); + PL_DEBUG2( "current item is the first of its node," + "looking for uncle from %s", + p_parent->p_input->psz_name ); if( p_parent == p_root ) { - PL_DEBUG( "already at root" ); + PL_DEBUG2( "already at root" ); return NULL; } return GetPrevUncle( p_playlist, p_item, p_root ); @@ -682,7 +655,6 @@ playlist_item_t *GetPrevItem( playlist_t *p_playlist, } } } - msg_Err( p_playlist, "I should not be here" ); return NULL; }