X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Ftree.c;h=d79ec49b4a2ed2fc652dba222610049c3e24f003;hb=7686840e5c2b384eab661455a5e532a97c669e96;hp=68b2228842d7f0fe4f047f4a1a6dc3cdc1e790ae;hpb=ea06273fe2aa7c09e7dda5329e152d9ae7745285;p=vlc diff --git a/src/playlist/tree.c b/src/playlist/tree.c index 68b2228842..d79ec49b4a 100644 --- a/src/playlist/tree.c +++ b/src/playlist/tree.c @@ -20,7 +20,11 @@ * 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 "vlc_playlist.h" #include "playlist_internal.h" @@ -44,26 +48,32 @@ 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, const char *psz_name, - playlist_item_t *p_parent, int i_flags ) + 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 ); - p_item->i_children = 0; + + 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( 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; ARRAY_APPEND(p_playlist->all_items, p_item); @@ -86,8 +96,9 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, * \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 ) { + PL_ASSERT_LOCKED; int i; if( p_root->i_children == -1 ) { @@ -100,7 +111,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 ) { @@ -121,8 +132,9 @@ 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 ) { + PL_ASSERT_LOCKED; int i; if( p_root->i_children == -1 ) @@ -152,8 +164,8 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root, { 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 ); + ARRAY_BSEARCH( p_playlist->all_items, ->i_id, int, + p_root->i_id, i ); if( i != -1 ) ARRAY_REMOVE( p_playlist->all_items, i ); @@ -161,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; } @@ -187,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 ; @@ -211,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++ ) @@ -234,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; @@ -262,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 ) @@ -280,8 +297,7 @@ playlist_item_t *playlist_ChildSearchName( playlist_item_t *p_node, /** * Create a pair of nodes in the category and onelevel trees. - * They share the same input ID. - * \todo really share the input item + * 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 @@ -291,13 +307,14 @@ playlist_item_t *playlist_ChildSearchName( playlist_item_t *p_node, 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 ) + bool b_for_sd ) { + PL_ASSERT_LOCKED; *pp_node_cat = playlist_NodeCreate( p_playlist, psz_name, - p_playlist->p_root_category, 0 ); + p_playlist->p_root_category, 0, NULL ); *pp_node_one = playlist_NodeCreate( p_playlist, psz_name, - p_playlist->p_root_onelevel, 0 ); - (*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; @@ -310,18 +327,16 @@ void playlist_NodesPairCreate( playlist_t *p_playlist, const char *psz_name, /** * Get the node in the preferred tree from a node in one of category * 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 */ 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 ) { - 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 == @@ -331,7 +346,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++ ) { @@ -350,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-- ) @@ -369,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, VLC_TRUE, VLC_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 * @@ -398,8 +396,9 @@ 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 ) { + PL_ASSERT_LOCKED; playlist_item_t *p_next; assert( p_root && p_root->i_children != -1 ); @@ -411,16 +410,16 @@ playlist_item_t *playlist_GetNextLeaf( playlist_t *p_playlist, 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; } } @@ -439,8 +438,9 @@ 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 ) { + PL_ASSERT_LOCKED; playlist_item_t *p_prev; PL_DEBUG2( "finding previous os %s within %s", PLI_NAME( p_item ), @@ -451,16 +451,16 @@ playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist, 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; } } @@ -526,7 +526,7 @@ 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; @@ -543,7 +543,7 @@ playlist_item_t *GetNextUncle( playlist_t *p_playlist, playlist_item_t *p_item, 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; + b_found = true; break; } } @@ -572,7 +572,7 @@ 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; @@ -586,7 +586,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; } } @@ -657,37 +657,3 @@ playlist_item_t *GetPrevItem( playlist_t *p_playlist, } 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; -}