X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=0a288d2eb3c539346df09ad981d7bdbf4d3184e0;hb=aa9715b24b0ddefb03016686232176688127fd15;hp=1a475803bcd072371a03caf58ca85e0a6582d5c7;hpb=3a2e81d03df5330334c2267a8409414cca0d61fa;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index 1a475803bc..0a288d2eb3 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -1,7 +1,7 @@ /***************************************************************************** * item.c : Playlist item creation/deletion/add/removal functions ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2007 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -22,18 +22,104 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #include -#include #include #include #include "playlist_internal.h" -void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, - playlist_item_t *p_node, int i_pos ); -void GoAndPreparse( playlist_t *p_playlist, int i_mode, - playlist_item_t *, playlist_item_t * ); -void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ); -int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, - vlc_bool_t b_stop ); +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 * ); +static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ); +static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, + vlc_bool_t b_stop ); + +/***************************************************************************** + * An input item has gained a subitem (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; + vlc_bool_t b_play; + + p_parent = p_event->p_obj; + p_child = p_event->u.input_item_subitem_added.p_new_child; + + 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, + VLC_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, + VLC_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 == p_playlist->status.p_item; + + /* If this item is already a node don't transform it */ + if( p_item_in_category->i_children == -1 ) + { + p_item_in_category = playlist_ItemToNode( p_playlist, + p_item_in_category, VLC_TRUE ); + p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST; + } + + playlist_BothAddInput( p_playlist, p_child, p_item_in_category, + PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END, + NULL, NULL, VLC_TRUE ); + + if( b_play ) + { + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, + VLC_TRUE, p_item_in_category, NULL ); + } + } + + PL_UNLOCK; + +} + +/***************************************************************************** + * Listen to vlc_InputItemAddSubItem event + *****************************************************************************/ +static void install_input_item_observer( playlist_item_t * p_item ) +{ + vlc_event_attach( &p_item->p_input->event_manager, + vlc_InputItemSubItemAdded, + input_item_subitem_added, + p_item ); +} + +static void uninstall_input_item_observer( playlist_item_t * p_item ) +{ + vlc_event_detach( &p_item->p_input->event_manager, + vlc_InputItemSubItemAdded, + input_item_subitem_added, + p_item ); + +} /***************************************************************************** * Playlist item creation @@ -42,7 +128,7 @@ playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri, const char *psz_name, int i_options, - const char **ppsz_options, + const char *const *ppsz_options, int i_duration, int i_type ) { input_item_t *p_input; @@ -57,8 +143,7 @@ playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj, input_item_t *p_input ) { DECMALLOC_NULL( p_item, playlist_item_t ); - playlist_t *p_playlist = p_obj->p_libvlc->p_playlist; - vlc_object_yield( p_playlist ); + playlist_t *p_playlist = pl_Yield( p_obj ); p_item->p_input = p_input; vlc_gc_incref( p_item->p_input ); @@ -69,8 +154,11 @@ playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj, p_item->i_children = -1; p_item->pp_children = NULL; p_item->i_flags = 0; + p_item->p_playlist = p_playlist; - vlc_object_release( p_playlist ); + install_input_item_observer( p_item ); + + pl_Release( p_item->p_playlist ); return p_item; } @@ -82,35 +170,16 @@ playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj, /** Delete a playlist item and detach its input item */ int playlist_ItemDelete( playlist_item_t *p_item ) { + uninstall_input_item_observer( p_item ); + vlc_gc_decref( p_item->p_input ); free( p_item ); return VLC_SUCCESS; } -/** Remove an input item from ONELEVEL and CATEGORY */ -int playlist_DeleteAllFromInput( playlist_t *p_playlist, int i_input_id ) -{ - playlist_DeleteFromInput( p_playlist, i_input_id, - p_playlist->p_root_category, VLC_TRUE ); - playlist_DeleteFromInput( p_playlist, i_input_id, - p_playlist->p_root_onelevel, VLC_TRUE ); - return VLC_SUCCESS; -} - -/** Remove an input item from ONELEVEL and CATEGORY. - * This function must be entered without the playlist lock */ -int playlist_LockDeleteAllFromInput( playlist_t * p_playlist, int i_id ) -{ - int i_ret; - vlc_mutex_lock( &p_playlist->object_lock ); - i_ret = playlist_DeleteAllFromInput( p_playlist, i_id ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return i_ret; -} - /** Remove an input item when it appears from a root playlist item */ -int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id, - playlist_item_t *p_root, vlc_bool_t b_do_stop ) +static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, + playlist_item_t *p_root, vlc_bool_t b_do_stop ) { int i; for( i = 0 ; i< p_root->i_children ; i++ ) @@ -123,45 +192,57 @@ int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id, } else if( p_root->pp_children[i]->i_children >= 0 ) { - int i_ret = playlist_DeleteFromInput( p_playlist, i_input_id, - p_root->pp_children[i], b_do_stop ); + 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; } -/** Remove a playlist item from the playlist, given its id */ -int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) +/** Remove an input item when it appears from a root playlist item */ +int playlist_DeleteInputInParent( playlist_t *p_playlist, int i_input_id, + playlist_item_t *p_root, vlc_bool_t b_locked ) { - playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id ); - if( !p_item ) return VLC_EGENERIC; - return DeleteInner( p_playlist, p_item, VLC_TRUE ); + int i_ret; + if( !b_locked ) PL_LOCK; + i_ret = DeleteFromInput( p_playlist, i_input_id, + p_root, VLC_TRUE ); + if( !b_locked ) PL_UNLOCK; + return i_ret; } -/** Remove a playlist item from the playlist, given its id - * This function should be entered without the playlist lock */ -int playlist_LockDelete( playlist_t * p_playlist, int i_id ) +/** Remove an input item from ONELEVEL and CATEGORY */ +int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id, + vlc_bool_t b_locked ) { - int i_ret; - vlc_mutex_lock( &p_playlist->object_lock ); - i_ret = playlist_DeleteFromItemId( p_playlist, i_id ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return i_ret; + int i_ret1, i_ret2; + if( !b_locked ) PL_LOCK; + i_ret1 = DeleteFromInput( p_playlist, i_input_id, + p_playlist->p_root_category, VLC_TRUE ); + i_ret2 = DeleteFromInput( p_playlist, i_input_id, + p_playlist->p_root_onelevel, VLC_TRUE ); + if( !b_locked ) PL_UNLOCK; + return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ? + VLC_SUCCESS : VLC_ENOITEM; } -/** Clear the playlist */ -void playlist_Clear( playlist_t * p_playlist ) +void playlist_Clear( playlist_t * p_playlist, vlc_bool_t b_locked ) { - playlist_NodeEmpty( p_playlist, p_playlist->p_root_category, VLC_TRUE ); - playlist_NodeEmpty( p_playlist, p_playlist->p_root_onelevel, VLC_TRUE ); + if( !b_locked ) PL_LOCK; + playlist_NodeEmpty( p_playlist, p_playlist->p_local_category, VLC_TRUE ); + playlist_NodeEmpty( p_playlist, p_playlist->p_local_onelevel, VLC_TRUE ); + if( !b_locked ) PL_UNLOCK; } -/** Clear the playlist. This function must be entered without the lock */ -void playlist_LockClear( playlist_t *p_playlist ) + +/** Remove a playlist item from the playlist, given its id + * This function is to be used only by the playlist */ +int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) { - vlc_mutex_lock( &p_playlist->object_lock ); - playlist_Clear( p_playlist ); - vlc_mutex_unlock( &p_playlist->object_lock ); + playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id, + VLC_TRUE ); + if( !p_item ) return VLC_EGENERIC; + return DeleteInner( p_playlist, p_item, VLC_TRUE ); } /*************************************************************************** @@ -174,16 +255,16 @@ void playlist_LockClear( playlist_t *p_playlist ) * \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 it's size + * regardless of its size * \param b_playlist TRUE for playlist, FALSE for media library * \return The id of the playlist item */ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, const char *psz_name, int i_mode, int i_pos, - vlc_bool_t b_playlist ) + vlc_bool_t b_playlist, vlc_bool_t b_locked ) { return playlist_AddExt( p_playlist, psz_uri, psz_name, - i_mode, i_pos, -1, NULL, 0, b_playlist ); + i_mode, i_pos, -1, NULL, 0, b_playlist, b_locked ); } /** @@ -195,7 +276,7 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, * \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 it's size + * 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 @@ -204,19 +285,27 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, */ 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 **ppsz_options, - int i_options, vlc_bool_t b_playlist ) + mtime_t i_duration, const char *const *ppsz_options, + int i_options, vlc_bool_t b_playlist, vlc_bool_t b_locked ) { + int i_ret; input_item_t *p_input = input_ItemNewExt( p_playlist, psz_uri, psz_name, i_options, ppsz_options, i_duration ); - return playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist ); + 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; } /** Add an input item to the playlist node */ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, - int i_mode, int i_pos, vlc_bool_t b_playlist ) + int i_mode, int i_pos, vlc_bool_t b_playlist, + vlc_bool_t b_locked ) { playlist_item_t *p_item_cat, *p_item_one; @@ -224,25 +313,25 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name, p_input->psz_uri ); - vlc_mutex_lock( &p_playlist->object_lock ); + if( !b_locked ) PL_LOCK; /* Add to ONELEVEL */ p_item_one = playlist_ItemNewFromInput( p_playlist, p_input ); - if( p_item_one == NULL ) return VLC_EGENERIC; + 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_pos ); + 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_EGENERIC; + 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_pos ); + p_playlist->p_ml_category , i_mode, i_pos ); GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one ); - vlc_mutex_unlock( &p_playlist->object_lock ); + if( !b_locked ) PL_UNLOCK; return VLC_SUCCESS; } @@ -251,22 +340,23 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, 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_mode, int i_pos, + int *i_cat, int *i_one, vlc_bool_t b_locked ) { playlist_item_t *p_item_cat, *p_item_one, *p_up; int i_top; assert( p_input ); - vlc_mutex_lock( & p_playlist->object_lock ); + if( !b_locked ) PL_LOCK; /* Add to category */ p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input ); - if( p_item_cat == NULL ) return VLC_EGENERIC; - AddItem( p_playlist, p_item_cat, p_direct_parent, i_pos ); + 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_EGENERIC; + if( p_item_one == NULL ) return VLC_ENOMEM; p_up = p_direct_parent; while( p_up->p_parent != p_playlist->p_root_category ) @@ -275,82 +365,46 @@ int playlist_BothAddInput( playlist_t *p_playlist, } 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 ) + 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_pos ); + 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 ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return VLC_SUCCESS; -} + if( i_cat ) *i_cat = p_item_cat->i_id; + if( i_one ) *i_one = p_item_one->i_id; -/** - * Add an item where it should be added, when adding from a node - * (ex: directory access, playlist demuxers, services discovery, ... ) - * \param p_playlist the playlist - * \param p_input the input to add - * \param p_parent the direct node - * \param p_item_in_category the item within category root (as returned by playlist_ItemToNode) - * \param b_forced_parent Are we forced to add only to p_parent ? - */ -void playlist_AddWhereverNeeded( playlist_t *p_playlist, input_item_t *p_input, - playlist_item_t *p_parent, - playlist_item_t *p_item_in_category, - vlc_bool_t b_forced_parent, int i_mode ) -{ - /* If we have forced a parent : - * - Just add the input to the forced parent (which should be p_parent) - * Else - * - If we have item in category, add to it, and to onelevel (bothadd) - * - If we don't, just add to p_parent - */ - if( b_forced_parent == VLC_TRUE || !p_item_in_category ) - { - playlist_NodeAddInput( p_playlist, p_input, p_parent, i_mode, - PLAYLIST_END ); - } - else - { - playlist_BothAddInput( p_playlist, p_input, p_item_in_category, - i_mode, PLAYLIST_END ); - } + if( !b_locked ) PL_UNLOCK; + return VLC_SUCCESS; } - /** Add an input item to a given node */ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, input_item_t *p_input, playlist_item_t *p_parent, - int i_mode, int i_pos ) + int i_mode, int i_pos, + vlc_bool_t b_locked ) { playlist_item_t *p_item; assert( p_input ); assert( p_parent && p_parent->i_children != -1 ); - vlc_mutex_lock( &p_playlist->object_lock ); + if( !b_locked ) PL_LOCK; p_item = playlist_ItemNewFromInput( p_playlist, p_input ); if( p_item == NULL ) return NULL; - AddItem( p_playlist, p_item, p_parent, i_pos ); + AddItem( p_playlist, p_item, p_parent, i_mode, i_pos ); - vlc_mutex_unlock( &p_playlist->object_lock ); + if( !b_locked ) PL_UNLOCK; return p_item; } -/** Add a playlist item to a given node */ -void playlist_NodeAddItem( playlist_t *p_playlist, playlist_item_t *p_item, - playlist_item_t *p_parent, int i_mode, int i_pos ) -{ - vlc_mutex_lock( &p_playlist->object_lock ); - AddItem( p_playlist, p_item, p_parent, i_pos ); - vlc_mutex_unlock( &p_playlist->object_lock ); -} - /***************************************************************************** * Playlist item misc operations *****************************************************************************/ @@ -361,7 +415,8 @@ void playlist_NodeAddItem( playlist_t *p_playlist, playlist_item_t *p_item, * This function must be entered without the playlist lock */ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, - playlist_item_t *p_item ) + playlist_item_t *p_item, + vlc_bool_t b_locked ) { playlist_item_t *p_item_in_category; @@ -379,65 +434,66 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, * useful for later BothAddInput ) */ + if( !b_locked ) PL_LOCK; + /* Fast track the media library, no time to loose */ - if( p_item == p_playlist->p_ml_category ) + if( p_item == p_playlist->p_ml_category ) { + if( !b_locked ) PL_UNLOCK; 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 ); + p_playlist->p_root_category, + VLC_TRUE ); if( p_item_in_category ) { playlist_item_t *p_item_in_one = playlist_ItemFindFromInputAndRoot( p_playlist, p_item->p_input->i_id, - p_playlist->p_root_onelevel ); + p_playlist->p_root_onelevel, + VLC_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 { - playlist_DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id, - p_playlist->p_root_onelevel, VLC_FALSE ); + DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id, + p_playlist->p_root_onelevel, VLC_FALSE ); } - p_playlist->b_reset_random = VLC_TRUE; + p_playlist->b_reset_currently_playing = VLC_TRUE; + vlc_cond_signal( &p_playlist->object_wait ); var_SetInteger( p_playlist, "item-change", p_item_in_category-> p_input->i_id ); + if( !b_locked ) PL_UNLOCK; return p_item_in_category; } else { ChangeToNode( p_playlist, p_item ); + if( !b_locked ) PL_UNLOCK; return NULL; } } -/** Transform an item to a node - * This function must be entered without the playlist lock - * \see playlist_ItemToNode - */ -playlist_item_t * playlist_LockItemToNode( playlist_t *p_playlist, - playlist_item_t *p_item ) -{ - playlist_item_t *p_ret; - vlc_mutex_lock( &p_playlist->object_lock ); - p_ret = playlist_ItemToNode( p_playlist, p_item ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return p_ret; -} - /** Find an item within a root, given its input id. * \return the first found item, or NULL if not found */ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, int i_input_id, - playlist_item_t *p_root ) + playlist_item_t *p_root, + vlc_bool_t b_items_only ) { int i; for( i = 0 ; i< p_root->i_children ; i++ ) { - if( p_root->pp_children[i]->i_children == -1 && + 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 ) { return p_root->pp_children[i]; @@ -446,7 +502,8 @@ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, { playlist_item_t *p_search = playlist_ItemFindFromInputAndRoot( p_playlist, i_input_id, - p_root->pp_children[i] ); + p_root->pp_children[i], + b_items_only ); if( p_search ) return p_search; } } @@ -454,6 +511,28 @@ 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 ) +{ + int j; + playlist_item_t *p_detach = p_item->p_parent; + (void)p_playlist; + + 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 ); + + /* Attach to new parent */ + INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item ); + p_item->p_parent = p_node; + + return VLC_SUCCESS; +} + /** * Moves an item * @@ -468,34 +547,65 @@ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, playlist_item_t *p_node, int i_newpos ) { - int j; - playlist_item_t *p_detach = NULL; - - if( p_node->i_children == -1 ) return VLC_EGENERIC; - - p_detach = p_item->p_parent; - for( j = 0; j < p_detach->i_children; j++ ) + 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 ) { - if( p_detach->pp_children[j] == p_item ) break; + /* 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, + VLC_FALSE ); + p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist, + p_item->p_input->i_id, + p_playlist->p_root_onelevel, + VLC_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, + VLC_FALSE ); + p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist, + p_item->p_input->i_id, + p_playlist->p_root_category, + VLC_FALSE ); + if( p_node_category && p_item_category ) + TreeMove( p_playlist, p_item_category, p_node_category, 0 ); + } + i_ret = VLC_SUCCESS; } - REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, j ); - - /* Attach to new parent */ - INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item ); - - return VLC_SUCCESS; + else + i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos ); + p_playlist->b_reset_currently_playing = VLC_TRUE; + vlc_cond_signal( &p_playlist->object_wait ); + return i_ret; } /** Send a notification that an item has been added to a node */ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, - int i_node_id ) + int i_node_id, vlc_bool_t b_signal ) { vlc_value_t val; playlist_add_t *p_add = (playlist_add_t *)malloc(sizeof( playlist_add_t)); p_add->i_item = i_item_id; p_add->i_node = i_node_id; val.p_address = p_add; - p_playlist->b_reset_random = VLC_TRUE; + p_playlist->b_reset_currently_playing = VLC_TRUE; + if( b_signal ) + vlc_cond_signal( &p_playlist->object_wait ); var_Set( p_playlist, "item-append", val ); free( p_add ); } @@ -505,12 +615,11 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, *****************************************************************************/ /** Set the name of a playlist item */ -int playlist_ItemSetName( playlist_item_t *p_item, char *psz_name ) +int playlist_ItemSetName( playlist_item_t *p_item, const char *psz_name ) { if( psz_name && p_item ) { - if( p_item->p_input->psz_name ) free( p_item->p_input->psz_name ); - p_item->p_input->psz_name = strdup( psz_name ); + input_item_SetName( p_item->p_input, psz_name ); return VLC_SUCCESS; } return VLC_EGENERIC; @@ -521,8 +630,9 @@ int playlist_ItemSetName( playlist_item_t *p_item, char *psz_name ) ***************************************************************************/ /* Enqueue an item for preparsing, and play it, if needed */ -void GoAndPreparse( playlist_t *p_playlist, int i_mode, - playlist_item_t *p_item_cat, playlist_item_t *p_item_one ) +static void GoAndPreparse( playlist_t *p_playlist, int i_mode, + playlist_item_t *p_item_cat, + playlist_item_t *p_item_one ) { if( (i_mode & PLAYLIST_GO ) ) { @@ -545,92 +655,76 @@ void GoAndPreparse( playlist_t *p_playlist, int i_mode, 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_cond_signal( &p_playlist->object_wait ); } - if( i_mode & PLAYLIST_PREPARSE && - var_CreateGetBool( p_playlist, "auto-preparse" ) ) - { + /* 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 && + (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 ); - } + /* 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, VLC_TRUE ); + free( psz_artist ); + free( psz_album ); } /* Add the playlist item to the requested node and fire a notification */ -void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, - playlist_item_t *p_node, int i_pos ) +static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, + playlist_item_t *p_node, int i_mode, int i_pos ) { - INSERT_ELEM( p_playlist->pp_items, p_playlist->i_size, - p_playlist->i_size, p_item ); - INSERT_ELEM( p_playlist->pp_all_items, p_playlist->i_all_size, - p_playlist->i_all_size, p_item ); + ARRAY_APPEND(p_playlist->items, p_item); + ARRAY_APPEND(p_playlist->all_items, p_item); p_playlist->i_enabled ++; if( i_pos == PLAYLIST_END ) - { playlist_NodeAppend( p_playlist, p_item, p_node ); - } else - { playlist_NodeInsert( p_playlist, p_item, p_node, i_pos ); - } + if( !p_playlist->b_doing_ml ) - playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id ); + playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id, + !( i_mode & PLAYLIST_NO_REBUILD ) ); } /* Actually convert an item to a node */ -void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ) +static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ) { int i; if( p_item->i_children == -1 ) p_item->i_children = 0; /* Remove it from the array of available items */ - for( i = 0 ; i < p_playlist->i_size ; i++ ) - { - if( p_item == p_playlist->pp_items[i] ) - { - REMOVE_ELEM( p_playlist->pp_items, p_playlist->i_size, i ); - } - } + ARRAY_BSEARCH( p_playlist->items,->i_id, int, p_item->i_id, i ); + if( i != -1 ) + ARRAY_REMOVE( p_playlist->items, i ); } /* Do the actual removal */ -int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, - vlc_bool_t b_stop ) +static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, + vlc_bool_t b_stop ) { - int i, i_top, i_bottom; + int i; int i_id = p_item->i_id; - vlc_bool_t b_flag = VLC_FALSE; + vlc_bool_t b_delay_deletion = VLC_FALSE; if( p_item->i_children > -1 ) { return playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE ); } - p_playlist->b_reset_random = VLC_TRUE; + p_playlist->b_reset_currently_playing = VLC_TRUE; var_SetInteger( p_playlist, "item-deleted", i_id ); /* Remove the item from the bank */ - i_bottom = 0; i_top = p_playlist->i_all_size - 1; - i = i_top / 2; - while( p_playlist->pp_all_items[i]->i_id != i_id && - i_top > i_bottom ) - { - if( p_playlist->pp_all_items[i]->i_id < i_id ) - { - i_bottom = i + 1; - } - else - { - i_top = i - 1; - } - i = i_bottom + ( i_top - i_bottom ) / 2; - } - if( p_playlist->pp_all_items[i]->i_id == i_id ) - { - REMOVE_ELEM( p_playlist->pp_all_items, p_playlist->i_all_size, i ); - } + ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i ); + if( i != -1 ) + ARRAY_REMOVE( p_playlist->all_items, i ); /* Check if it is the current item */ if( p_playlist->status.p_item == p_item ) @@ -642,8 +736,9 @@ int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, p_playlist->request.b_request = VLC_TRUE; p_playlist->request.p_item = NULL; msg_Info( p_playlist, "stopping playback" ); + vlc_cond_signal( &p_playlist->object_wait ); } - b_flag = VLC_TRUE; + b_delay_deletion = VLC_TRUE; } PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name ); @@ -651,7 +746,7 @@ int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, /* Remove the item from its parent */ playlist_NodeRemoveItem( p_playlist, p_item, p_item->p_parent ); - if( b_flag == VLC_FALSE ) + if( !b_delay_deletion ) playlist_ItemDelete( p_item ); else {