X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Ftree.c;h=152af3fdcc783c248a35391f31862110a2cac624;hb=b0db307c4cf3ac509fe33079f132a0dc6c939e22;hp=35eb33b367f4f15980fdeda463e0110222c3f85a;hpb=24298341eb3b322f6f4eba55ff8b58399890c72e;p=vlc diff --git a/src/playlist/tree.c b/src/playlist/tree.c index 35eb33b367..152af3fdcc 100644 --- a/src/playlist/tree.c +++ b/src/playlist/tree.c @@ -50,26 +50,28 @@ playlist_item_t *GetPrevItem( playlist_t *p_playlist, * \param p_playlist the playlist * \param psz_name the name of the node * \param p_parent the parent node to attach to or NULL if no attach + * \param i_pos position of the node in the parent, PLAYLIST_END to append to end. * \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, - input_item_t *p_input ) + playlist_item_t *p_parent, int i_pos, + int i_flags, input_item_t *p_input ) { - input_item_t *p_new_input; + input_item_t *p_new_input = NULL; playlist_item_t *p_item; + PL_ASSERT_LOCKED; if( !psz_name ) psz_name = _("Undefined"); 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_new_input = input_item_NewWithType( VLC_OBJECT(p_playlist), NULL, + psz_name, 0, NULL, 0, -1, ITEM_TYPE_NODE ); + p_item = playlist_ItemNewFromInput( p_playlist, p_input ? p_input : p_new_input ); - if( !p_input ) + if( p_new_input ) vlc_gc_decref( p_new_input ); if( p_item == NULL ) return NULL; @@ -78,10 +80,14 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, ARRAY_APPEND(p_playlist->all_items, p_item); if( p_parent != NULL ) - playlist_NodeAppend( p_playlist, p_item, p_parent ); + playlist_NodeInsert( p_playlist, p_item, p_parent, + i_pos == PLAYLIST_END ? -1 : i_pos ); playlist_SendAddNotify( p_playlist, p_item->i_id, p_parent ? p_parent->i_id : -1, !( i_flags & PLAYLIST_NO_REBUILD )); + + p_item->i_flags |= i_flags + return p_item; } @@ -98,6 +104,7 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root, bool b_delete_items ) { + PL_ASSERT_LOCKED; int i; if( p_root->i_children == -1 ) { @@ -133,6 +140,7 @@ int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root, int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root, bool b_delete_items, bool b_force ) { + PL_ASSERT_LOCKED; int i; if( p_root->i_children == -1 ) @@ -141,7 +149,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 ) { @@ -150,8 +158,7 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root, } else if( b_delete_items ) { - playlist_DeleteFromItemId( p_playlist, - p_root->pp_children[i]->i_id ); + playlist_DeleteItem( p_playlist, p_root->pp_children[i], true ); } } /* Delete the node */ @@ -161,7 +168,7 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root, else { int i; - var_SetInteger( p_playlist, "item-deleted", p_root->i_id ); + var_SetInteger( p_playlist, "playlist-item-deleted", p_root->i_id ); ARRAY_BSEARCH( p_playlist->all_items, ->i_id, int, p_root->i_id, i ); if( i != -1 ) @@ -171,24 +178,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; } @@ -214,6 +204,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 ; @@ -238,6 +229,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++ ) @@ -251,34 +243,6 @@ int playlist_NodeRemoveItem( playlist_t *p_playlist, return VLC_SUCCESS; } - -/** - * Count the children of a node - * - * \param p_playlist the playlist - * \param p_node the node - * \return the number of children - */ -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 ) - break; - else - i_nb += playlist_NodeChildrenCount( p_playlist, - p_node->pp_children[i] ); - } - return i_nb; -} - /** * Search a child of a node by its name * @@ -289,6 +253,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 ) @@ -305,111 +271,9 @@ playlist_item_t *playlist_ChildSearchName( playlist_item_t *p_node, return NULL; } -/** - * 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, 0, NULL ); - *pp_node_one = playlist_NodeCreate( p_playlist, psz_name, - 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_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 == - p_node->p_input->i_id ) - return p_playlist->p_root_onelevel->pp_children[i]; - } - } - else if( p_node->p_parent == p_playlist->p_root_onelevel ) - { - if( !p_playlist->b_tree ) - return p_node; - for( i = 0 ; i< p_playlist->p_root_category->i_children; i++ ) - { - if( p_playlist->p_root_category->pp_children[i]->p_input->i_id == - p_node->p_input->i_id ) - return p_playlist->p_root_category->pp_children[i]; - } - } - return NULL; -} - /********************************************************************** * Tree walking functions **********************************************************************/ - -playlist_item_t *playlist_GetLastLeaf(playlist_t *p_playlist, - playlist_item_t *p_root ) -{ - 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; -} - -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 * @@ -423,6 +287,7 @@ playlist_item_t *playlist_GetNextLeaf( playlist_t *p_playlist, playlist_item_t *p_item, bool b_ena, bool b_unplayed ) { + PL_ASSERT_LOCKED; playlist_item_t *p_next; assert( p_root && p_root->i_children != -1 ); @@ -464,9 +329,10 @@ playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist, playlist_item_t *p_item, 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 ), + PL_DEBUG2( "finding previous of %s within %s", PLI_NAME( p_item ), PLI_NAME( p_root ) ); assert( p_root && p_root->i_children != -1 ); @@ -503,41 +369,40 @@ playlist_item_t *GetNextItem( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item ) { - playlist_item_t *p_parent; - int i; + /* If the item is NULL, return the firt child of root */ + if( p_item == NULL ) + { + if( p_root->i_children > 0 ) + return p_root->pp_children[0]; + else + return NULL; + } /* Node with children, get the first one */ - if( p_item && p_item->i_children > 0 ) + if( p_item->i_children > 0 ) return p_item->pp_children[0]; - if( p_item != NULL ) - p_parent = p_item->p_parent; - else - p_parent = p_root; - for( i= 0 ; i < p_parent->i_children ; i++ ) + playlist_item_t* p_parent = p_item->p_parent; + for( int i = 0 ; i < p_parent->i_children ; i++ ) { - if( p_item == NULL || p_parent->pp_children[i] == p_item ) + if( p_parent->pp_children[i] == p_item ) { - if( p_item == NULL ) - i = -1; - - if( i+1 >= p_parent->i_children ) + // Return the next children + if( i + 1 < p_parent->i_children ) + return p_parent->pp_children[i+1]; + // We are the least one, so try to have uncles + else { - /* Was already the last sibling. Look for uncles */ 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_DEBUG2( "already at root" ); return NULL; } - return GetNextUncle( p_playlist, p_item, p_root ); - } - else - { - return p_parent->pp_children[i+1]; + else + return GetNextUncle( p_playlist, p_item, p_root ); } } }