X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=3957f1c3932a30ddb67604d797bc8ece7850aae1;hb=fdb91a064e0291b5d69124008ec52c9d57f3fa77;hp=d696344502eb75b6d99297da5d98dfef8af1a403;hpb=32ed571bf3bd17fc99c8d2c3c4234a72de069946;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index d696344502..cf98e589ea 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -1,10 +1,11 @@ /***************************************************************************** - * item.c : Playlist item functions + * item.c : Playlist item creation/deletion/add/removal functions ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN - * $Id: item.c,v 1.3 2003/11/23 16:24:20 garf Exp $ + * Copyright (C) 1999-2007 the VideoLAN team + * $Id$ * * Authors: Samuel Hocevar + * Clément Stenac * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,498 +19,894 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include /* free(), strtol() */ -#include /* sprintf() */ -#include /* strerror() */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include "playlist_internal.h" + +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 ); -#include -#include -#include - -#include "vlc_playlist.h" - -/** - * Add an MRL to the playlist. This is a simplified version of - * playlist_AddExt inculded for convenince. It equals calling playlist_AddExt - * with psz_name == psz_target and i_duration == -1 - */ - -int playlist_Add( playlist_t *p_playlist, const char *psz_target, - const char **ppsz_options, int i_options, - int i_mode, int i_pos ) -{ - return playlist_AddExt( p_playlist, psz_target, psz_target, -1, - ppsz_options, i_options, i_mode, i_pos ); -} - -/** - * Add a MRL into the playlist. - * - * \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 - * \param i_duration a hint about the duration of this item, in miliseconds, or - * -1 if unknown. - * \param ppsz_options array of options - * \param i_options number of items in ppsz_options - * \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 - * \return always returns 0 -*/ -int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri, - const char * psz_name, mtime_t i_duration, - const char **ppsz_options, int i_options, int i_mode, - int i_pos ) +/***************************************************************************** + * 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_item; - - p_item = malloc( sizeof( playlist_item_t ) ); - if( p_item == NULL ) + 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 ) { - msg_Err( p_playlist, "out of memory" ); - } - - p_item->psz_name = strdup( psz_name ); - p_item->psz_uri = strdup( psz_uri ); - p_item->psz_author = strdup( "" ); - p_item->i_duration = i_duration; - p_item->i_type = 0; - p_item->i_status = 0; - p_item->b_autodeletion = VLC_FALSE; - p_item->b_enabled = VLC_TRUE; - p_item->i_group = PLAYLIST_TYPE_MANUAL; + /* 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; + } - p_item->ppsz_options = NULL; - p_item->i_options = i_options; + b_play = b_play && + p_item_in_category == get_current_status_item( p_playlist ); - if( i_options ) - { - int i; + /* 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; + } - p_item->ppsz_options = (char **)malloc( i_options * sizeof(char *) ); - for( i = 0; i < i_options; i++ ) - p_item->ppsz_options[i] = strdup( ppsz_options[i] ); + 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 ); + } } - return playlist_AddItem( p_playlist, p_item, i_mode, i_pos ); + PL_UNLOCK; + } -/** - * Add a playlist item into a playlist - * - * \param p_playlist the playlist to insert into - * \param p_item the playlist item to insert - * \param i_mode the mode used when adding - * \param i_pos the possition 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 - * \return always returns 0 -*/ -int playlist_AddItem( playlist_t *p_playlist, playlist_item_t * p_item, - int i_mode, int i_pos) +/***************************************************************************** + * 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 ) { - vlc_value_t val; + (void)p_event; + playlist_item_t * p_item = user_data; + var_SetInteger( p_item->p_playlist, "item-change", p_item->i_id ); +} - vlc_mutex_lock( &p_playlist->object_lock ); +/***************************************************************************** + * 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 ); +} - /* - * CHECK_INSERT : checks if the item is already enqued before - * enqueing it - */ - if ( i_mode & PLAYLIST_CHECK_INSERT ) - { - int j; - - if ( p_playlist->pp_items ) - { - for ( j = 0; j < p_playlist->i_size; j++ ) - { - if ( !strcmp( p_playlist->pp_items[j]->psz_uri, p_item->psz_uri ) ) - { - if( p_item->psz_name ) - { - free( p_item->psz_name ); - } - if( p_item->psz_uri ) - { - free( p_item->psz_uri ); - } - if( p_item->i_options ) - { - int i_opt; - for( i_opt = 0; i_opt < p_item->i_options; i_opt++ ) - { - free( p_item->ppsz_options[i_opt] ); - } - free( p_item->ppsz_options ); - } - if( p_item->psz_author ) - { - free( p_item->psz_author ); - } - free( p_item ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return 0; - } - } - } - i_mode &= ~PLAYLIST_CHECK_INSERT; - i_mode |= PLAYLIST_APPEND; - } +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 ); - msg_Dbg( p_playlist, "adding playlist item « %s » ( %s )", p_item->psz_name, p_item->psz_uri); + p_item->p_input = p_input; + vlc_gc_incref( p_item->p_input ); - /* Create the new playlist item */ + p_item->i_id = ++p_playlist->i_last_playlist_id; + p_item->p_parent = NULL; + p_item->i_children = -1; + p_item->pp_children = NULL; + p_item->i_flags = 0; + p_item->p_playlist = p_playlist; - /* Do a few boundary checks and allocate space for the item */ - if( i_pos == PLAYLIST_END ) - { - if( i_mode & PLAYLIST_INSERT ) - { - i_mode &= ~PLAYLIST_INSERT; - i_mode |= PLAYLIST_APPEND; - } + install_input_item_observer( p_item ); - i_pos = p_playlist->i_size - 1; - } + return p_item; +} - if( !(i_mode & PLAYLIST_REPLACE) - || i_pos < 0 || i_pos >= p_playlist->i_size ) - { - /* Additional boundary checks */ - if( i_mode & PLAYLIST_APPEND ) - { - i_pos++; - } +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 ); +} - if( i_pos < 0 ) - { - i_pos = 0; - } - else if( i_pos > p_playlist->i_size ) - { - i_pos = p_playlist->i_size; - } +/*************************************************************************** + * Playlist item destruction + ***************************************************************************/ - INSERT_ELEM( p_playlist->pp_items, - p_playlist->i_size, - i_pos, - p_item ); - p_playlist->i_enabled ++; +/** + * Release an item + * + * \param p_item item to delete + * \return VLC_SUCCESS +*/ +int playlist_ItemRelease( playlist_item_t *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; +} - if( p_playlist->i_index >= i_pos ) - { - p_playlist->i_index++; - } - } - else +/** + * 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, bool b_do_stop ) +{ + int i; + for( i = 0 ; i< p_root->i_children ; i++ ) { - /* i_mode == PLAYLIST_REPLACE and 0 <= i_pos < p_playlist->i_size */ - if( p_playlist->pp_items[i_pos]->psz_name ) + if( p_root->pp_children[i]->i_children == -1 && + p_root->pp_children[i]->p_input->i_id == i_input_id ) { - free( p_playlist->pp_items[i_pos]->psz_name ); + DeleteInner( p_playlist, p_root->pp_children[i], b_do_stop ); + return VLC_SUCCESS; } - if( p_playlist->pp_items[i_pos]->psz_uri ) + else if( p_root->pp_children[i]->i_children >= 0 ) { - free( p_playlist->pp_items[i_pos]->psz_uri ); + 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; } - /* XXX: what if the item is still in use? */ - free( p_playlist->pp_items[i_pos] ); - p_playlist->pp_items[i_pos] = p_item; } + return VLC_EGENERIC; +} - if( i_mode & PLAYLIST_GO ) - { - p_playlist->i_index = i_pos; - if( p_playlist->p_input ) - { - input_StopThread( p_playlist->p_input ); - } - p_playlist->i_status = PLAYLIST_RUNNING; - } +/** + * 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; +} - vlc_mutex_unlock( &p_playlist->object_lock ); +/** + * 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, + bool b_locked ) +{ + int i_ret1, i_ret2; + 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 ); + PL_UNLOCK_IF( !b_locked ); + return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ? + VLC_SUCCESS : VLC_ENOITEM; +} - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); +/** + * 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 ) +{ + 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 ); +} - return 0; +/** + * 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, + pl_Locked ); + if( !p_item ) return VLC_EGENERIC; + return DeleteInner( p_playlist, p_item, true ); } +/*************************************************************************** + * Playlist item addition + ***************************************************************************/ /** - * delete an item from a playlist. + * Playlist add * - * \param p_playlist the playlist to remove from. - * \param i_pos the position of the item to remove - * \return returns 0 + * 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 + * \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 The id of the playlist item */ -int playlist_Delete( playlist_t * p_playlist, int i_pos ) +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 ) { - vlc_value_t val; - vlc_mutex_lock( &p_playlist->object_lock ); + return playlist_AddExt( p_playlist, psz_uri, psz_name, + i_mode, i_pos, -1, NULL, 0, b_playlist, b_locked ); +} - /* if i_pos is the current played item, playlist should stop playing it */ - if( ( p_playlist->i_status == PLAYLIST_RUNNING) && (p_playlist->i_index == i_pos) ) - { - playlist_Command( p_playlist, PLAYLIST_STOP, 0 ); - } +/** + * Add a MRL into the playlist or the media library, duration and options given + * + * \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 + * \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_duration length of the item in milliseconds. + * \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, 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 ); - if( i_pos >= 0 && i_pos < p_playlist->i_size ) - { - msg_Dbg( p_playlist, "deleting playlist item « %s »", - p_playlist->pp_items[i_pos]->psz_name ); + 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; - if( p_playlist->pp_items[i_pos]->psz_name ) - { - free( p_playlist->pp_items[i_pos]->psz_name ); - } - if( p_playlist->pp_items[i_pos]->psz_uri ) - { - free( p_playlist->pp_items[i_pos]->psz_uri ); - } - if( p_playlist->pp_items[i_pos]->psz_author ) - { - free( p_playlist->pp_items[i_pos]->psz_author ); - } - if( p_playlist->pp_items[i_pos]->i_options ) - { - int i; + vlc_gc_decref( p_input ); - for( i = 0; i < p_playlist->pp_items[i_pos]->i_options; i++ ) - free( p_playlist->pp_items[i_pos]->ppsz_options[i] ); + return i_id; +} - free( p_playlist->pp_items[i_pos]->ppsz_options ); - } +/** + * 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, 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 ); + + 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 ); - /* XXX: what if the item is still in use? */ - free( p_playlist->pp_items[i_pos] ); + if( !vlc_object_alive( p_playlist ) ) + return VLC_EGENERIC; - if( i_pos <= p_playlist->i_index ) + PL_LOCK_IF( !b_locked ); + + /* 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 ) { - p_playlist->i_index--; + AddItem( p_playlist, p_item_one, + p_playlist->p_root_onelevel->pp_children[i_top], + i_mode, i_pos ); + break; } - - /* Renumber the playlist */ - REMOVE_ELEM( p_playlist->pp_items, - p_playlist->i_size, - i_pos ); - if( p_playlist->i_enabled > 0 ) - p_playlist->i_enabled--; } + GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one ); - vlc_mutex_unlock( &p_playlist->object_lock ); - - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); + if( i_cat ) *i_cat = p_item_cat->i_id; + if( i_one ) *i_one = p_item_one->i_id; - return 0; + PL_UNLOCK_IF( !b_locked ); + return VLC_SUCCESS; } /** - * Disables a playlist item + * Add an input item to a given node * - * \param p_playlist the playlist to disable from. - * \param i_pos the position of the item to disable - * \return returns 0 + * \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 */ -int playlist_Disable( playlist_t * p_playlist, int i_pos ) +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, + bool b_locked ) { - vlc_value_t val; - vlc_mutex_lock( &p_playlist->object_lock ); - + playlist_item_t *p_item; + assert( p_input ); + assert( p_parent && p_parent->i_children != -1 ); - if( i_pos >= 0 && i_pos < p_playlist->i_size ) - { - msg_Dbg( p_playlist, "disabling playlist item « %s »", - p_playlist->pp_items[i_pos]->psz_name ); - - if( p_playlist->pp_items[i_pos]->b_enabled == VLC_TRUE ) - p_playlist->i_enabled--; - p_playlist->pp_items[i_pos]->b_enabled = VLC_FALSE; - } + if( p_playlist->b_die ) + return NULL; + PL_LOCK_IF( !b_locked ); - vlc_mutex_unlock( &p_playlist->object_lock ); + 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 ); - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); + PL_UNLOCK_IF( !b_locked ); - return 0; + return p_item; } +/***************************************************************************** + * Playlist item misc operations + *****************************************************************************/ + /** - * Enables a playlist item + * Item to node * - * \param p_playlist the playlist to enable from. - * \param i_pos the position of the item to enable - * \return returns 0 + * 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 */ -int playlist_Enable( playlist_t * p_playlist, int i_pos ) +playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, + playlist_item_t *p_item, + bool b_locked ) { - vlc_value_t val; - vlc_mutex_lock( &p_playlist->object_lock ); - if( i_pos >= 0 && i_pos < p_playlist->i_size ) - { - msg_Dbg( p_playlist, "enabling playlist item « %s »", - p_playlist->pp_items[i_pos]->psz_name ); + 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 ) + */ - if( p_playlist->pp_items[i_pos]->b_enabled == VLC_FALSE ) - p_playlist->i_enabled++; + PL_LOCK_IF( !b_locked ); - p_playlist->pp_items[i_pos]->b_enabled = VLC_TRUE; + /* 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; } - vlc_mutex_unlock( &p_playlist->object_lock ); + /** \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 ); - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); - - return 0; + 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, + 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, false ); + } + 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 ); + PL_UNLOCK_IF( !b_locked ); + return p_item_in_category; + } + else + { + ChangeToNode( p_playlist, p_item ); + PL_UNLOCK_IF( !b_locked ); + return p_item; + } } /** - * Disables a playlist group + * Find an item within a root, given its input id. * - * \param p_playlist the playlist to disable from. - * \param i_pos the id of the group to disable - * \return returns 0 + * \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 */ -int playlist_DisableGroup( playlist_t * p_playlist, int i_group) +playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, + int i_input_id, + playlist_item_t *p_root, + bool b_items_only ) { - vlc_value_t val; int i; - vlc_mutex_lock( &p_playlist->object_lock ); - - msg_Dbg(p_playlist,"Disabling group %i",i_group); - for( i = 0 ; i< p_playlist->i_size; i++ ) + for( i = 0 ; i< p_root->i_children ; i++ ) { - if( p_playlist->pp_items[i]->i_group == i_group ) + 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]; + } + else if( p_root->pp_children[i]->i_children >= 0 ) { - msg_Dbg( p_playlist, "disabling playlist item « %s »", - p_playlist->pp_items[i]->psz_name ); + playlist_item_t *p_search = + playlist_ItemFindFromInputAndRoot( p_playlist, i_input_id, + p_root->pp_children[i], + b_items_only ); + if( p_search ) return p_search; + } + } + return NULL; +} - if( p_playlist->pp_items[i]->b_enabled == VLC_TRUE ) - p_playlist->i_enabled--; - p_playlist->pp_items[i]->b_enabled = VLC_FALSE; - } +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; } - vlc_mutex_unlock( &p_playlist->object_lock ); + REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, j ); - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); + /* 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 0; + return VLC_SUCCESS; } /** - * Enables a playlist group + * Moves an item * - * \param p_playlist the playlist to enable from. - * \param i_pos the id of the group to enable - * \return returns 0 + * 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_EnableGroup( playlist_t * p_playlist, int i_group) +int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, + playlist_item_t *p_node, int i_newpos ) { - vlc_value_t val; - int i; - vlc_mutex_lock( &p_playlist->object_lock ); - - for( i = 0 ; i< p_playlist->i_size; i++ ) + 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_playlist->pp_items[i]->i_group == i_group ) + /* Fixme: avoid useless lookups but we need some clean helpers */ { - msg_Dbg( p_playlist, "enabling playlist item « %s »", - p_playlist->pp_items[i]->psz_name ); - - if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE ) - p_playlist->i_enabled++; - - p_playlist->pp_items[i]->b_enabled = VLC_TRUE; + /* 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; } - vlc_mutex_unlock( &p_playlist->object_lock ); - - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); - - return 0; + 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; } /** - * Move an item in a playlist + * Send a notification that an item has been added to a node * - * Move the item in the playlist with position i_pos before the current item - * at position i_newpos. - * \param p_playlist the playlist to move items in - * \param i_pos the position of the item to move - * \param i_newpos the position of the item that will be behind the moved item - * after the move - * \return returns 0 + * \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 */ -int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos) +void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, + int i_node_id, bool b_signal ) { - vlc_value_t val; - vlc_mutex_lock( &p_playlist->object_lock ); + vlc_value_t val; + 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 = true; + if( b_signal ) + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); + var_Set( p_playlist, "item-append", val ); + free( p_add ); +} - /* take into account that our own row disappears. */ - if ( i_pos < i_newpos ) i_newpos--; +/***************************************************************************** + * Playlist item accessors + *****************************************************************************/ - if( i_pos >= 0 && i_newpos >=0 && i_pos <= p_playlist->i_size - && i_newpos <= p_playlist->i_size ) +/** + * 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 ) { - playlist_item_t * temp; - - msg_Dbg( p_playlist, "moving playlist item « %s » (%i -> %i)", - p_playlist->pp_items[i_pos]->psz_name, i_pos, - i_newpos ); + input_item_SetName( p_item->p_input, psz_name ); + return VLC_SUCCESS; + } + return VLC_EGENERIC; +} - if( i_pos == p_playlist->i_index ) - { - p_playlist->i_index = i_newpos; - } - else if( i_pos > p_playlist->i_index && i_newpos <= p_playlist->i_index ) - { - p_playlist->i_index++; - } - else if( i_pos < p_playlist->i_index && i_newpos >= p_playlist->i_index ) - { - p_playlist->i_index--; - } +/*************************************************************************** + * The following functions are local + ***************************************************************************/ - if ( i_pos < i_newpos ) +/* 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 ) +{ + if( (i_mode & PLAYLIST_GO ) ) + { + playlist_item_t *p_parent = p_item_one; + playlist_item_t *p_toplay = NULL; + while( p_parent ) { - temp = p_playlist->pp_items[i_pos]; - while ( i_pos < i_newpos ) + if( p_parent == p_playlist->p_root_category ) { - p_playlist->pp_items[i_pos] = p_playlist->pp_items[i_pos+1]; - i_pos++; + p_toplay = p_item_cat; break; } - p_playlist->pp_items[i_newpos] = temp; - } - else if ( i_pos > i_newpos ) - { - temp = p_playlist->pp_items[i_pos]; - while ( i_pos > i_newpos ) + else if( p_parent == p_playlist->p_root_onelevel ) { - p_playlist->pp_items[i_pos] = p_playlist->pp_items[i_pos-1]; - i_pos--; + p_toplay = p_item_one; break; } - p_playlist->pp_items[i_newpos] = temp; + 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) ); } + /* 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, true ); + free( psz_artist ); + free( psz_album ); +} + +/* Add the playlist item to the requested node and fire a notification */ +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); + + 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, + !( i_mode & PLAYLIST_NO_REBUILD ) ); +} + +/* Actually convert an item to a node */ +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 */ + 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 */ +static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, + bool b_stop ) +{ + int i; + int i_id = p_item->i_id; + + 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 ); + + /* Remove the item from the bank */ + ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i ); + 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( 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 = true; + p_playlist->request.p_item = NULL; + msg_Info( p_playlist, "stopping playback" ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); + } + } + + PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name ); - vlc_mutex_unlock( &p_playlist->object_lock ); + /* Remove the item from its parent */ + playlist_NodeRemoveItem( p_playlist, p_item, p_item->p_parent ); - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); + playlist_ItemRelease( p_item ); - return 0; + return VLC_SUCCESS; }