X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=ed01246a2ff79d042b55769cb39d817056ffc195;hb=defbc4a490e65cfa1d587dceef1b7cb5c230e8e0;hp=5d09181b2285218bb7fb5a54ed9a9cab8b64c1b3;hpb=ace44bc9f59e2ced98bb8534aa225fce9a479d8b;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index 5d09181b22..ed01246a2f 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -33,89 +33,91 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, playlist_item_t *p_node, int i_mode, int i_pos ); static void GoAndPreparse( playlist_t *p_playlist, int i_mode, - playlist_item_t *, playlist_item_t * ); + playlist_item_t * ); static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ); -static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, - bool b_stop ); + +static playlist_item_t *ItemToNode( playlist_t *, playlist_item_t *, bool ); /***************************************************************************** - * An input item has gained a subitem (Event Callback) + * An input item has gained subitems (Event Callback) *****************************************************************************/ -static void input_item_subitem_added( const vlc_event_t * p_event, - void * user_data ) -{ - playlist_item_t *p_parent_playlist_item = user_data; - playlist_t * p_playlist = p_parent_playlist_item->p_playlist; - input_item_t * p_parent, * p_child; - playlist_item_t * p_child_in_category; - playlist_item_t * p_item_in_category; - bool b_play; - p_parent = p_event->p_obj; - p_child = p_event->u.input_item_subitem_added.p_new_child; +static void input_item_add_subitem_tree ( const vlc_event_t * p_event, + void * user_data ) +{ + input_item_t *p_input = p_event->p_obj; + playlist_t *p_playlist = (( playlist_item_t* ) user_data)->p_playlist; + input_item_node_t *p_new_root = p_event->u.input_item_subitem_tree_added.p_root; PL_LOCK; - b_play = var_CreateGetBool( p_playlist, "playlist-autostart" ); - - /* This part is really hakish, but this playlist system isn't simple */ - /* First check if we haven't already added the item as we are - * listening using the onelevel and the category representent - * (Because of the playlist design) */ - p_child_in_category = playlist_ItemFindFromInputAndRoot( - p_playlist, p_child->i_id, - p_playlist->p_root_category, - false /* Only non-node */ ); - - if( !p_child_in_category ) - { - /* Then, transform to a node if needed */ - p_item_in_category = playlist_ItemFindFromInputAndRoot( - p_playlist, p_parent->i_id, - p_playlist->p_root_category, - false /* Only non-node */ ); - if( !p_item_in_category ) - { - /* Item may have been removed */ - PL_UNLOCK; - return; - } - b_play = b_play && - p_item_in_category == get_current_status_item( p_playlist ); + playlist_item_t *p_item = + playlist_ItemGetByInput( p_playlist, p_input ); - /* If this item is already a node don't transform it */ - if( p_item_in_category->i_children == -1 ) + assert( p_item != NULL ); + playlist_item_t *p_parent = p_item->p_parent; + assert( p_parent != NULL ); + + bool b_play = var_CreateGetBool( p_playlist, "playlist-autostart" ) && + get_current_status_item( p_playlist ) == p_item; + bool b_stop = b_play && p_item->i_flags & PLAYLIST_SUBITEM_STOP_FLAG; + p_item->i_flags &= ~PLAYLIST_SUBITEM_STOP_FLAG; + + int pos = 0; + for( int i = 0; i < p_parent->i_children; i++ ) + { + if( p_parent->pp_children[i] == p_item ) { - p_item_in_category = playlist_ItemToNode( p_playlist, - p_item_in_category, true ); - p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST; + pos = i; + break; } + } - int i_ret = playlist_BothAddInput( p_playlist, p_child, - p_item_in_category, - PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END, - NULL, NULL, true ); - - if( i_ret == VLC_SUCCESS && b_play ) + bool b_flat = false; + playlist_item_t *p_up = p_item; + while( p_up->p_parent ) + { + if( p_up->p_parent == p_playlist->p_playing || + p_up->p_parent == p_playlist->p_media_library ) { - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, - true, p_item_in_category, NULL ); + if( !pl_priv(p_playlist)->b_tree ) b_flat = true; + break; } + p_up = p_up->p_parent; } + if( b_flat ) + { + playlist_DeleteItem( p_playlist, p_item, true ); + p_item = playlist_InsertInputItemTree( p_playlist, p_parent, + p_new_root, pos, true ); + } + else + p_item = playlist_InsertInputItemTree( p_playlist, p_item, + p_new_root, 0, false ); - PL_UNLOCK; + if( b_stop ) + { + PL_UNLOCK; + playlist_Stop( p_playlist ); + return; + } + else if( b_play ) + { + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, + pl_Locked, get_current_status_node( p_playlist ), p_item ); + } + PL_UNLOCK; } - /***************************************************************************** * An input item's meta or duration has changed (Event Callback) *****************************************************************************/ static void input_item_changed( const vlc_event_t * p_event, void * user_data ) { - (void)p_event; - playlist_item_t * p_item = user_data; - var_SetInteger( p_item->p_playlist, "item-change", p_item->i_id ); + playlist_item_t *p_item = user_data; + VLC_UNUSED( p_event ); + var_SetAddress( p_item->p_playlist, "item-change", p_item->p_input ); } /***************************************************************************** @@ -124,8 +126,8 @@ static void input_item_changed( const vlc_event_t * p_event, static void install_input_item_observer( playlist_item_t * p_item ) { vlc_event_manager_t * p_em = &p_item->p_input->event_manager; - vlc_event_attach( p_em, vlc_InputItemSubItemAdded, - input_item_subitem_added, p_item ); + vlc_event_attach( p_em, vlc_InputItemSubItemTreeAdded, + input_item_add_subitem_tree, p_item ); vlc_event_attach( p_em, vlc_InputItemDurationChanged, input_item_changed, p_item ); vlc_event_attach( p_em, vlc_InputItemMetaChanged, @@ -134,13 +136,15 @@ static void install_input_item_observer( playlist_item_t * p_item ) input_item_changed, p_item ); vlc_event_attach( p_em, vlc_InputItemInfoChanged, input_item_changed, p_item ); + vlc_event_attach( p_em, vlc_InputItemErrorWhenReadingChanged, + input_item_changed, p_item ); } static void uninstall_input_item_observer( playlist_item_t * p_item ) { vlc_event_manager_t * p_em = &p_item->p_input->event_manager; - vlc_event_detach( p_em, vlc_InputItemSubItemAdded, - input_item_subitem_added, p_item ); + vlc_event_detach( p_em, vlc_InputItemSubItemTreeAdded, + input_item_add_subitem_tree, p_item ); vlc_event_detach( p_em, vlc_InputItemMetaChanged, input_item_changed, p_item ); vlc_event_detach( p_em, vlc_InputItemDurationChanged, @@ -149,6 +153,8 @@ static void uninstall_input_item_observer( playlist_item_t * p_item ) input_item_changed, p_item ); vlc_event_detach( p_em, vlc_InputItemInfoChanged, input_item_changed, p_item ); + vlc_event_detach( p_em, vlc_InputItemErrorWhenReadingChanged, + input_item_changed, p_item ); } /***************************************************************************** @@ -157,12 +163,16 @@ static void uninstall_input_item_observer( playlist_item_t * p_item ) playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist, input_item_t *p_input ) { - DECMALLOC_NULL( p_item, playlist_item_t ); + playlist_item_t* p_item = malloc( sizeof( playlist_item_t ) ); + if( !p_item ) + return NULL; + + assert( p_input ); p_item->p_input = p_input; vlc_gc_incref( p_item->p_input ); - p_item->i_id = ++p_playlist->i_last_playlist_id; + p_item->i_id = ++pl_priv(p_playlist)->i_last_playlist_id; p_item->p_parent = NULL; p_item->i_children = -1; @@ -175,38 +185,31 @@ playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist, return p_item; } -playlist_item_t * playlist_ItemNewWithType( playlist_t *p_playlist, - const char *psz_uri, - const char *psz_name, - int i_options, - const char *const *ppsz_options, - int i_duration, int i_type ) -{ - input_item_t *p_input; - if( psz_uri == NULL ) return NULL; - p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), psz_uri, - psz_name, i_options, ppsz_options, - i_duration, i_type ); - return playlist_ItemNewFromInput( p_playlist, p_input ); -} - /*************************************************************************** * Playlist item destruction ***************************************************************************/ /** - * Delete item + * Release an item * - * Delete a playlist item and detach its input item * \param p_item item to delete * \return VLC_SUCCESS */ -int playlist_ItemDelete( playlist_item_t *p_item ) +int playlist_ItemRelease( playlist_item_t *p_item ) { + /* For the assert */ + playlist_t *p_playlist = p_item->p_playlist; + PL_ASSERT_LOCKED; + + /* Surprise, we can't actually do more because we + * don't do refcounting, or eauivalent. + * Because item are not only accessed by their id + * using playlist_item outside the PL_LOCK isn't safe. + * Most of the modules does that. + * + * Who wants to add proper memory management? */ uninstall_input_item_observer( p_item ); - - vlc_gc_decref( p_item->p_input ); - free( p_item ); + ARRAY_APPEND( pl_priv(p_playlist)->items_to_delete, p_item); return VLC_SUCCESS; } @@ -215,31 +218,19 @@ int playlist_ItemDelete( playlist_item_t *p_item ) * * Remove an input item when it appears from a root playlist item * \param p_playlist playlist object - * \param i_input_id id of the input to delete + * \param p_input the input to delete * \param p_root root playlist item * \param b_do_stop must stop or not the playlist * \return VLC_SUCCESS or VLC_EGENERIC */ -static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, +static int DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input, playlist_item_t *p_root, bool b_do_stop ) { - int i; - for( i = 0 ; i< p_root->i_children ; i++ ) - { - if( p_root->pp_children[i]->i_children == -1 && - p_root->pp_children[i]->p_input->i_id == i_input_id ) - { - DeleteInner( p_playlist, p_root->pp_children[i], b_do_stop ); - return VLC_SUCCESS; - } - else if( p_root->pp_children[i]->i_children >= 0 ) - { - int i_ret = DeleteFromInput( p_playlist, i_input_id, - p_root->pp_children[i], b_do_stop ); - if( i_ret == VLC_SUCCESS ) return VLC_SUCCESS; - } - } - return VLC_EGENERIC; + PL_ASSERT_LOCKED; + playlist_item_t *p_item = playlist_ItemFindFromInputAndRoot( + p_playlist, p_input, p_root, false ); + if( !p_item ) return VLC_EGENERIC; + return playlist_DeleteItem( p_playlist, p_item, b_do_stop ); } /** @@ -247,18 +238,18 @@ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, * * Remove an input item when it appears from a root playlist item * \param p_playlist playlist object - * \param i_input_id id of the input to delete + * \param p_input the input to delete * \param p_root root playlist item * \param b_locked TRUE if the playlist is locked * \return VLC_SUCCESS or VLC_EGENERIC */ -int playlist_DeleteInputInParent( playlist_t *p_playlist, int i_input_id, - playlist_item_t *p_root, bool b_locked ) +int playlist_DeleteFromInputInParent( playlist_t *p_playlist, + input_item_t *p_item, + playlist_item_t *p_root, bool b_locked ) { int i_ret; PL_LOCK_IF( !b_locked ); - i_ret = DeleteFromInput( p_playlist, i_input_id, - p_root, true ); + i_ret = DeleteFromInput( p_playlist, p_item, p_root, true ); PL_UNLOCK_IF( !b_locked ); return i_ret; } @@ -266,24 +257,21 @@ int playlist_DeleteInputInParent( playlist_t *p_playlist, int i_input_id, /** * Delete from input * - * Remove an input item from ONELEVEL and CATEGORY + * Search anywhere in playlist for an an input item and delete it * \param p_playlist playlist object - * \param i_input_id id of the input to delete + * \param p_input the input to delete * \param b_locked TRUE if the playlist is locked * \return VLC_SUCCESS or VLC_ENOITEM */ -int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id, +int playlist_DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input, bool b_locked ) { - int i_ret1, i_ret2; + int i_ret; PL_LOCK_IF( !b_locked ); - i_ret1 = DeleteFromInput( p_playlist, i_input_id, - p_playlist->p_root_category, true ); - i_ret2 = DeleteFromInput( p_playlist, i_input_id, - p_playlist->p_root_onelevel, true ); + i_ret = DeleteFromInput( p_playlist, p_input, + p_playlist->p_root, true ); PL_UNLOCK_IF( !b_locked ); - return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ? - VLC_SUCCESS : VLC_ENOITEM; + return ( i_ret == VLC_SUCCESS ? VLC_SUCCESS : VLC_ENOITEM ); } /** @@ -296,8 +284,7 @@ int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id, void playlist_Clear( playlist_t * p_playlist, bool b_locked ) { PL_LOCK_IF( !b_locked ); - playlist_NodeEmpty( p_playlist, p_playlist->p_local_category, true ); - playlist_NodeEmpty( p_playlist, p_playlist->p_local_onelevel, true ); + playlist_NodeEmpty( p_playlist, p_playlist->p_playing, true ); PL_UNLOCK_IF( !b_locked ); } @@ -312,10 +299,10 @@ void playlist_Clear( playlist_t * p_playlist, bool b_locked ) */ int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) { - playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id, - true ); + PL_ASSERT_LOCKED; + playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id ); if( !p_item ) return VLC_EGENERIC; - return DeleteInner( p_playlist, p_item, true ); + return playlist_DeleteItem( p_playlist, p_item, true ); } /*************************************************************************** @@ -334,14 +321,14 @@ int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) * regardless of its size * \param b_playlist TRUE for playlist, FALSE for media library * \param b_locked TRUE if the playlist is locked - * \return The id of the playlist item + * \return VLC_SUCCESS or a VLC error code */ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, const char *psz_name, int i_mode, int i_pos, bool b_playlist, bool b_locked ) { return playlist_AddExt( p_playlist, psz_uri, psz_name, - i_mode, i_pos, -1, NULL, 0, b_playlist, b_locked ); + i_mode, i_pos, -1, 0, NULL, 0, b_playlist, b_locked ); } /** @@ -355,29 +342,32 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, * PLAYLIST_END the item will be added at the end of the playlist * regardless of its size * \param i_duration length of the item in milliseconds. - * \param ppsz_options an array of options * \param i_options the number of options + * \param ppsz_options an array of options + * \param i_option_flags options flags * \param b_playlist TRUE for playlist, FALSE for media library * \param b_locked TRUE if the playlist is locked - * \return The id of the playlist item + * \return VLC_SUCCESS or a VLC error code */ int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri, const char *psz_name, int i_mode, int i_pos, - mtime_t i_duration, const char *const *ppsz_options, - int i_options, bool b_playlist, bool b_locked ) + mtime_t i_duration, + int i_options, const char *const *ppsz_options, + unsigned i_option_flags, + bool b_playlist, bool b_locked ) { int i_ret; - input_item_t *p_input = input_ItemNewExt( p_playlist, psz_uri, psz_name, - i_options, ppsz_options, - i_duration ); + input_item_t *p_input; + p_input = input_item_NewExt( p_playlist, psz_uri, psz_name, + i_options, ppsz_options, i_option_flags, + i_duration ); + if( p_input == NULL ) + return VLC_ENOMEM; i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist, b_locked ); - int i_id = (i_ret == VLC_SUCCESS) ? p_input->i_id : -1; - vlc_gc_decref( p_input ); - - return i_id; + return i_ret; } /** @@ -397,99 +387,21 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, int i_mode, int i_pos, bool b_playlist, bool b_locked ) { - playlist_item_t *p_item_cat, *p_item_one; + playlist_item_t *p_item; if( p_playlist->b_die ) return VLC_EGENERIC; - if( !p_playlist->b_doing_ml ) + if( !pl_priv(p_playlist)->b_doing_ml ) PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name, p_input->psz_uri ); PL_LOCK_IF( !b_locked ); - /* Add to ONELEVEL */ - p_item_one = playlist_ItemNewFromInput( p_playlist, p_input ); - if( p_item_one == NULL ) return VLC_ENOMEM; - AddItem( p_playlist, p_item_one, - b_playlist ? p_playlist->p_local_onelevel : - p_playlist->p_ml_onelevel , i_mode, i_pos ); - - /* Add to CATEGORY */ - p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input ); - if( p_item_cat == NULL ) return VLC_ENOMEM; - AddItem( p_playlist, p_item_cat, - b_playlist ? p_playlist->p_local_category : - p_playlist->p_ml_category , i_mode, i_pos ); - - GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one ); - - PL_UNLOCK_IF( !b_locked ); - return VLC_SUCCESS; -} - -/** - * Add input - * - * Add an input item to p_direct_parent in the category tree, and to the - * matching top category in onelevel - * \param p_playlist the playlist to add into - * \param p_input the input item to add - * \param p_direct_parent the parent item to add into - * \param i_mode the mode used when adding - * \param i_pos the position in the playlist where to add. If this is - * PLAYLIST_END the item will be added at the end of the playlist - * regardless of its size - * \param i_cat id of the items category - * \param i_one id of the item onelevel category - * \param b_locked TRUE if the playlist is locked - * \return VLC_SUCCESS if success, VLC_EGENERIC if fail, VLC_ENOMEM if OOM - */ -int playlist_BothAddInput( playlist_t *p_playlist, - input_item_t *p_input, - playlist_item_t *p_direct_parent, - int i_mode, int i_pos, - int *i_cat, int *i_one, bool b_locked ) -{ - playlist_item_t *p_item_cat, *p_item_one, *p_up; - int i_top; - assert( p_input ); - - PL_LOCK_IF( !b_locked ); - - if( !vlc_object_alive( p_playlist ) ) - { - PL_UNLOCK_IF( !b_locked ); - return VLC_EGENERIC; - } - - /* Add to category */ - p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input ); - if( p_item_cat == NULL ) return VLC_ENOMEM; - AddItem( p_playlist, p_item_cat, p_direct_parent, i_mode, i_pos ); - - /* Add to onelevel */ - /** \todo make a faster case for ml import */ - p_item_one = playlist_ItemNewFromInput( p_playlist, p_input ); - if( p_item_one == NULL ) return VLC_ENOMEM; - - p_up = p_direct_parent; - while( p_up->p_parent != p_playlist->p_root_category ) - { - p_up = p_up->p_parent; - } - for( i_top = 0 ; i_top < p_playlist->p_root_onelevel->i_children; i_top++ ) - { - if( p_playlist->p_root_onelevel->pp_children[i_top]->p_input->i_id == - p_up->p_input->i_id ) - { - AddItem( p_playlist, p_item_one, - p_playlist->p_root_onelevel->pp_children[i_top], - i_mode, i_pos ); - break; - } - } - GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one ); + p_item = playlist_ItemNewFromInput( p_playlist, p_input ); + if( p_item == NULL ) return VLC_ENOMEM; + AddItem( p_playlist, p_item, + b_playlist ? p_playlist->p_playing : + p_playlist->p_media_library , i_mode, i_pos ); - if( i_cat ) *i_cat = p_item_cat->i_id; - if( i_one ) *i_one = p_item_one->i_id; + GoAndPreparse( p_playlist, i_mode, p_item ); PL_UNLOCK_IF( !b_locked ); return VLC_SUCCESS; @@ -531,6 +443,65 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, return p_item; } +/** + * Insert a tree of input items into a given playlist node + * + * \param p_playlist the playlist to insert into + * \param p_parent the receiving playlist node (can be an item) + * \param p_node the root of input item tree, + only it's contents will be inserted + * \param i_pos the position in the playlist where to insert. If this is + * PLAYLIST_END the items will be added at the end of the playlist + * regardless of its size + * \param b_flat TRUE if the new tree contents should be flattened into a list + * \return the first new leaf inserted (in playing order) + */ + +playlist_item_t *playlist_InsertInputItemTree ( + playlist_t *p_playlist, playlist_item_t *p_parent, + input_item_node_t *p_node, int i_pos, bool b_flat ) +{ + playlist_item_t *p_first_leaf = NULL; + + if( p_parent->i_children == -1 ) ChangeToNode( p_playlist, p_parent ); + + if( i_pos == PLAYLIST_END ) i_pos = p_parent->i_children; + + for( int i = 0; i < p_node->i_children; i++, i_pos++ ) + { + playlist_item_t *p_child = NULL; + if( b_flat ? p_node->pp_children[i]->i_children == 0 : 1 ) + { + printf("creating a leaf: %i\n", i_pos); + p_child = playlist_NodeAddInput( p_playlist, + p_node->pp_children[i]->p_item, + p_parent, + PLAYLIST_INSERT, i_pos, + pl_Locked ); + printf("leaf done\n"); + } + if( p_node->pp_children[i]->i_children > 0 ) + { + if( b_flat ) + { + printf("flat -> subnode into parent\n"); + p_child = playlist_InsertInputItemTree( p_playlist, p_parent, + p_node->pp_children[i], i_pos, true ); + i_pos += p_node->i_children - 1; /* i_pos += 1 on loop */ + } + else + { + printf("tree -> subnode on its own\n"); + p_child = playlist_InsertInputItemTree( p_playlist, p_child, + p_node->pp_children[i], 0, false ); + } + } + if( i == 0 ) p_first_leaf = p_child; + } + printf("leaving a node\n"); + return p_first_leaf; +} + /***************************************************************************** * Playlist item misc operations *****************************************************************************/ @@ -546,71 +517,66 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, * \param b_locked TRUE if the playlist is locked * \return the item transform in a node */ -playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, - playlist_item_t *p_item, - bool b_locked ) +static playlist_item_t *ItemToNode( playlist_t *p_playlist, + playlist_item_t *p_item, + bool b_locked ) { - - playlist_item_t *p_item_in_category; - /* What we do - * Find the input in CATEGORY. - * - If we find it - * - change it to node - * - we'll return it at the end - * - If we are a direct child of onelevel root, change to node, else - * delete the input from ONELEVEL - * - If we don't find it, just change to node (we are probably in VLM) - * and return NULL - * - * If we were in ONELEVEL, we thus retrieve the node in CATEGORY (will be - * useful for later BothAddInput ) - */ - PL_LOCK_IF( !b_locked ); - /* Fast track the media library, no time to loose */ - if( p_item == p_playlist->p_ml_category ) { - PL_UNLOCK_IF( !b_locked ); - return p_item; - } - - /** \todo First look if we don't already have it */ - p_item_in_category = playlist_ItemFindFromInputAndRoot( - p_playlist, p_item->p_input->i_id, - p_playlist->p_root_category, - true ); + assert( p_item->p_parent ); - if( p_item_in_category ) + bool b_flat = false; + playlist_item_t *p_up = p_item; + while( p_up->p_parent ) { - playlist_item_t *p_item_in_one = playlist_ItemFindFromInputAndRoot( - p_playlist, p_item->p_input->i_id, - p_playlist->p_root_onelevel, - true ); - assert( p_item_in_one ); - - /* We already have it, and there is nothing more to do */ - ChangeToNode( p_playlist, p_item_in_category ); - - /* Item in one is a root, change it to node */ - if( p_item_in_one->p_parent == p_playlist->p_root_onelevel ) - ChangeToNode( p_playlist, p_item_in_one ); - else + if( p_up->p_parent == p_playlist->p_playing || + p_up->p_parent == p_playlist->p_media_library ) { - DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id, - p_playlist->p_root_onelevel, false ); + if( !pl_priv(p_playlist)->b_tree ) b_flat = true; + break; } - p_playlist->b_reset_currently_playing = true; - vlc_object_signal_unlocked( p_playlist ); - var_SetInteger( p_playlist, "item-change", p_item_in_category-> - p_input->i_id ); + p_up = p_up->p_parent; + } + + if( !b_flat ) + { + ChangeToNode( p_playlist, p_item ); + if( p_up == p_playlist->p_root ) + var_SetAddress( p_playlist, "item-change", p_item->p_input ); PL_UNLOCK_IF( !b_locked ); - return p_item_in_category; + return p_item; } else { - ChangeToNode( p_playlist, p_item ); + playlist_item_t *p_status_item = get_current_status_item( p_playlist ); + playlist_item_t *p_status_node = get_current_status_node( p_playlist ); + if( p_item == p_status_item ) + { + /* We're deleting the current playlist item. Update + * the playlist object to point at the previous item + * so the playlist won't be restarted */ + playlist_item_t *p_prev_status_item = NULL; + int i = 0; + while( i < p_status_node->i_children && + p_status_node->pp_children[i] != p_status_item ) + { + p_prev_status_item = p_status_node->pp_children[i]; + i++; + } + if( i == p_status_node->i_children ) + p_prev_status_item = NULL; + if( p_prev_status_item ) + set_current_status_item( p_playlist, p_prev_status_item ); + } + + DeleteFromInput( p_playlist, p_item->p_input, + p_playlist->p_root, false ); + + pl_priv(p_playlist)->b_reset_currently_playing = true; + vlc_cond_signal( &pl_priv(p_playlist)->signal ); + PL_UNLOCK_IF( !b_locked ); - return NULL; + return p_item->p_parent; } } @@ -618,13 +584,13 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, * Find an item within a root, given its input id. * * \param p_playlist the playlist object - * \param i_input_id id of the input + * \param p_item the input item * \param p_root root playlist item * \param b_items_only TRUE if we want the item himself * \return the first found item, or NULL if not found */ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, - int i_input_id, + input_item_t *p_item, playlist_item_t *p_root, bool b_items_only ) { @@ -632,14 +598,14 @@ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, for( i = 0 ; i< p_root->i_children ; i++ ) { if( ( b_items_only ? p_root->pp_children[i]->i_children == -1 : 1 ) && - p_root->pp_children[i]->p_input->i_id == i_input_id ) + p_root->pp_children[i]->p_input == p_item ) { return p_root->pp_children[i]; } else if( p_root->pp_children[i]->i_children >= 0 ) { playlist_item_t *p_search = - playlist_ItemFindFromInputAndRoot( p_playlist, i_input_id, + playlist_ItemFindFromInputAndRoot( p_playlist, p_item, p_root->pp_children[i], b_items_only ); if( p_search ) return p_search; @@ -649,87 +615,86 @@ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, } -static int TreeMove( playlist_t *p_playlist, playlist_item_t *p_item, - playlist_item_t *p_node, int i_newpos ) +static int ItemIndex ( playlist_item_t *p_item ) { - int j; - playlist_item_t *p_detach = p_item->p_parent; - (void)p_playlist; + for( int i = 0; i < p_item->p_parent->i_children; i++ ) + if( p_item->p_parent->pp_children[i] == p_item ) return i; + return -1; +} + +/** + * Moves an item + * + * This function must be entered with the playlist lock + * + * \param p_playlist the playlist + * \param p_item the item to move + * \param p_node the new parent of the item + * \param i_newpos the new position under this new parent + * \return VLC_SUCCESS or an error + */ +int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, + playlist_item_t *p_node, int i_newpos ) +{ + PL_ASSERT_LOCKED; if( p_node->i_children == -1 ) return VLC_EGENERIC; - for( j = 0; j < p_detach->i_children; j++ ) - { - if( p_detach->pp_children[j] == p_item ) break; - } - REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, j ); + playlist_item_t *p_detach = p_item->p_parent; + int i_index = ItemIndex( p_item ); + + REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, i_index ); + + if( p_detach == p_node && i_index < i_newpos ) + i_newpos--; - /* Attach to new parent */ INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item ); p_item->p_parent = p_node; + pl_priv( p_playlist )->b_reset_currently_playing = true; + vlc_cond_signal( &pl_priv( p_playlist )->signal ); return VLC_SUCCESS; } /** - * Moves an item + * Moves an array of items * * This function must be entered with the playlist lock * * \param p_playlist the playlist - * \param p_item the item to move - * \param p_node the new parent of the item - * \param i_newpos the new position under this new parent + * \param i_items the number of indexes to move + * \param pp_items the array of indexes to move + * \param p_node the target node + * \param i_newpos the target position under this node * \return VLC_SUCCESS or an error */ -int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, - playlist_item_t *p_node, int i_newpos ) +int playlist_TreeMoveMany( playlist_t *p_playlist, + int i_items, playlist_item_t **pp_items, + playlist_item_t *p_node, int i_newpos ) { - int i_ret; - /* Drop on a top level node. Move in the two trees */ - if( p_node->p_parent == p_playlist->p_root_category || - p_node->p_parent == p_playlist->p_root_onelevel ) + PL_ASSERT_LOCKED; + + if ( p_node->i_children == -1 ) return VLC_EGENERIC; + + int i; + for( i = 0; i < i_items; i++ ) { - /* Fixme: avoid useless lookups but we need some clean helpers */ - { - /* Fixme: if we try to move a node on a top-level node, it will - * fail because the node doesn't exist in onelevel and we will - * do some shit in onelevel. We should recursively move all items - * within the node */ - playlist_item_t *p_node_onelevel; - playlist_item_t *p_item_onelevel; - p_node_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist, - p_node->p_input->i_id, - p_playlist->p_root_onelevel, - false ); - p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist, - p_item->p_input->i_id, - p_playlist->p_root_onelevel, - false ); - if( p_node_onelevel && p_item_onelevel ) - TreeMove( p_playlist, p_item_onelevel, p_node_onelevel, 0 ); - } - { - playlist_item_t *p_node_category; - playlist_item_t *p_item_category; - p_node_category = playlist_ItemFindFromInputAndRoot( p_playlist, - p_node->p_input->i_id, - p_playlist->p_root_category, - false ); - p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist, - p_item->p_input->i_id, - p_playlist->p_root_category, - false ); - if( p_node_category && p_item_category ) - TreeMove( p_playlist, p_item_category, p_node_category, 0 ); - } - i_ret = VLC_SUCCESS; + playlist_item_t *p_item = pp_items[i]; + int i_index = ItemIndex( p_item ); + playlist_item_t *p_parent = p_item->p_parent; + REMOVE_ELEM( p_parent->pp_children, p_parent->i_children, i_index ); + if ( p_parent == p_node && i_index < i_newpos ) i_newpos--; } - else - i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos ); - p_playlist->b_reset_currently_playing = true; - vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); - return i_ret; + for( i = i_items - 1; i >= 0; i-- ) + { + playlist_item_t *p_item = pp_items[i]; + INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item ); + p_item->p_parent = p_node; + } + + pl_priv( p_playlist )->b_reset_currently_playing = true; + vlc_cond_signal( &pl_priv( p_playlist )->signal ); + return VLC_SUCCESS; } /** @@ -744,40 +709,21 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, int i_node_id, bool b_signal ) { - vlc_value_t val; - playlist_add_t *p_add = (playlist_add_t *)malloc( sizeof( playlist_add_t) ); - if( !p_add ) - return; + playlist_private_t *p_sys = pl_priv(p_playlist); + PL_ASSERT_LOCKED; - p_add->i_item = i_item_id; - p_add->i_node = i_node_id; - val.p_address = p_add; - p_playlist->b_reset_currently_playing = true; + p_sys->b_reset_currently_playing = true; if( b_signal ) - vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); - var_Set( p_playlist, "item-append", val ); - free( p_add ); -} + vlc_cond_signal( &p_sys->signal ); -/***************************************************************************** - * Playlist item accessors - *****************************************************************************/ + playlist_add_t add; + add.i_item = i_item_id; + add.i_node = i_node_id; -/** - * Set the name of a playlist item - * - * \param p_item the item - * \param psz_name the name - * \return VLC_SUCCESS or VLC_EGENERIC - */ -int playlist_ItemSetName( playlist_item_t *p_item, const char *psz_name ) -{ - if( psz_name && p_item ) - { - input_item_SetName( p_item->p_input, psz_name ); - return VLC_SUCCESS; - } - return VLC_EGENERIC; + vlc_value_t val; + val.p_address = &add; + + var_Set( p_playlist, "playlist-item-append", val ); } /*************************************************************************** @@ -786,46 +732,31 @@ int playlist_ItemSetName( playlist_item_t *p_item, const char *psz_name ) /* Enqueue an item for preparsing, and play it, if needed */ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, - playlist_item_t *p_item_cat, - playlist_item_t *p_item_one ) + playlist_item_t *p_item ) { + PL_ASSERT_LOCKED; if( (i_mode & PLAYLIST_GO ) ) { - playlist_item_t *p_parent = p_item_one; - playlist_item_t *p_toplay = NULL; - while( p_parent ) - { - if( p_parent == p_playlist->p_root_category ) - { - p_toplay = p_item_cat; break; - } - else if( p_parent == p_playlist->p_root_onelevel ) - { - p_toplay = p_item_one; break; - } - p_parent = p_parent->p_parent; - } - assert( p_toplay ); - p_playlist->request.b_request = true; - p_playlist->request.i_skip = 0; - p_playlist->request.p_item = p_toplay; - if( p_playlist->p_input ) - input_StopThread( p_playlist->p_input ); - p_playlist->request.i_status = PLAYLIST_RUNNING; - vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); + pl_priv(p_playlist)->request.b_request = true; + pl_priv(p_playlist)->request.i_skip = 0; + pl_priv(p_playlist)->request.p_item = p_item; + if( pl_priv(p_playlist)->p_input ) + input_Stop( pl_priv(p_playlist)->p_input, true ); + pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING; + vlc_cond_signal( &pl_priv(p_playlist)->signal ); } /* Preparse if PREPARSE or SPREPARSE & not enough meta */ - char *psz_artist = input_item_GetArtist( p_item_cat->p_input ); - char *psz_album = input_item_GetAlbum( p_item_cat->p_input ); - if( p_playlist->b_auto_preparse && + char *psz_artist = input_item_GetArtist( p_item->p_input ); + char *psz_album = input_item_GetAlbum( p_item->p_input ); + if( pl_priv(p_playlist)->b_auto_preparse && (i_mode & PLAYLIST_PREPARSE || ( i_mode & PLAYLIST_SPREPARSE && ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) ) ) ) ) - playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input ); + playlist_PreparseEnqueue( p_playlist, p_item->p_input, pl_Locked ); /* If we already have it, signal it */ else if( !EMPTY_STR( psz_artist ) && !EMPTY_STR( psz_album ) ) - input_item_SetPreparsed( p_item_cat->p_input, true ); + input_item_SetPreparsed( p_item->p_input, true ); free( psz_artist ); free( psz_album ); } @@ -834,6 +765,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, playlist_item_t *p_node, int i_mode, int i_pos ) { + PL_ASSERT_LOCKED; ARRAY_APPEND(p_playlist->items, p_item); ARRAY_APPEND(p_playlist->all_items, p_item); @@ -842,7 +774,7 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, else playlist_NodeInsert( p_playlist, p_item, p_node, i_pos ); - if( !p_playlist->b_doing_ml ) + if( !pl_priv(p_playlist)->b_doing_ml ) playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id, !( i_mode & PLAYLIST_NO_REBUILD ) ); } @@ -861,19 +793,20 @@ static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ) } /* Do the actual removal */ -static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, +int playlist_DeleteItem( playlist_t * p_playlist, playlist_item_t *p_item, bool b_stop ) { int i; int i_id = p_item->i_id; - bool b_delay_deletion = false; + PL_ASSERT_LOCKED; if( p_item->i_children > -1 ) { return playlist_NodeDelete( p_playlist, p_item, true, false ); } - p_playlist->b_reset_currently_playing = true; - var_SetInteger( p_playlist, "item-deleted", i_id ); + + pl_priv(p_playlist)->b_reset_currently_playing = true; + var_SetInteger( p_playlist, "playlist-item-deleted", i_id ); /* Remove the item from the bank */ ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i ); @@ -887,30 +820,26 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, /* Check if it is the current item */ if( get_current_status_item( p_playlist ) == p_item ) { - /* Hack we don't call playlist_Control for lock reasons */ + /* Stop it if we have to */ if( b_stop ) { - p_playlist->request.i_status = PLAYLIST_STOPPED; - p_playlist->request.b_request = true; - p_playlist->request.p_item = NULL; + playlist_Control( p_playlist, PLAYLIST_STOP, pl_Locked ); msg_Info( p_playlist, "stopping playback" ); - vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); } - b_delay_deletion = true; + /* In any case, this item can't be the next one to be played ! */ + set_current_status_item( p_playlist, NULL ); } + ARRAY_BSEARCH( p_playlist->current,->i_id, int, i_id, i ); + if( i != -1 ) + ARRAY_REMOVE( p_playlist->current, i ); + PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name ); /* Remove the item from its parent */ playlist_NodeRemoveItem( p_playlist, p_item, p_item->p_parent ); - if( !b_delay_deletion ) - playlist_ItemDelete( p_item ); - else - { - PL_DEBUG( "marking %s for further deletion", PLI_NAME( p_item ) ); - p_item->i_flags |= PLAYLIST_REMOVE_FLAG; - } + playlist_ItemRelease( p_item ); return VLC_SUCCESS; }