/*****************************************************************************
- * item.c : Playlist item functions
+ * item.c : Playlist item creation/deletion/add/removal functions
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: item.c,v 1.10 2004/01/05 12:59:43 zorglub Exp $
+ * Copyright (C) 1999-2007 the VideoLAN team
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
+ * Clément Stenac <zorglub@videolan.org>
*
* 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
*
* 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 <stdlib.h> /* free(), strtol() */
-#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
-
#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/sout.h>
-#include <vlc/input.h>
+#include <assert.h>
+#include <vlc_playlist.h>
+#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,
+ vlc_bool_t b_stop );
+
+/*****************************************************************************
+ * An input item has gained a subitem (Event Callback)
+ *****************************************************************************/
+static void input_item_subitem_added( const vlc_event_t * p_event,
+ void * user_data )
+{
+ playlist_item_t *p_parent_playlist_item = user_data;
+ playlist_t * p_playlist = p_parent_playlist_item->p_playlist;
+ input_item_t * p_parent, * p_child;
+ playlist_item_t * p_child_in_category;
+ playlist_item_t * p_item_in_category;
+ vlc_bool_t b_play;
+
+ p_parent = p_event->p_obj;
+ p_child = p_event->u.input_item_subitem_added.p_new_child;
+
+ PL_LOCK;
+ b_play = var_CreateGetBool( p_playlist, "playlist-autostart" );
+
+ /* This part is really hakish, but this playlist system isn't simple */
+ /* First check if we haven't already added the item as we are
+ * listening using the onelevel and the category representent
+ * (Because of the playlist design) */
+ p_child_in_category = playlist_ItemFindFromInputAndRoot(
+ p_playlist, p_child->i_id,
+ p_playlist->p_root_category,
+ VLC_FALSE /* Only non-node */ );
+
+ if( !p_child_in_category )
+ {
+ /* Then, transform to a node if needed */
+ p_item_in_category = playlist_ItemFindFromInputAndRoot(
+ p_playlist, p_parent->i_id,
+ p_playlist->p_root_category,
+ VLC_FALSE /* Only non-node */ );
+ if( !p_item_in_category )
+ {
+ /* Item may have been removed */
+ PL_UNLOCK;
+ return;
+ }
+
+ b_play = b_play && p_item_in_category == p_playlist->status.p_item;
+
+ /* If this item is already a node don't transform it */
+ if( p_item_in_category->i_children == -1 )
+ {
+ p_item_in_category = playlist_ItemToNode( p_playlist,
+ p_item_in_category, VLC_TRUE );
+ p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST;
+ }
+
+ playlist_BothAddInput( p_playlist, p_child, p_item_in_category,
+ PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END,
+ NULL, NULL, VLC_TRUE );
+
+ if( b_play )
+ {
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
+ VLC_TRUE, p_item_in_category, NULL );
+ }
+ }
+
+ PL_UNLOCK;
+
+}
-#include "vlc_playlist.h"
+/*****************************************************************************
+ * Listen to vlc_InputItemAddSubItem event
+ *****************************************************************************/
+static void install_input_item_observer( playlist_item_t * p_item,
+ input_item_t * p_input )
+{
+ vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded,
+ input_item_subitem_added,
+ p_item );
+}
+
+static void uninstall_input_item_observer( playlist_item_t * p_item,
+ input_item_t * p_input )
+{
+ vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded,
+ input_item_subitem_added,
+ p_item );
+
+}
+
+/*****************************************************************************
+ * Playlist item creation
+ *****************************************************************************/
+playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj,
+ const char *psz_uri,
+ const char *psz_name,
+ int i_options,
+ const char *const *ppsz_options,
+ int i_duration, int i_type )
+{
+ input_item_t *p_input;
+ if( psz_uri == NULL ) return NULL;
+ p_input = input_ItemNewWithType( p_obj, psz_uri,
+ psz_name, i_options, ppsz_options,
+ i_duration, i_type );
+ return playlist_ItemNewFromInput( p_obj, p_input );
+}
+
+playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj,
+ input_item_t *p_input )
+{
+ DECMALLOC_NULL( p_item, playlist_item_t );
+ playlist_t *p_playlist = pl_Yield( p_obj );
+
+ p_item->p_input = p_input;
+ vlc_gc_incref( p_item->p_input );
+
+ 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;
+
+ install_input_item_observer( p_item, p_input );
+
+ pl_Release( p_item->p_playlist );
+
+ return p_item;
+}
+
+/***************************************************************************
+ * Playlist item destruction
+ ***************************************************************************/
+
+/** Delete a playlist item and detach its input item */
+int playlist_ItemDelete( playlist_item_t *p_item )
+{
+ uninstall_input_item_observer( p_item, p_item->p_input );
+
+ 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 */
+static int DeleteFromInput( playlist_t *p_playlist, int i_input_id,
+ playlist_item_t *p_root, vlc_bool_t b_do_stop )
+{
+ int i;
+ for( i = 0 ; i< p_root->i_children ; i++ )
+ {
+ if( p_root->pp_children[i]->i_children == -1 &&
+ p_root->pp_children[i]->p_input->i_id == i_input_id )
+ {
+ DeleteInner( p_playlist, p_root->pp_children[i], b_do_stop );
+ return VLC_SUCCESS;
+ }
+ else if( p_root->pp_children[i]->i_children >= 0 )
+ {
+ int i_ret = DeleteFromInput( p_playlist, i_input_id,
+ p_root->pp_children[i], b_do_stop );
+ if( i_ret == VLC_SUCCESS ) return VLC_SUCCESS;
+ }
+ }
+ return VLC_EGENERIC;
+}
+
+/** Remove an input item when it appears from a root playlist item */
+int playlist_DeleteInputInParent( playlist_t *p_playlist, int i_input_id,
+ playlist_item_t *p_root, vlc_bool_t b_locked )
+{
+ int i_ret;
+ if( !b_locked ) PL_LOCK;
+ i_ret = DeleteFromInput( p_playlist, i_input_id,
+ p_root, VLC_TRUE );
+ if( !b_locked ) PL_UNLOCK;
+ return i_ret;
+}
+
+/** Remove an input item from ONELEVEL and CATEGORY */
+int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id,
+ vlc_bool_t b_locked )
+{
+ int i_ret1, i_ret2;
+ if( !b_locked ) PL_LOCK;
+ i_ret1 = DeleteFromInput( p_playlist, i_input_id,
+ p_playlist->p_root_category, VLC_TRUE );
+ i_ret2 = DeleteFromInput( p_playlist, i_input_id,
+ p_playlist->p_root_onelevel, VLC_TRUE );
+ if( !b_locked ) PL_UNLOCK;
+ return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ?
+ VLC_SUCCESS : VLC_ENOITEM;
+}
+
+void playlist_Clear( playlist_t * p_playlist, vlc_bool_t b_locked )
+{
+ if( !b_locked ) PL_LOCK;
+ playlist_NodeEmpty( p_playlist, p_playlist->p_root_category, VLC_TRUE );
+ playlist_NodeEmpty( p_playlist, p_playlist->p_root_onelevel, VLC_TRUE );
+ if( !b_locked ) PL_UNLOCK;
+}
+
+/** Remove a playlist item from the playlist, given its id
+ * This function is to be used only by the playlist */
+int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id )
+{
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id,
+ VLC_TRUE );
+ if( !p_item ) return VLC_EGENERIC;
+ return DeleteInner( p_playlist, p_item, VLC_TRUE );
+}
+
+/***************************************************************************
+ * Playlist item addition
+ ***************************************************************************/
+/** 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
+ * \return The id of the playlist item
+ */
+int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
+ const char *psz_name, int i_mode, int i_pos,
+ vlc_bool_t b_playlist, vlc_bool_t b_locked )
+{
+ return playlist_AddExt( p_playlist, psz_uri, psz_name,
+ i_mode, i_pos, -1, NULL, 0, b_playlist, b_locked );
+}
/**
- * Add a playlist item into a playlist
+ * Add a MRL into the playlist or the media library, duration and options given
*
- * \param p_playlist the playlist to insert into
- * \param p_item the playlist item to insert
+ * \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 possition in the playlist where to add. If this is
+ * \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 position of the new item
+ * 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
+ * \return The id of the playlist item
*/
-int playlist_AddItem( playlist_t *p_playlist, playlist_item_t * p_item,
- int i_mode, int i_pos)
+int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
+ const char *psz_name, int i_mode, int i_pos,
+ mtime_t i_duration, const char *const *ppsz_options,
+ int i_options, vlc_bool_t b_playlist, vlc_bool_t b_locked )
{
- vlc_value_t val;
+ int i_ret;
+ input_item_t *p_input = input_ItemNewExt( p_playlist, psz_uri, psz_name,
+ i_options, ppsz_options,
+ i_duration );
- vlc_mutex_lock( &p_playlist->object_lock );
+ i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist,
+ b_locked );
+ if( i_ret == VLC_SUCCESS )
+ return p_input->i_id;
+ return -1;
+}
- /*
- * 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 );
- }
- free( p_item );
- vlc_mutex_unlock( &p_playlist->object_lock );
- return -1;
- }
- }
- }
- i_mode &= ~PLAYLIST_CHECK_INSERT;
- i_mode |= PLAYLIST_APPEND;
- }
+/** Add an input item to the playlist node */
+int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input,
+ int i_mode, int i_pos, vlc_bool_t b_playlist,
+ vlc_bool_t b_locked )
+{
+ playlist_item_t *p_item_cat, *p_item_one;
+ if( !p_playlist->b_doing_ml )
+ PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name,
+ p_input->psz_uri );
- msg_Dbg( p_playlist, "adding playlist item « %s » ( %s )", p_item->psz_name, p_item->psz_uri);
+ if( !b_locked ) PL_LOCK;
+ /* 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 );
- p_item->i_id = ++p_playlist->i_last_id;
+ /* 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 );
- /* Do a few boundary checks and allocate space for the item */
- if( i_pos == PLAYLIST_END )
+ GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one );
+
+ 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 **/
+int playlist_BothAddInput( playlist_t *p_playlist,
+ input_item_t *p_input,
+ playlist_item_t *p_direct_parent,
+ int i_mode, int i_pos,
+ int *i_cat, int *i_one, vlc_bool_t b_locked )
+{
+ playlist_item_t *p_item_cat, *p_item_one, *p_up;
+ int i_top;
+ assert( p_input );
+ if( !b_locked ) PL_LOCK;
+
+ /* 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 )
{
- if( i_mode & PLAYLIST_INSERT )
+ 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 )
{
- i_mode &= ~PLAYLIST_INSERT;
- i_mode |= PLAYLIST_APPEND;
+ AddItem( p_playlist, p_item_one,
+ p_playlist->p_root_onelevel->pp_children[i_top],
+ i_mode, i_pos );
+ break;
}
+ }
+ GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one );
- i_pos = p_playlist->i_size - 1;
+ if( i_cat ) *i_cat = p_item_cat->i_id;
+ if( i_one ) *i_one = p_item_one->i_id;
+
+ if( !b_locked ) PL_UNLOCK;
+ return VLC_SUCCESS;
+}
+
+/** Add an input item to a given node */
+playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist,
+ input_item_t *p_input,
+ playlist_item_t *p_parent,
+ int i_mode, int i_pos,
+ vlc_bool_t b_locked )
+{
+ playlist_item_t *p_item;
+ assert( p_input );
+ assert( p_parent && p_parent->i_children != -1 );
+
+ 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_mode, i_pos );
+
+ if( !b_locked ) PL_UNLOCK;
+
+ return p_item;
+}
+
+/*****************************************************************************
+ * Playlist item misc operations
+ *****************************************************************************/
+
+/**
+ * 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
+ */
+playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
+ playlist_item_t *p_item,
+ vlc_bool_t b_locked )
+{
+
+ 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( !b_locked ) PL_LOCK;
+
+ /* Fast track the media library, no time to loose */
+ if( p_item == p_playlist->p_ml_category ) {
+ if( !b_locked ) PL_UNLOCK;
+ return p_item;
}
- if( !(i_mode & PLAYLIST_REPLACE)
- || i_pos < 0 || i_pos >= p_playlist->i_size )
+ /** \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,
+ VLC_TRUE );
+
+ if( p_item_in_category )
{
- /* Additional boundary checks */
- if( i_mode & PLAYLIST_APPEND )
+ playlist_item_t *p_item_in_one = playlist_ItemFindFromInputAndRoot(
+ p_playlist, p_item->p_input->i_id,
+ p_playlist->p_root_onelevel,
+ VLC_TRUE );
+ assert( p_item_in_one );
+
+ /* We already have it, and there is nothing more to do */
+ ChangeToNode( p_playlist, p_item_in_category );
+
+ /* Item in one is a root, change it to node */
+ if( p_item_in_one->p_parent == p_playlist->p_root_onelevel )
+ ChangeToNode( p_playlist, p_item_in_one );
+ else
{
- i_pos++;
+ DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id,
+ p_playlist->p_root_onelevel, VLC_FALSE );
}
+ p_playlist->b_reset_currently_playing = VLC_TRUE;
+ vlc_cond_signal( &p_playlist->object_wait );
+ var_SetInteger( p_playlist, "item-change", p_item_in_category->
+ p_input->i_id );
+ if( !b_locked ) PL_UNLOCK;
+ return p_item_in_category;
+ }
+ else
+ {
+ ChangeToNode( p_playlist, p_item );
+ if( !b_locked ) PL_UNLOCK;
+ return NULL;
+ }
+}
- if( i_pos < 0 )
+/** Find an item within a root, given its input id.
+ * \return the first found item, or NULL if not found
+ */
+playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist,
+ int i_input_id,
+ playlist_item_t *p_root,
+ vlc_bool_t b_items_only )
+{
+ int i;
+ for( i = 0 ; i< p_root->i_children ; i++ )
+ {
+ 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 )
{
- i_pos = 0;
+ return p_root->pp_children[i];
}
- else if( i_pos > p_playlist->i_size )
+ else if( p_root->pp_children[i]->i_children >= 0 )
{
- i_pos = p_playlist->i_size;
+ 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;
+}
- INSERT_ELEM( p_playlist->pp_items,
- p_playlist->i_size,
- i_pos,
- p_item );
- p_playlist->i_enabled ++;
- if( p_playlist->i_index >= i_pos )
- {
- p_playlist->i_index++;
- }
+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;
}
- else
+ REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, j );
+
+ /* Attach to new parent */
+ INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item );
+ p_item->p_parent = p_node;
+
+ return VLC_SUCCESS;
+}
+
+/**
+ * Moves an item
+ *
+ * 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_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item,
+ playlist_item_t *p_node, int i_newpos )
+{
+ 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 )
{
- /* i_mode == PLAYLIST_REPLACE and 0 <= i_pos < p_playlist->i_size */
- if( p_playlist->pp_items[i_pos]->psz_name )
+ /* Fixme: avoid useless lookups but we need some clean helpers */
{
- free( p_playlist->pp_items[i_pos]->psz_name );
+ /* Fixme: if we try to move a node on a top-level node, it will
+ * fail because the node doesn't exist in onelevel and we will
+ * do some shit in onelevel. We should recursively move all items
+ * within the node */
+ playlist_item_t *p_node_onelevel;
+ playlist_item_t *p_item_onelevel;
+ p_node_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
+ p_node->p_input->i_id,
+ p_playlist->p_root_onelevel,
+ VLC_FALSE );
+ p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
+ p_item->p_input->i_id,
+ p_playlist->p_root_onelevel,
+ VLC_FALSE );
+ if( p_node_onelevel && p_item_onelevel )
+ TreeMove( p_playlist, p_item_onelevel, p_node_onelevel, 0 );
}
- if( p_playlist->pp_items[i_pos]->psz_uri )
{
- free( p_playlist->pp_items[i_pos]->psz_uri );
+ playlist_item_t *p_node_category;
+ playlist_item_t *p_item_category;
+ p_node_category = playlist_ItemFindFromInputAndRoot( p_playlist,
+ p_node->p_input->i_id,
+ p_playlist->p_root_category,
+ VLC_FALSE );
+ p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist,
+ p_item->p_input->i_id,
+ p_playlist->p_root_category,
+ VLC_FALSE );
+ if( p_node_category && p_item_category )
+ TreeMove( p_playlist, p_item_category, p_node_category, 0 );
}
- /* XXX: what if the item is still in use? */
- free( p_playlist->pp_items[i_pos] );
- p_playlist->pp_items[i_pos] = p_item;
+ i_ret = VLC_SUCCESS;
}
+ else
+ i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos );
+ p_playlist->b_reset_currently_playing = VLC_TRUE;
+ vlc_cond_signal( &p_playlist->object_wait );
+ return i_ret;
+}
+
+/** Send a notification that an item has been added to a node */
+void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
+ int i_node_id, vlc_bool_t b_signal )
+{
+ vlc_value_t val;
+ playlist_add_t *p_add = (playlist_add_t *)malloc(sizeof( playlist_add_t));
+ p_add->i_item = i_item_id;
+ p_add->i_node = i_node_id;
+ val.p_address = p_add;
+ p_playlist->b_reset_currently_playing = VLC_TRUE;
+ if( b_signal )
+ vlc_cond_signal( &p_playlist->object_wait );
+ var_Set( p_playlist, "item-append", val );
+ free( p_add );
+}
- if( i_mode & PLAYLIST_GO )
+/*****************************************************************************
+ * Playlist item accessors
+ *****************************************************************************/
+
+/** Set the name of a playlist item */
+int playlist_ItemSetName( playlist_item_t *p_item, const char *psz_name )
+{
+ if( psz_name && p_item )
{
- p_playlist->i_index = i_pos;
- if( p_playlist->p_input )
+ input_item_SetName( p_item->p_input, psz_name );
+ return VLC_SUCCESS;
+ }
+ return VLC_EGENERIC;
+}
+
+/***************************************************************************
+ * 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_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 )
{
+ if( p_parent == p_playlist->p_root_category )
+ {
+ p_toplay = p_item_cat; break;
+ }
+ else if( p_parent == p_playlist->p_root_onelevel )
+ {
+ p_toplay = p_item_one; break;
+ }
+ p_parent = p_parent->p_parent;
+ }
+ assert( p_toplay );
+ p_playlist->request.b_request = VLC_TRUE;
+ p_playlist->request.i_skip = 0;
+ p_playlist->request.p_item = p_toplay;
+ if( p_playlist->p_input )
input_StopThread( p_playlist->p_input );
+ p_playlist->request.i_status = PLAYLIST_RUNNING;
+ vlc_cond_signal( &p_playlist->object_wait );
+ }
+ /* Preparse if PREPARSE or SPREPARSE & not enough meta */
+ char *psz_artist = input_item_GetArtist( p_item_cat->p_input );
+ char *psz_album = input_item_GetAlbum( p_item_cat->p_input );
+ if( p_playlist->b_auto_preparse &&
+ (i_mode & PLAYLIST_PREPARSE ||
+ ( i_mode & PLAYLIST_SPREPARSE &&
+ ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) )
+ ) ) )
+ playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input );
+ /* If we already have it, signal it */
+ else if( !EMPTY_STR( psz_artist ) && !EMPTY_STR( psz_album ) )
+ input_item_SetPreparsed( p_item_cat->p_input, VLC_TRUE );
+ free( psz_artist );
+ free( psz_album );
+}
+
+/* Add the playlist item to the requested node and fire a notification */
+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 );
+ 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,
+ vlc_bool_t b_stop )
+{
+ int i;
+ int i_id = p_item->i_id;
+ vlc_bool_t b_delay_deletion = VLC_FALSE;
+
+ if( p_item->i_children > -1 )
+ {
+ return playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE );
+ }
+ p_playlist->b_reset_currently_playing = VLC_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 );
+
+ /* Check if it is the current item */
+ if( p_playlist->status.p_item == p_item )
+ {
+ /* Hack we don't call playlist_Control for lock reasons */
+ if( b_stop )
+ {
+ p_playlist->request.i_status = PLAYLIST_STOPPED;
+ p_playlist->request.b_request = VLC_TRUE;
+ p_playlist->request.p_item = NULL;
+ msg_Info( p_playlist, "stopping playback" );
+ vlc_cond_signal( &p_playlist->object_wait );
}
- p_playlist->i_status = PLAYLIST_RUNNING;
+ b_delay_deletion = VLC_TRUE;
}
- vlc_mutex_unlock( &p_playlist->object_lock );
+ 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 );
+ if( !b_delay_deletion )
+ playlist_ItemDelete( p_item );
+ else
+ {
+ PL_DEBUG( "marking %s for further deletion", PLI_NAME( p_item ) );
+ p_item->i_flags |= PLAYLIST_REMOVE_FLAG;
+ }
- return p_item->i_id;
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff