X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Ftree.c;h=3b583ee7ad8f2f7016ccb33babe08296da62ef0c;hb=71c06757b220a261d02835ec41466e2c8447ba41;hp=cb18d9a192b820bc120cc29a015a546264e71af7;hpb=532a761def76ca5507916dd112bf49b510df6c15;p=vlc diff --git a/src/playlist/tree.c b/src/playlist/tree.c index cb18d9a192..3b583ee7ad 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 @@ -20,10 +20,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include -#include #include "vlc_playlist.h" +#include "playlist_internal.h" /************************************************************************ * Local prototypes @@ -44,39 +48,40 @@ playlist_item_t *GetPrevItem( playlist_t *p_playlist, * Create a playlist node * * \param p_playlist the playlist - * \paam psz_name the name of the node + * \param 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 + * \param p_input the input_item to attach to or NULL if it has to be created * \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 ) { - input_item_t *p_input; + input_item_t *p_new_input = NULL; playlist_item_t *p_item; if( !psz_name ) psz_name = _("Undefined"); - p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), NULL, psz_name, - 0, NULL, -1, ITEM_TYPE_NODE ); - p_input->i_id = ++p_playlist->i_last_input_id; - p_item = playlist_ItemNewFromInput( VLC_OBJECT(p_playlist), p_input ); + + 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_input ? p_input : p_new_input ); + if( p_new_input ) + vlc_gc_decref( p_new_input ); + + if( p_item == NULL ) return NULL; 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 ); + 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; } @@ -91,7 +96,7 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, char *psz_name, * \return VLC_SUCCESS or an error */ int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root, - vlc_bool_t b_delete_items ) + bool b_delete_items ) { int i; if( p_root->i_children == -1 ) @@ -105,7 +110,7 @@ int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root, if( p_root->pp_children[i]->i_children > -1 ) { playlist_NodeDelete( p_playlist, p_root->pp_children[i], - b_delete_items , VLC_FALSE ); + b_delete_items , false ); } else if( b_delete_items ) { @@ -126,7 +131,7 @@ int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root, * \return VLC_SUCCESS or an error */ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root, - vlc_bool_t b_delete_items, vlc_bool_t b_force ) + bool b_delete_items, bool b_force ) { int i; @@ -155,25 +160,35 @@ 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, ->i_id, int, + p_root->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 ); + + /* 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_ItemDelete( p_root ); } return VLC_SUCCESS; } @@ -199,6 +214,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 ; @@ -222,8 +238,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 ) { @@ -246,13 +263,15 @@ 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 ) - i_nb++; + break; else i_nb += playlist_NodeChildrenCount( p_playlist, p_node->pp_children[i] ); @@ -286,32 +305,46 @@ playlist_item_t *playlist_ChildSearchName( playlist_item_t *p_node, return NULL; } - -void playlist_NodesCreateForSD( playlist_t *p_playlist, char *psz_name, - playlist_item_t **pp_node_cat, - playlist_item_t **pp_node_one ) +/** + * Create a pair of nodes in the category and onelevel trees. + * They share the same input item. + * \param p_playlist the playlist + * \param psz_name the name of the nodes + * \param pp_node_cat pointer to return the node in category tree + * \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, const char *psz_name, + playlist_item_t **pp_node_cat, + playlist_item_t **pp_node_one, + bool b_for_sd ) { *pp_node_cat = playlist_NodeCreate( p_playlist, psz_name, - p_playlist->p_root_category ); - (*pp_node_cat)->i_flags |= PLAYLIST_RO_FLAG; - (*pp_node_cat)->i_flags |= PLAYLIST_SKIP_FLAG; - + p_playlist->p_root_category, 0, NULL ); *pp_node_one = playlist_NodeCreate( p_playlist, psz_name, - p_playlist->p_root_onelevel ); - (*pp_node_one)->i_flags |= PLAYLIST_RO_FLAG; - (*pp_node_one)->i_flags |= PLAYLIST_SKIP_FLAG; - - (*pp_node_one)->p_input->i_id = (*pp_node_cat)->p_input->i_id; + p_playlist->p_root_onelevel, 0, + (*pp_node_cat)->p_input ); + if( b_for_sd ) + { + (*pp_node_cat)->i_flags |= PLAYLIST_RO_FLAG; + (*pp_node_cat)->i_flags |= PLAYLIST_SKIP_FLAG; + (*pp_node_one)->i_flags |= PLAYLIST_RO_FLAG; + (*pp_node_one)->i_flags |= PLAYLIST_SKIP_FLAG; + } } +/** + * Get the node in the preferred tree from a node in one of category + * or onelevel tree. + */ playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist, playlist_item_t *p_node ) { 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( p_playlist->b_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 == @@ -321,7 +354,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( !p_playlist->b_tree ) return p_node; for( i = 0 ; i< p_playlist->p_root_category->i_children; i++ ) { @@ -368,7 +401,7 @@ int playlist_GetAllEnabledChildren( playlist_t *p_playlist, while( 1 ) { p_next = playlist_GetNextLeaf( p_playlist, p_node, - p_next, VLC_TRUE, VLC_TRUE ); + p_next, true, false ); if( p_next ) INSERT_ELEM( *ppp_items, i_count, i_count, p_next ); else @@ -388,42 +421,33 @@ int playlist_GetAllEnabledChildren( playlist_t *p_playlist, playlist_item_t *playlist_GetNextLeaf( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, - vlc_bool_t b_ena, vlc_bool_t b_unplayed ) + bool b_ena, bool b_unplayed ) { playlist_item_t *p_next; 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; while( 1 ) { - vlc_bool_t b_ena_ok = VLC_TRUE, b_unplayed_ok = VLC_TRUE; + bool b_ena_ok = true, b_unplayed_ok = true; p_next = GetNextItem( p_playlist, p_root, p_next ); if( !p_next || p_next == p_root ) break; if( p_next->i_children == -1 ) { if( b_ena && p_next->i_flags & PLAYLIST_DBL_FLAG ) - b_ena_ok = VLC_FALSE; + b_ena_ok = false; if( b_unplayed && p_next->p_input->i_nb_played != 0 ) - b_unplayed_ok = VLC_FALSE; + b_unplayed_ok = false; 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; } @@ -438,41 +462,32 @@ playlist_item_t *playlist_GetNextLeaf( playlist_t *p_playlist, playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, - vlc_bool_t b_ena, vlc_bool_t b_unplayed ) + bool b_ena, bool b_unplayed ) { 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 */ p_prev = p_item; while( 1 ) { - vlc_bool_t b_ena_ok = VLC_TRUE, b_unplayed_ok = VLC_TRUE; + bool b_ena_ok = true, b_unplayed_ok = true; p_prev = GetPrevItem( p_playlist, p_root, p_prev ); if( !p_prev || p_prev == p_root ) break; if( p_prev->i_children == -1 ) { if( b_ena && p_prev->i_flags & PLAYLIST_DBL_FLAG ) - b_ena_ok = VLC_FALSE; + b_ena_ok = false; if( b_unplayed && p_prev->p_input->i_nb_played != 0 ) - b_unplayed_ok = VLC_FALSE; + b_unplayed_ok = false; 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; } @@ -499,7 +514,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 ) @@ -510,13 +524,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 ); @@ -527,7 +541,6 @@ playlist_item_t *GetNextItem( playlist_t *p_playlist, } } } - msg_Err( p_playlist, "I should not be here" ); return NULL; } @@ -536,22 +549,24 @@ playlist_item_t *GetNextUncle( playlist_t *p_playlist, playlist_item_t *p_item, { playlist_item_t *p_parent = p_item->p_parent; playlist_item_t *p_grandparent; - vlc_bool_t b_found = VLC_FALSE; + bool b_found = false; + + (void)p_playlist; if( p_parent != NULL ) { p_grandparent = p_parent->p_parent; - while( 1 ) + while( p_grandparent ) { int i; for( i = 0 ; i< p_grandparent->i_children ; i++ ) { 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 ); - b_found = VLC_TRUE; + 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 = true; break; } } @@ -580,7 +595,9 @@ playlist_item_t *GetPrevUncle( playlist_t *p_playlist, playlist_item_t *p_item, { playlist_item_t *p_parent = p_item->p_parent; playlist_item_t *p_grandparent; - vlc_bool_t b_found = VLC_FALSE; + bool b_found = false; + + (void)p_playlist; if( p_parent != NULL ) { @@ -592,7 +609,7 @@ playlist_item_t *GetPrevUncle( playlist_t *p_playlist, playlist_item_t *p_item, { if( p_parent == p_grandparent->pp_children[i] ) { - b_found = VLC_TRUE; + b_found = true; break; } } @@ -644,10 +661,15 @@ 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 the node," - "looking for uncle from %s", - p_parent->p_input->psz_name ); + /* Was already the first sibling. Look for uncles */ + 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_DEBUG2( "already at root" ); + return NULL; + } return GetPrevUncle( p_playlist, p_item, p_root ); } else @@ -656,40 +678,5 @@ playlist_item_t *GetPrevItem( playlist_t *p_playlist, } } } - msg_Err( p_playlist, "I should not be here" ); return NULL; } - -/* Dump the contents of a node */ -void playlist_NodeDump( playlist_t *p_playlist, playlist_item_t *p_item, - int i_level ) -{ - char str[512]; - int i; - - if( i_level == 1 ) - { - msg_Dbg( p_playlist, "%s (%i)", - p_item->p_input->psz_name, p_item->i_children ); - } - - if( p_item->i_children == -1 ) - { - return; - } - - for( i = 0; i< p_item->i_children; i++ ) - { - memset( str, 32, 512 ); - sprintf( str + 2 * i_level , "%s (%i)", - p_item->pp_children[i]->p_input->psz_name, - p_item->pp_children[i]->i_children ); - msg_Dbg( p_playlist, "%s",str ); - if( p_item->pp_children[i]->i_children >= 0 ) - { - playlist_NodeDump( p_playlist, p_item->pp_children[i], - i_level + 1 ); - } - } - return; -}