X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=cf98e589ea9d33063356e97d53dc9757c0094e26;hb=fdb91a064e0291b5d69124008ec52c9d57f3fa77;hp=f8364a1d616e9a6646314e4e22f44a0359edacc1;hpb=51880eb16eed467a21c34b9e4bb962d1bd6a5be7;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index f8364a1d61..cf98e589ea 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -21,7 +21,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 #include "playlist_internal.h" @@ -32,32 +36,132 @@ 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 ); + bool b_stop ); /***************************************************************************** - * Playlist item creation + * An input item has gained a subitem (Event Callback) *****************************************************************************/ -playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj, - const char *psz_uri, - const char *psz_name, - int i_options, - const char *const *ppsz_options, - int i_duration, int i_type ) +static void input_item_subitem_added( const vlc_event_t * p_event, + void * user_data ) { - input_item_t *p_input; - if( psz_uri == NULL ) return NULL; - p_input = input_ItemNewWithType( p_obj, psz_uri, - psz_name, i_options, ppsz_options, - i_duration, i_type ); - return playlist_ItemNewFromInput( p_obj, p_input ); + 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; + + 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 ); + + /* 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, pl_Locked ); + p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST; + } + + int i_ret = playlist_BothAddInput( p_playlist, p_child, + p_item_in_category, + PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END, + NULL, NULL, pl_Locked ); + + if( i_ret == VLC_SUCCESS && b_play ) + { + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, + pl_Locked, p_item_in_category, NULL ); + } + } + + PL_UNLOCK; + } -playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj, +/***************************************************************************** + * 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 ); +} + +/***************************************************************************** + * Listen to vlc_InputItemAddSubItem 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_InputItemDurationChanged, + input_item_changed, p_item ); + vlc_event_attach( p_em, vlc_InputItemMetaChanged, + input_item_changed, p_item ); + vlc_event_attach( p_em, vlc_InputItemNameChanged, + 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_InputItemMetaChanged, + input_item_changed, p_item ); + vlc_event_detach( p_em, vlc_InputItemDurationChanged, + input_item_changed, p_item ); + vlc_event_detach( p_em, vlc_InputItemNameChanged, + 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 ); +} + +/***************************************************************************** + * Playlist item creation + *****************************************************************************/ +playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist, 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 ); p_item->p_input = p_input; vlc_gc_incref( p_item->p_input ); @@ -68,27 +172,63 @@ 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 ); 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 a playlist item and detach its input item */ -int playlist_ItemDelete( playlist_item_t *p_item ) +/** + * Release an item + * + * \param p_item item to delete + * \return VLC_SUCCESS +*/ +int playlist_ItemRelease( playlist_item_t *p_item ) { - vlc_gc_decref( p_item->p_input ); - free( p_item ); + /* 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? */ + ARRAY_APPEND( p_item->p_playlist->items_to_delete, p_item); return VLC_SUCCESS; } -/** Remove an input item when it appears from a root playlist item */ +/** + * Delete input 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_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, - playlist_item_t *p_root, vlc_bool_t b_do_stop ) + playlist_item_t *p_root, bool b_do_stop ) { int i; for( i = 0 ; i< p_root->i_children ; i++ ) @@ -109,43 +249,89 @@ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, return VLC_EGENERIC; } -/** Remove an input item from ONELEVEL and CATEGORY */ +/** + * Delete input 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_root root playlist item + * \param b_locked TRUE if the playlist is locked + * \return VLC_SUCCESS or VLC_EGENERIC + */ +int playlist_DeleteFromInputInParent( playlist_t *p_playlist, int i_input_id, + 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 ); + PL_UNLOCK_IF( !b_locked ); + return i_ret; +} + +/** + * Delete from input + * + * Remove an input item from ONELEVEL and CATEGORY + * \param p_playlist playlist object + * \param i_input_id id of 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, - vlc_bool_t b_locked ) + bool b_locked ) { int i_ret1, i_ret2; - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); i_ret1 = DeleteFromInput( p_playlist, i_input_id, - p_playlist->p_root_category, VLC_TRUE ); + p_playlist->p_root_category, true ); i_ret2 = DeleteFromInput( p_playlist, i_input_id, - p_playlist->p_root_onelevel, VLC_TRUE ); - if( !b_locked ) PL_UNLOCK; + p_playlist->p_root_onelevel, true ); + PL_UNLOCK_IF( !b_locked ); return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ? VLC_SUCCESS : VLC_ENOITEM; } -void playlist_Clear( playlist_t * p_playlist, vlc_bool_t b_locked ) +/** + * Clear the playlist + * + * \param p_playlist playlist object + * \param b_locked TRUE if the playlist is locked + * \return nothing + */ +void playlist_Clear( playlist_t * p_playlist, bool b_locked ) { - if( !b_locked ) PL_LOCK; - 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_UNLOCK; + 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 ); + PL_UNLOCK_IF( !b_locked ); } -/** Remove a playlist item from the playlist, given its id - * This function is to be used only by the playlist */ +/** + * Delete playlist item + * + * Remove a playlist item from the playlist, given its id + * This function is to be used only by the playlist + * \param p_playlist playlist object + * \param i_id id of the item do delete + * \return VLC_SUCCESS or an error + */ int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) { playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id, - VLC_TRUE ); + pl_Locked ); if( !p_item ) return VLC_EGENERIC; - return DeleteInner( p_playlist, p_item, VLC_TRUE ); + return DeleteInner( p_playlist, p_item, true ); } /*************************************************************************** * Playlist item addition ***************************************************************************/ -/** Add an item to the playlist or the media library +/** + * Playlist add + * + * Add an item to the playlist or the media library * \param p_playlist the playlist to add into * \param psz_uri the mrl to add to the playlist * \param psz_name a text giving a name or description of this item @@ -154,11 +340,12 @@ int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) * PLAYLIST_END the item will be added at the end of the playlist * 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 */ 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_locked ) + 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 ); @@ -178,12 +365,13 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, * \param ppsz_options an array of options * \param i_options the number of options * \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 */ 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, vlc_bool_t b_playlist, vlc_bool_t b_locked ) + int i_options, bool b_playlist, bool b_locked ) { int i_ret; input_item_t *p_input = input_ItemNewExt( p_playlist, psz_uri, psz_name, @@ -192,23 +380,37 @@ int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri, i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist, b_locked ); - if( i_ret == VLC_SUCCESS ) - return p_input->i_id; - return -1; + 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 */ +/** + * Add an input item to the playlist node + * + * \param p_playlist the playlist to add into + * \param p_input the input item to add + * \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 b_playlist TRUE for playlist, FALSE for media library + * \param b_locked TRUE if the playlist is locked + * \return VLC_SUCCESS or VLC_ENOMEM or VLC_EGENERIC +*/ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, - int i_mode, int i_pos, vlc_bool_t b_playlist, - vlc_bool_t b_locked ) + int i_mode, int i_pos, bool b_playlist, + bool b_locked ) { playlist_item_t *p_item_cat, *p_item_one; - + if( p_playlist->b_die ) return VLC_EGENERIC; if( !p_playlist->b_doing_ml ) PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name, p_input->psz_uri ); - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); /* Add to ONELEVEL */ p_item_one = playlist_ItemNewFromInput( p_playlist, p_input ); @@ -226,22 +428,41 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one ); - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return VLC_SUCCESS; } -/** Add an input item to p_direct_parent in the category tree, and to the - * matching top category in onelevel **/ +/** + * 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, vlc_bool_t b_locked ) + 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 ); - if( !b_locked ) PL_LOCK; + + if( !vlc_object_alive( p_playlist ) ) + return VLC_EGENERIC; + + PL_LOCK_IF( !b_locked ); /* Add to category */ p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input ); @@ -274,28 +495,42 @@ int playlist_BothAddInput( playlist_t *p_playlist, if( i_cat ) *i_cat = p_item_cat->i_id; if( i_one ) *i_one = p_item_one->i_id; - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return VLC_SUCCESS; } -/** Add an input item to a given node */ +/** + * Add an input item to a given node + * + * \param p_playlist the playlist to add into + * \param p_input the input item to add + * \param p_parent the parent item to add into + * \param i_mode the mode used when addin + * \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 b_locked TRUE if the playlist is locked + * \return the new playlist item + */ 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, - vlc_bool_t b_locked ) + bool b_locked ) { playlist_item_t *p_item; assert( p_input ); assert( p_parent && p_parent->i_children != -1 ); - if( !b_locked ) PL_LOCK; + if( p_playlist->b_die ) + return NULL; + PL_LOCK_IF( !b_locked ); p_item = playlist_ItemNewFromInput( p_playlist, p_input ); if( p_item == NULL ) return NULL; AddItem( p_playlist, p_item, p_parent, i_mode, i_pos ); - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return p_item; } @@ -305,13 +540,19 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, *****************************************************************************/ /** + * Item to node + * * Transform an item to a node. Return the node in the category tree, or NULL * if not found there * This function must be entered without the playlist lock + * \param p_playlist the playlist object + * \param p_item the item to transform + * \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, - vlc_bool_t b_locked ) + bool b_locked ) { playlist_item_t *p_item_in_category; @@ -329,11 +570,11 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, * useful for later BothAddInput ) */ - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); /* Fast track the media library, no time to loose */ if( p_item == p_playlist->p_ml_category ) { - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return p_item; } @@ -341,46 +582,55 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, p_item_in_category = playlist_ItemFindFromInputAndRoot( p_playlist, p_item->p_input->i_id, p_playlist->p_root_category, - VLC_TRUE ); + 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, - VLC_TRUE ); + 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 { DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id, - p_playlist->p_root_onelevel, VLC_FALSE ); + p_playlist->p_root_onelevel, false ); } - p_playlist->b_reset_currently_playing = VLC_TRUE; - vlc_cond_signal( &p_playlist->object_wait ); + 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 ); - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return p_item_in_category; } else { ChangeToNode( p_playlist, p_item ); - if( !b_locked ) PL_UNLOCK; - return NULL; + PL_UNLOCK_IF( !b_locked ); + return p_item; } } -/** Find an item within a root, given its input id. +/** + * 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_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, playlist_item_t *p_root, - vlc_bool_t b_items_only ) + bool b_items_only ) { int i; for( i = 0 ; i< p_root->i_children ; i++ ) @@ -455,11 +705,11 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, p_node_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist, p_node->p_input->i_id, p_playlist->p_root_onelevel, - VLC_FALSE ); + false ); p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist, p_item->p_input->i_id, p_playlist->p_root_onelevel, - VLC_FALSE ); + false ); if( p_node_onelevel && p_item_onelevel ) TreeMove( p_playlist, p_item_onelevel, p_node_onelevel, 0 ); } @@ -469,11 +719,11 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, p_node_category = playlist_ItemFindFromInputAndRoot( p_playlist, p_node->p_input->i_id, p_playlist->p_root_category, - VLC_FALSE ); + false ); p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist, p_item->p_input->i_id, p_playlist->p_root_category, - VLC_FALSE ); + false ); if( p_node_category && p_item_category ) TreeMove( p_playlist, p_item_category, p_node_category, 0 ); } @@ -481,23 +731,34 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, } 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 ); + p_playlist->b_reset_currently_playing = true; + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); return i_ret; } -/** Send a notification that an item has been added to a node */ +/** + * Send a notification that an item has been added to a node + * + * \param p_playlist the playlist object + * \param i_item_id id of the item added + * \param i_node_id id of the node in wich the item was added + * \param b_signal TRUE if the function must send a signal + * \return nothing + */ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, - int i_node_id, vlc_bool_t b_signal ) + int i_node_id, bool b_signal ) { vlc_value_t val; - playlist_add_t *p_add = (playlist_add_t *)malloc(sizeof( playlist_add_t)); + playlist_add_t *p_add = (playlist_add_t *)malloc( sizeof( playlist_add_t) ); + if( !p_add ) + return; + 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 = VLC_TRUE; + p_playlist->b_reset_currently_playing = true; if( b_signal ) - vlc_cond_signal( &p_playlist->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); var_Set( p_playlist, "item-append", val ); free( p_add ); } @@ -506,13 +767,18 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, * Playlist item accessors *****************************************************************************/ -/** Set the name of a playlist item */ +/** + * 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 ) { - 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; @@ -544,26 +810,28 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, p_parent = p_parent->p_parent; } assert( p_toplay ); - p_playlist->request.b_request = VLC_TRUE; + 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_cond_signal( &p_playlist->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); } /* 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( input_item_GetArtist( p_item_cat->p_input ) ) || - ( EMPTY_STR( input_item_GetAlbum( p_item_cat->p_input ) ) ) ) + ( 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( input_item_GetArtist( p_item_cat->p_input ) ) && - !EMPTY_STR( input_item_GetAlbum( p_item_cat->p_input ) ) ) - input_item_SetPreparsed( p_item_cat->p_input, VLC_TRUE ); + else if( !EMPTY_STR( psz_artist ) && !EMPTY_STR( psz_album ) ) + input_item_SetPreparsed( p_item_cat->p_input, true ); + free( psz_artist ); + free( psz_album ); } /* Add the playlist item to the requested node and fire a notification */ @@ -572,7 +840,6 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *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 ); @@ -599,17 +866,16 @@ 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, - vlc_bool_t b_stop ) + bool b_stop ) { int i; int i_id = p_item->i_id; - 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 ); + return playlist_NodeDelete( p_playlist, p_item, true, false ); } - p_playlist->b_reset_currently_playing = VLC_TRUE; + p_playlist->b_reset_currently_playing = true; var_SetInteger( p_playlist, "item-deleted", i_id ); /* Remove the item from the bank */ @@ -617,19 +883,22 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, if( i != -1 ) ARRAY_REMOVE( p_playlist->all_items, i ); + ARRAY_BSEARCH( p_playlist->items,->i_id, int, i_id, i ); + if( i != -1 ) + ARRAY_REMOVE( p_playlist->items, i ); + /* Check if it is the current item */ - if( p_playlist->status.p_item == p_item ) + if( get_current_status_item( p_playlist ) == p_item ) { /* Hack we don't call playlist_Control for lock reasons */ if( b_stop ) { p_playlist->request.i_status = PLAYLIST_STOPPED; - p_playlist->request.b_request = VLC_TRUE; + p_playlist->request.b_request = true; p_playlist->request.p_item = NULL; msg_Info( p_playlist, "stopping playback" ); - vlc_cond_signal( &p_playlist->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); } - b_delay_deletion = VLC_TRUE; } PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name ); @@ -637,13 +906,7 @@ static 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_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; }