X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=0abf61b7b0d70a90d5e5a1c14e8fc4d861bd15d1;hb=04cfbc32da890e7ce71d4bc5e150c581cd9f48f9;hp=720bcbced303ee5db26661fc7d85f02c28df881f;hpb=0900f11014557ea895a290d2c1518d739f97a8b6;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index 720bcbced3..0abf61b7b0 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 @@ -21,19 +21,110 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #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, + bool 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; + 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 == 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, true ); + 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, true ); + + if( i_ret == VLC_SUCCESS && b_play ) + { + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, + 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 @@ -57,8 +148,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 +159,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; + + install_input_item_observer( p_item ); - vlc_object_release( p_playlist ); + pl_Release( p_item->p_playlist ); return p_item; } @@ -79,17 +172,34 @@ playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj, * Playlist item destruction ***************************************************************************/ -/** Delete a playlist item and detach its input item */ +/** + * Delete 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 ) { + uninstall_input_item_observer( p_item ); + vlc_gc_decref( p_item->p_input ); free( 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++ ) @@ -110,41 +220,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_DeleteInputInParent( playlist_t *p_playlist, int i_input_id, + playlist_item_t *p_root, bool b_locked ) +{ + int i_ret; + if( !b_locked ) PL_LOCK; + i_ret = DeleteFromInput( p_playlist, i_input_id, + p_root, true ); + if( !b_locked ) PL_UNLOCK; + 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; - DeleteFromInput( p_playlist, i_input_id, - p_playlist->p_root_category, VLC_TRUE ); - DeleteFromInput( p_playlist, i_input_id, - p_playlist->p_root_onelevel, VLC_TRUE ); + 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 ); if( !b_locked ) PL_UNLOCK; - return VLC_SUCCESS; + return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ? + VLC_SUCCESS : VLC_ENOITEM; } -/** Clear the playlist */ -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 ); + playlist_NodeEmpty( p_playlist, p_playlist->p_local_category, true ); + playlist_NodeEmpty( p_playlist, p_playlist->p_local_onelevel, true ); if( !b_locked ) PL_UNLOCK; } -/** 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 ); + playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id, + true ); 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 @@ -153,14 +311,15 @@ 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 ) + bool b_playlist, bool 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 ); } /** @@ -177,74 +336,111 @@ 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 ) + 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, 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 */ +/** + * 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 ) + 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 ); - 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; } -/** 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 ) + 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 ); - vlc_mutex_lock( & p_playlist->object_lock ); + if( p_playlist->b_die ) return VLC_EGENERIC; + 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 ) @@ -257,7 +453,8 @@ int playlist_BothAddInput( playlist_t *p_playlist, 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; } } @@ -266,27 +463,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; - vlc_mutex_unlock( &p_playlist->object_lock ); + if( !b_locked ) PL_UNLOCK; 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 ) + int i_mode, int i_pos, + bool 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( p_playlist->b_die ) + return NULL; + 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; } @@ -296,13 +508,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; @@ -332,25 +550,28 @@ 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; + p_playlist->b_reset_currently_playing = true; vlc_cond_signal( &p_playlist->object_wait ); var_SetInteger( p_playlist, "item-change", p_item_in_category-> p_input->i_id ); @@ -365,13 +586,19 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, } } -/** 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++ ) @@ -399,6 +626,8 @@ static int TreeMove( playlist_t *p_playlist, playlist_item_t *p_item, { 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++ ) @@ -444,11 +673,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 ); } @@ -458,11 +687,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 ); } @@ -470,22 +699,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; + p_playlist->b_reset_currently_playing = true; vlc_cond_signal( &p_playlist->object_wait ); 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 ) + 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; - vlc_cond_signal( &p_playlist->object_wait ); + p_playlist->b_reset_currently_playing = true; + if( b_signal ) + vlc_cond_signal( &p_playlist->object_wait ); var_Set( p_playlist, "item-append", val ); free( p_add ); } @@ -494,13 +735,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; @@ -511,8 +757,9 @@ int playlist_ItemSetName( playlist_item_t *p_item, const 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 ) ) { @@ -531,7 +778,7 @@ 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 ) @@ -540,30 +787,27 @@ void GoAndPreparse( playlist_t *p_playlist, int i_mode, vlc_cond_signal( &p_playlist->object_wait ); } /* 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 && - ( !p_item_cat->p_input->p_meta || (p_item_cat->p_input->p_meta && - ( EMPTY_STR( p_item_cat->p_input->p_meta->psz_artist ) || - EMPTY_STR( p_item_cat->p_input->p_meta->psz_album ) ) - ) - ) + ( 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( p_item_cat->p_input->p_meta && - !EMPTY_STR( p_item_cat->p_input->p_meta->psz_artist ) && - !EMPTY_STR( p_item_cat->p_input->p_meta->psz_album ) ) - p_item_cat->p_input->p_meta->i_status = ITEM_PREPARSED; + 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 */ -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 ) { 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 ); @@ -571,11 +815,12 @@ void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, 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 ) @@ -588,18 +833,18 @@ void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ) } /* 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, + bool b_stop ) { int i; int i_id = p_item->i_id; - vlc_bool_t b_flag = VLC_FALSE; + bool b_delay_deletion = 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 */ @@ -614,12 +859,12 @@ int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, 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 ); } - b_flag = VLC_TRUE; + b_delay_deletion = true; } PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name ); @@ -627,7 +872,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 {