X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=9b8a469037fa7833b475124e6dc4096d3d596e40;hb=b904c184ca24f41624f25d56c1767f2bc3fb9b2b;hp=13b98c1fa35f27b21feb930f74d2abbbb7b9fa7b;hpb=d3de64660f62998d7295905aaca867ba9f9e5ec8;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index 13b98c1fa3..9b8a469037 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.9 2003/12/13 17:16:11 gbazin 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,510 +19,774 @@ * * 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 * ); +static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ); + +static int RecursiveAddIntoParent ( + playlist_t *p_playlist, playlist_item_t *p_parent, + input_item_node_t *p_node, int i_pos, bool b_flat, + playlist_item_t **pp_first_leaf ); -#include -#include -#include -#include +/***************************************************************************** + * An input item has gained subitems (Event Callback) + *****************************************************************************/ -#include "vlc_playlist.h" +static void input_item_add_subitem_tree ( const vlc_event_t * p_event, + void * user_data ) +{ + input_item_t *p_input = p_event->p_obj; + playlist_t *p_playlist = (( playlist_item_t* ) user_data)->p_playlist; + input_item_node_t *p_new_root = p_event->u.input_item_subitem_tree_added.p_root; -/** - * 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 - */ + PL_LOCK; -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 ); -} + playlist_item_t *p_item = + playlist_ItemGetByInput( p_playlist, p_input ); -/** - * 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 microseconds, - * 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 ) -{ - playlist_item_t * p_item; + assert( p_item != NULL ); + playlist_item_t *p_parent = p_item->p_parent; + assert( p_parent != NULL ); + + bool b_current = get_current_status_item( p_playlist ) == p_item; + bool b_autostart = var_CreateGetBool( p_playlist, "playlist-autostart" ); + bool b_stop = p_item->i_flags & PLAYLIST_SUBITEM_STOP_FLAG; + p_item->i_flags &= ~PLAYLIST_SUBITEM_STOP_FLAG; - p_item = malloc( sizeof( playlist_item_t ) ); - if( p_item == NULL ) + int pos = 0; + for( int i = 0; i < p_parent->i_children; i++ ) { - msg_Err( p_playlist, "out of memory" ); + if( p_parent->pp_children[i] == p_item ) + { + pos = i; + break; + } } - 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; + bool b_flat = false; + playlist_item_t *p_up = p_item; + while( p_up->p_parent ) + { + if( p_up->p_parent == p_playlist->p_playing ) + { + if( !pl_priv(p_playlist)->b_tree ) b_flat = true; + break; + } + p_up = p_up->p_parent; + } + if( b_flat ) + { + playlist_DeleteItem( p_playlist, p_item, true ); + p_item = playlist_InsertInputItemTree( p_playlist, p_parent, + p_new_root, pos, true ); + } + else + p_item = playlist_InsertInputItemTree( p_playlist, p_item, + p_new_root, PLAYLIST_END, false ); - p_item->ppsz_options = NULL; - p_item->i_options = i_options; + if( !b_flat ) var_SetAddress( p_playlist, "leaf-to-parent", p_input ); - if( i_options > 0 ) + if( b_current ) { - int i; - - p_item->ppsz_options = malloc( i_options * sizeof(char *) ); - for( i = 0; i < i_options; i++ ) + if( ( b_stop && !b_flat ) || !b_autostart ) { - p_item->ppsz_options[i] = strdup( ppsz_options[i] ); + PL_UNLOCK; + playlist_Stop( p_playlist ); + return; + } + else + { + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, + pl_Locked, get_current_status_node( p_playlist ), p_item ); } - } - 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; + playlist_item_t *p_item = user_data; + VLC_UNUSED( p_event ); + var_SetAddress( p_item->p_playlist, "item-change", p_item->p_input ); +} - 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_InputItemSubItemTreeAdded, + input_item_add_subitem_tree, p_item ); + vlc_event_attach( p_em, vlc_InputItemDurationChanged, + input_item_changed, p_item ); + vlc_event_attach( p_em, vlc_InputItemMetaChanged, + 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_InputItemSubItemTreeAdded, + input_item_add_subitem_tree, p_item ); + vlc_event_detach( p_em, vlc_InputItemMetaChanged, + input_item_changed, p_item ); + vlc_event_detach( p_em, vlc_InputItemDurationChanged, + 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 ) +{ + playlist_item_t* p_item = malloc( sizeof( playlist_item_t ) ); + if( !p_item ) + return NULL; - msg_Dbg( p_playlist, "adding playlist item « %s » ( %s )", p_item->psz_name, p_item->psz_uri); + assert( p_input ); - /* Create the new playlist item */ + p_item->p_input = p_input; + vlc_gc_incref( p_item->p_input ); + p_item->i_id = ++pl_priv(p_playlist)->i_last_playlist_id; - /* 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; - } + 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; - i_pos = p_playlist->i_size - 1; - } + install_input_item_observer( 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++; - } + return p_item; +} - 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 ) +{ + /* For the assert */ + playlist_t *p_playlist = p_item->p_playlist; + PL_ASSERT_LOCKED; + + /* Surprise, we can't actually do more because we + * don't do refcounting, or eauivalent. + * Because item are not only accessed by their id + * using playlist_item outside the PL_LOCK isn't safe. + * Most of the modules does that. + * + * Who wants to add proper memory management? */ + uninstall_input_item_observer( p_item ); + ARRAY_APPEND( pl_priv(p_playlist)->items_to_delete, p_item); + return VLC_SUCCESS; +} - if( p_playlist->i_index >= i_pos ) - { - p_playlist->i_index++; - } - } - else - { - /* i_mode == PLAYLIST_REPLACE and 0 <= i_pos < p_playlist->i_size */ - 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 ); - } - /* XXX: what if the item is still in use? */ - free( p_playlist->pp_items[i_pos] ); - p_playlist->pp_items[i_pos] = p_item; - } +/** + * Delete input item + * + * Remove an input item when it appears from a root playlist item + * \param p_playlist playlist object + * \param p_input the input to delete + * \param p_root root playlist item + * \param b_do_stop must stop or not the playlist + * \return VLC_SUCCESS or VLC_EGENERIC +*/ +static int DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input, + playlist_item_t *p_root, bool b_do_stop ) +{ + PL_ASSERT_LOCKED; + playlist_item_t *p_item = playlist_ItemFindFromInputAndRoot( + p_playlist, p_input, p_root, false ); + if( !p_item ) return VLC_EGENERIC; + return playlist_DeleteItem( p_playlist, p_item, b_do_stop ); +} - 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 p_input the input to delete + * \param p_root root playlist item + * \param b_locked TRUE if the playlist is locked + * \return VLC_SUCCESS or VLC_EGENERIC + */ +int playlist_DeleteFromInputInParent( playlist_t *p_playlist, + input_item_t *p_item, + playlist_item_t *p_root, bool b_locked ) +{ + int i_ret; + PL_LOCK_IF( !b_locked ); + i_ret = DeleteFromInput( p_playlist, p_item, p_root, true ); + PL_UNLOCK_IF( !b_locked ); + return i_ret; +} - vlc_mutex_unlock( &p_playlist->object_lock ); +/** + * Delete from input + * + * Search anywhere in playlist for an an input item and delete it + * \param p_playlist playlist object + * \param p_input the input to delete + * \param b_locked TRUE if the playlist is locked + * \return VLC_SUCCESS or VLC_ENOITEM + */ +int playlist_DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input, + bool b_locked ) +{ + int i_ret; + PL_LOCK_IF( !b_locked ); + i_ret = DeleteFromInput( p_playlist, p_input, + p_playlist->p_root, true ); + PL_UNLOCK_IF( !b_locked ); + return ( i_ret == 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_playing, 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 ) +{ + PL_ASSERT_LOCKED; + playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id ); + if( !p_item ) return VLC_EGENERIC; + return playlist_DeleteItem( 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 VLC_SUCCESS or a VLC error code */ -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; + return playlist_AddExt( p_playlist, psz_uri, psz_name, + i_mode, i_pos, -1, 0, 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_SKIP, 1 ); - } +/** + * 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 i_options the number of options + * \param ppsz_options an array of options + * \param i_option_flags options flags + * \param b_playlist TRUE for playlist, FALSE for media library + * \param b_locked TRUE if the playlist is locked + * \return VLC_SUCCESS or a VLC error code +*/ +int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri, + const char *psz_name, int i_mode, int i_pos, + mtime_t i_duration, + int i_options, const char *const *ppsz_options, + unsigned i_option_flags, + bool b_playlist, bool b_locked ) +{ + int i_ret; + input_item_t *p_input; + + p_input = input_item_NewExt( p_playlist, psz_uri, psz_name, + i_options, ppsz_options, i_option_flags, + i_duration ); + if( p_input == NULL ) + return VLC_ENOMEM; + i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist, + b_locked ); + vlc_gc_decref( p_input ); + return i_ret; +} - vlc_mutex_lock( &p_playlist->object_lock ); - if( i_pos >= 0 && i_pos < p_playlist->i_size ) - { - playlist_item_t *p_item = p_playlist->pp_items[i_pos]; +/** + * 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; + if( p_playlist->b_die ) return VLC_EGENERIC; + if( !pl_priv(p_playlist)->b_doing_ml ) + PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name, + p_input->psz_uri ); - msg_Dbg( p_playlist, "deleting playlist item « %s »", - p_item->psz_name ); + PL_LOCK_IF( !b_locked ); - if( p_item->psz_name ) - { - free( p_item->psz_name ); - } - if( p_item->psz_uri ) - { - free( p_item->psz_uri ); - } - if( p_item->psz_author ) - { - free( p_item->psz_author ); - } - if( p_item->i_options > 0 ) - { - int i; + p_item = playlist_ItemNewFromInput( p_playlist, p_input ); + if( p_item == NULL ) return VLC_ENOMEM; + AddItem( p_playlist, p_item, + b_playlist ? p_playlist->p_playing : + p_playlist->p_media_library , i_mode, i_pos ); - for( i = 0; i < p_item->i_options; i++ ) - { - free( p_item->ppsz_options[i] ); - } + GoAndPreparse( p_playlist, i_mode, p_item ); - free( p_item->ppsz_options ); - } + PL_UNLOCK_IF( !b_locked ); + return VLC_SUCCESS; +} - /* XXX: what if the item is still in use? */ - free( p_item ); +/** + * 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, + bool b_locked ) +{ + playlist_item_t *p_item; + assert( p_input ); + assert( p_parent && p_parent->i_children != -1 ); - if( i_pos <= p_playlist->i_index ) - { - p_playlist->i_index--; - } + if( p_playlist->b_die ) + return NULL; + PL_LOCK_IF( !b_locked ); - /* 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--; - } + 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 ); - vlc_mutex_unlock( &p_playlist->object_lock ); + GoAndPreparse( p_playlist, i_mode, p_item ); - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); + PL_UNLOCK_IF( !b_locked ); - return 0; + return p_item; } /** - * Disables a playlist item + * Insert a tree of input items into a given playlist 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 insert into + * \param p_parent the receiving playlist node (can be an item) + * \param p_node the root of input item tree, + only it's contents will be inserted + * \param i_pos the position in the playlist where to insert. If this is + * PLAYLIST_END the items will be added at the end of the playlist + * regardless of its size + * \param b_flat TRUE if the new tree contents should be flattened into a list + * \return the first new leaf inserted (in playing order) */ -int playlist_Disable( playlist_t * p_playlist, int i_pos ) +playlist_item_t *playlist_InsertInputItemTree ( + playlist_t *p_playlist, playlist_item_t *p_parent, + input_item_node_t *p_node, int i_pos, bool b_flat ) { - vlc_value_t val; - vlc_mutex_lock( &p_playlist->object_lock ); + playlist_item_t *p_first_leaf = NULL; + RecursiveAddIntoParent ( p_playlist, p_parent, p_node, i_pos, b_flat, &p_first_leaf ); + return p_first_leaf; +} +/***************************************************************************** + * Playlist item misc operations + *****************************************************************************/ - if( i_pos >= 0 && i_pos < p_playlist->i_size ) +/** + * Find an item within a root, given its input id. + * + * \param p_playlist the playlist object + * \param p_item the input item + * \param p_root root playlist item + * \param b_items_only TRUE if we want the item himself + * \return the first found item, or NULL if not found + */ +playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, + input_item_t *p_item, + playlist_item_t *p_root, + bool b_items_only ) +{ + int i; + for( i = 0 ; i< p_root->i_children ; i++ ) { - 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( ( b_items_only ? p_root->pp_children[i]->i_children == -1 : 1 ) && + p_root->pp_children[i]->p_input == p_item ) + { + return p_root->pp_children[i]; + } + else if( p_root->pp_children[i]->i_children >= 0 ) + { + playlist_item_t *p_search = + playlist_ItemFindFromInputAndRoot( p_playlist, p_item, + p_root->pp_children[i], + b_items_only ); + if( p_search ) return p_search; + } } + return NULL; +} - vlc_mutex_unlock( &p_playlist->object_lock ); - - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); - return 0; +static int ItemIndex ( playlist_item_t *p_item ) +{ + for( int i = 0; i < p_item->p_parent->i_children; i++ ) + if( p_item->p_parent->pp_children[i] == p_item ) return i; + return -1; } /** - * Enables a playlist item + * Moves an item * - * \param p_playlist the playlist to enable from. - * \param i_pos the position of the item 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_Enable( playlist_t * p_playlist, int i_pos ) +int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, + playlist_item_t *p_node, int i_newpos ) { - vlc_value_t val; - vlc_mutex_lock( &p_playlist->object_lock ); + PL_ASSERT_LOCKED; - 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 ); + if( p_node->i_children == -1 ) return VLC_EGENERIC; - if( p_playlist->pp_items[i_pos]->b_enabled == VLC_FALSE ) - p_playlist->i_enabled++; + playlist_item_t *p_detach = p_item->p_parent; + int i_index = ItemIndex( p_item ); - p_playlist->pp_items[i_pos]->b_enabled = VLC_TRUE; - } + REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, i_index ); - vlc_mutex_unlock( &p_playlist->object_lock ); + if( p_detach == p_node && i_index < i_newpos ) + i_newpos--; - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); + INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item ); + p_item->p_parent = p_node; - return 0; + pl_priv( p_playlist )->b_reset_currently_playing = true; + vlc_cond_signal( &pl_priv( p_playlist )->signal ); + return VLC_SUCCESS; } /** - * Disables a playlist group + * Moves an array of items + * + * This function must be entered with the playlist lock * - * \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 + * \param i_items the number of indexes to move + * \param pp_items the array of indexes to move + * \param p_node the target node + * \param i_newpos the target position under this node + * \return VLC_SUCCESS or an error */ -int playlist_DisableGroup( playlist_t * p_playlist, int i_group) +int playlist_TreeMoveMany( playlist_t *p_playlist, + int i_items, playlist_item_t **pp_items, + playlist_item_t *p_node, int i_newpos ) { - vlc_value_t val; - int i; - vlc_mutex_lock( &p_playlist->object_lock ); + PL_ASSERT_LOCKED; - msg_Dbg(p_playlist,"Disabling group %i",i_group); - for( i = 0 ; i< p_playlist->i_size; i++ ) - { - if( p_playlist->pp_items[i]->i_group == i_group ) - { - msg_Dbg( p_playlist, "disabling playlist item « %s »", - p_playlist->pp_items[i]->psz_name ); - - if( p_playlist->pp_items[i]->b_enabled == VLC_TRUE ) - p_playlist->i_enabled--; + if ( p_node->i_children == -1 ) return VLC_EGENERIC; - p_playlist->pp_items[i]->b_enabled = VLC_FALSE; - } + int i; + for( i = 0; i < i_items; i++ ) + { + playlist_item_t *p_item = pp_items[i]; + int i_index = ItemIndex( p_item ); + playlist_item_t *p_parent = p_item->p_parent; + REMOVE_ELEM( p_parent->pp_children, p_parent->i_children, i_index ); + if ( p_parent == p_node && i_index < i_newpos ) i_newpos--; + } + for( i = i_items - 1; i >= 0; i-- ) + { + playlist_item_t *p_item = pp_items[i]; + INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item ); + p_item->p_parent = p_node; } - vlc_mutex_unlock( &p_playlist->object_lock ); - - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); - return 0; + pl_priv( p_playlist )->b_reset_currently_playing = true; + vlc_cond_signal( &pl_priv( p_playlist )->signal ); + return VLC_SUCCESS; } /** - * Enables a playlist group + * Send a notification that an item has been added to a node * - * \param p_playlist the playlist to enable from. - * \param i_pos the id of the group to enable - * \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_EnableGroup( playlist_t * p_playlist, int i_group) +void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, + int i_node_id, bool b_signal ) { - vlc_value_t val; - int i; - vlc_mutex_lock( &p_playlist->object_lock ); + playlist_private_t *p_sys = pl_priv(p_playlist); + PL_ASSERT_LOCKED; - for( i = 0 ; i< p_playlist->i_size; i++ ) - { - if( p_playlist->pp_items[i]->i_group == i_group ) - { - msg_Dbg( p_playlist, "enabling playlist item « %s »", - p_playlist->pp_items[i]->psz_name ); + p_sys->b_reset_currently_playing = true; + if( b_signal ) + vlc_cond_signal( &p_sys->signal ); - if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE ) - p_playlist->i_enabled++; + playlist_add_t add; + add.i_item = i_item_id; + add.i_node = i_node_id; - p_playlist->pp_items[i]->b_enabled = VLC_TRUE; - } + vlc_value_t val; + val.p_address = &add; + + var_Set( p_playlist, "playlist-item-append", val ); +} + +/*************************************************************************** + * The following functions are local + ***************************************************************************/ + +/* 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 ) +{ + PL_ASSERT_LOCKED; + if( (i_mode & PLAYLIST_GO ) ) + { + pl_priv(p_playlist)->request.b_request = true; + pl_priv(p_playlist)->request.i_skip = 0; + pl_priv(p_playlist)->request.p_item = p_item; + if( pl_priv(p_playlist)->p_input ) + input_Stop( pl_priv(p_playlist)->p_input, true ); + pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING; + vlc_cond_signal( &pl_priv(p_playlist)->signal ); } - vlc_mutex_unlock( &p_playlist->object_lock ); + /* Preparse if no artist/album info, and hasn't been preparsed allready + and if user has some preparsing option (auto-preparse variable) + enabled*/ + char *psz_artist = input_item_GetArtist( p_item->p_input ); + char *psz_album = input_item_GetAlbum( p_item->p_input ); + if( pl_priv(p_playlist)->b_auto_preparse && + input_item_IsPreparsed( p_item->p_input ) == false && + ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) ) + ) + playlist_PreparseEnqueue( p_playlist, p_item->p_input ); + 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 ) +{ + PL_ASSERT_LOCKED; + ARRAY_APPEND(p_playlist->items, p_item); + ARRAY_APPEND(p_playlist->all_items, p_item); - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); + if( i_pos == PLAYLIST_END ) + playlist_NodeAppend( p_playlist, p_item, p_node ); + else + playlist_NodeInsert( p_playlist, p_item, p_node, i_pos ); - return 0; + if( !pl_priv(p_playlist)->b_doing_ml ) + playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id, + !( i_mode & PLAYLIST_NO_REBUILD ) ); } -/** - * Move an item in a playlist - * - * 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 - */ -int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos) +/* Actually convert an item to a node */ +static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ) { - vlc_value_t val; - vlc_mutex_lock( &p_playlist->object_lock ); + int i; + if( p_item->i_children != -1 ) return; + + p_item->i_children = 0; + + input_item_t *p_input = p_item->p_input; + vlc_mutex_lock( &p_input->lock ); + p_input->i_type = ITEM_TYPE_NODE; + vlc_mutex_unlock( &p_input->lock ); - /* take into account that our own row disappears. */ - if ( i_pos < i_newpos ) i_newpos--; + var_SetAddress( p_playlist, "item-change", p_item->p_input ); - if( i_pos >= 0 && i_newpos >=0 && i_pos <= p_playlist->i_size - && i_newpos <= p_playlist->i_size ) + /* 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 */ +int playlist_DeleteItem( playlist_t * p_playlist, playlist_item_t *p_item, + bool b_stop ) +{ + int i; + int i_id = p_item->i_id; + PL_ASSERT_LOCKED; + + if( p_item->i_children > -1 ) { - playlist_item_t * temp; + return playlist_NodeDelete( p_playlist, p_item, true, false ); + } - msg_Dbg( p_playlist, "moving playlist item « %s » (%i -> %i)", - p_playlist->pp_items[i_pos]->psz_name, i_pos, - i_newpos ); + pl_priv(p_playlist)->b_reset_currently_playing = true; + var_SetInteger( p_playlist, "playlist-item-deleted", i_id ); - 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--; - } + /* 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 ); - if ( i_pos < i_newpos ) - { - temp = p_playlist->pp_items[i_pos]; - while ( i_pos < i_newpos ) - { - p_playlist->pp_items[i_pos] = p_playlist->pp_items[i_pos+1]; - i_pos++; - } - p_playlist->pp_items[i_newpos] = temp; - } - else if ( i_pos > i_newpos ) + 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 ) + { + /* Stop it if we have to */ + if( b_stop ) { - temp = p_playlist->pp_items[i_pos]; - while ( i_pos > i_newpos ) - { - p_playlist->pp_items[i_pos] = p_playlist->pp_items[i_pos-1]; - i_pos--; - } - p_playlist->pp_items[i_newpos] = temp; + playlist_Control( p_playlist, PLAYLIST_STOP, pl_Locked ); + msg_Info( p_playlist, "stopping playback" ); } + /* In any case, this item can't be the next one to be played ! */ + set_current_status_item( p_playlist, NULL ); } - vlc_mutex_unlock( &p_playlist->object_lock ); + ARRAY_BSEARCH( p_playlist->current,->i_id, int, i_id, i ); + if( i != -1 ) + ARRAY_REMOVE( p_playlist->current, i ); + + PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name ); + + /* Remove the item from its parent */ + playlist_NodeRemoveItem( p_playlist, p_item, p_item->p_parent ); - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-change", val ); + playlist_ItemRelease( p_item ); - return 0; + return VLC_SUCCESS; +} + +static int RecursiveAddIntoParent ( + playlist_t *p_playlist, playlist_item_t *p_parent, + input_item_node_t *p_node, int i_pos, bool b_flat, + playlist_item_t **pp_first_leaf ) +{ + if( p_parent->i_children == -1 ) ChangeToNode( p_playlist, p_parent ); + + if( i_pos == PLAYLIST_END ) i_pos = p_parent->i_children; + + for( int i = 0; i < p_node->i_children; i++ ) + { + playlist_item_t *p_child = NULL; + if( b_flat ? p_node->pp_children[i]->i_children == 0 : 1 ) + { + p_child = playlist_NodeAddInput( p_playlist, + p_node->pp_children[i]->p_item, + p_parent, + PLAYLIST_INSERT, i_pos, + pl_Locked ); + i_pos++; + } + if( p_node->pp_children[i]->i_children > 0 ) + { + if( b_flat ) + { + i_pos = RecursiveAddIntoParent( + p_playlist, p_parent, + p_node->pp_children[i], i_pos, true, + &p_child ); + } + else + { + RecursiveAddIntoParent( p_playlist, p_child, + p_node->pp_children[i], 0, false, + &p_child ); + } + } + assert( p_child != NULL ); + if( i == 0 ) *pp_first_leaf = p_child; + } + return i_pos; }