* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <assert.h>
#include <vlc_playlist.h>
static void input_item_subitem_added( const vlc_event_t * p_event,
void * user_data )
{
- playlist_t * p_playlist = 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;
- vlc_bool_t b_play = var_CreateGetBool( p_playlist, "playlist-autostart" );
- playlist_item_t *p_item_in_category;
- playlist_item_t *p_current;
+ 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;
- p_current = playlist_ItemGetByInput( p_playlist, p_parent, VLC_FALSE );
- if( p_current->i_children == -1 )
- p_item_in_category = playlist_ItemToNode( p_playlist, p_current,
- VLC_FALSE );
- else
- p_item_in_category = p_current;
- p_item_in_category = p_current;
- b_play = b_play && p_current == p_playlist->status.p_item;
+ PL_LOCK;
+ b_play = var_CreateGetBool( p_playlist, "playlist-autostart" );
- playlist_NodeAddInput( p_playlist, p_child, p_item_in_category,
- PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END,
- VLC_FALSE );
+ /* 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( b_play )
+ if( !p_child_in_category )
{
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
+ /* 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 );
- vlc_object_release( p_playlist );
+ }
}
+
+ PL_UNLOCK;
+
}
/*****************************************************************************
* Listen to vlc_InputItemAddSubItem event
*****************************************************************************/
-static void install_input_item_observer( playlist_t * p_playlist,
- input_item_t * p_input )
+static void install_input_item_observer( playlist_item_t * p_item )
{
- msg_Dbg( p_playlist, "Listening to %s with %p", p_input->psz_name, p_playlist);
-
- vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded,
+ vlc_event_attach( &p_item->p_input->event_manager,
+ vlc_InputItemSubItemAdded,
input_item_subitem_added,
- p_playlist );
+ p_item );
}
-static void uninstall_input_item_observer( playlist_t * p_playlist,
- input_item_t * p_input )
+static void uninstall_input_item_observer( playlist_item_t * p_item )
{
- msg_Dbg( p_playlist, "Not Listening to %s with %p", p_input->psz_name, p_playlist);
-
- vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded,
+ vlc_event_detach( &p_item->p_input->event_manager,
+ vlc_InputItemSubItemAdded,
input_item_subitem_added,
- p_playlist );
-
+ p_item );
+
}
/*****************************************************************************
input_item_t *p_input )
{
DECMALLOC_NULL( p_item, playlist_item_t );
- playlist_t *p_playlist = p_obj->p_libvlc->p_playlist;
+ playlist_t *p_playlist = pl_Yield( p_obj );
p_item->p_input = p_input;
vlc_gc_incref( p_item->p_input );
p_item->i_flags = 0;
p_item->p_playlist = p_playlist;
- install_input_item_observer( p_playlist, p_input );
+ install_input_item_observer( p_item );
+
+ pl_Release( p_item->p_playlist );
return p_item;
}
* Playlist item destruction
***************************************************************************/
-/** Delete a playlist item and detach its input item */
+/**
+ * Delete item
+ *
+ * Delete a playlist item and detach its input item
+ * \param p_item item to delete
+ * \return VLC_SUCCESS
+*/
int playlist_ItemDelete( playlist_item_t *p_item )
{
- uninstall_input_item_observer( p_item->p_playlist, p_item->p_input );
+ uninstall_input_item_observer( p_item );
vlc_gc_decref( p_item->p_input );
free( p_item );
return VLC_SUCCESS;
}
-/** Remove an input item when it appears from a root playlist item */
+/**
+ * Delete input item
+ *
+ * Remove an input item when it appears from a root playlist item
+ * \param p_playlist playlist object
+ * \param i_input_id id of the input to delete
+ * \param p_root root playlist item
+ * \param b_do_stop must stop or not the playlist
+ * \return VLC_SUCCESS or VLC_EGENERIC
+*/
static int DeleteFromInput( playlist_t *p_playlist, int i_input_id,
playlist_item_t *p_root, vlc_bool_t b_do_stop )
{
return VLC_EGENERIC;
}
-/** Remove an input item from ONELEVEL and CATEGORY */
+/**
+ * Delete input item
+ *
+ * Remove an input item when it appears from a root playlist item
+ * \param p_playlist playlist object
+ * \param i_input_id id of the input to delete
+ * \param p_root root playlist item
+ * \param b_locked TRUE if the playlist is locked
+ * \return VLC_SUCCESS or VLC_EGENERIC
+ */
+int playlist_DeleteInputInParent( playlist_t *p_playlist, int i_input_id,
+ playlist_item_t *p_root, 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;
+}
+
+/**
+ * Delete from input
+ *
+ * Remove an input item from ONELEVEL and CATEGORY
+ * \param p_playlist playlist object
+ * \param i_input_id id of the input to delete
+ * \param b_locked TRUE if the playlist is locked
+ * \return VLC_SUCCESS or VLC_ENOITEM
+ */
int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id,
vlc_bool_t b_locked )
{
VLC_SUCCESS : VLC_ENOITEM;
}
+/**
+ * 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, 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 );
+ playlist_NodeEmpty( p_playlist, p_playlist->p_local_category, VLC_TRUE );
+ playlist_NodeEmpty( p_playlist, p_playlist->p_local_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 */
+/**
+ * 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,
/***************************************************************************
* Playlist item addition
***************************************************************************/
-/** Add an item to the playlist or the media library
+/**
+ * Playlist add
+ *
+ * Add an item to the playlist or the media library
* \param p_playlist the playlist to add into
* \param psz_uri the mrl to add to the playlist
* \param psz_name a text giving a name or description of this item
* PLAYLIST_END the item will be added at the end of the playlist
* regardless of its size
* \param b_playlist TRUE for playlist, FALSE for media library
+ * \param b_locked TRUE if the playlist is locked
* \return The id of the playlist item
*/
int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
* \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,
i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist,
b_locked );
- if( i_ret == VLC_SUCCESS )
- return p_input->i_id;
- return -1;
+ int i_id = i_ret == VLC_SUCCESS ? p_input->i_id : -1;
+
+ vlc_gc_decref( p_input );
+
+ return i_id;
}
-/** Add an input item to the playlist node */
+/**
+ * Add an input item to the playlist node
+ *
+ * \param p_playlist the playlist to add into
+ * \param p_input the input item to add
+ * \param i_mode the mode used when adding
+ * \param i_pos the position in the playlist where to add. If this is
+ * PLAYLIST_END the item will be added at the end of the playlist
+ * regardless of its size
+ * \param b_playlist TRUE for playlist, FALSE for media library
+ * \param b_locked TRUE if the playlist is locked
+ * \return VLC_SUCCESS or VLC_ENOMEM
+*/
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 )
return VLC_SUCCESS;
}
-/** Add an input item to p_direct_parent in the category tree, and to the
- * matching top category in onelevel **/
+/**
+ * Add input
+ *
+ * Add an input item to p_direct_parent in the category tree, and to the
+ * matching top category in onelevel
+ * \param p_playlist the playlist to add into
+ * \param p_input the input item to add
+ * \param p_direct_parent the parent item to add into
+ * \param i_mode the mode used when adding
+ * \param i_pos the position in the playlist where to add. If this is
+ * PLAYLIST_END the item will be added at the end of the playlist
+ * regardless of its size
+ * \param i_cat id of the items category
+ * \param i_one id of the item onelevel category
+ * \param b_locked TRUE if the playlist is locked
+ * \return VLC_SUCCESS or VLC_ENOMEM
+ */
int playlist_BothAddInput( playlist_t *p_playlist,
input_item_t *p_input,
playlist_item_t *p_direct_parent,
return VLC_SUCCESS;
}
-/** Add an input item to a given node */
+/**
+ * Add an input item to a given node
+ *
+ * \param p_playlist the playlist to add into
+ * \param p_input the input item to add
+ * \param p_parent the parent item to add into
+ * \param i_mode the mode used when addin
+ * \param i_pos the position in the playlist where to add. If this is
+ * PLAYLIST_END the item will be added at the end of the playlist
+ * regardless of its size
+ * \param b_locked TRUE if the playlist is locked
+ * \return the new playlist item
+ */
playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist,
input_item_t *p_input,
playlist_item_t *p_parent,
*****************************************************************************/
/**
+ * Item to node
+ *
* Transform an item to a node. Return the node in the category tree, or NULL
* if not found there
* This function must be entered without the playlist lock
+ * \param p_playlist the playlist object
+ * \param p_item the item to transform
+ * \param b_locked TRUE if the playlist is locked
+ * \return the item transform in a node
*/
playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
playlist_item_t *p_item,
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 );
- if( !p_item_in_one )
- return 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 );
}
}
-/** Find an item within a root, given its input id.
+/**
+ * Find an item within a root, given its input id.
+ *
+ * \param p_playlist the playlist object
+ * \param i_input_id id of the input
+ * \param p_root root playlist item
+ * \param b_items_only TRUE if we want the item himself
* \return the first found item, or NULL if not found
*/
playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist,
return i_ret;
}
-/** Send a notification that an item has been added to a node */
+/**
+ * Send notification
+ *
+ * Send a notification that an item has been added to a node
+ * \param p_playlist the playlist object
+ * \param i_item_id id of the item added
+ * \param i_node_id id of the node in wich the item was added
+ * \param b_signal TRUE if the function must send a signal
+ * \return nothing
+ */
void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
int i_node_id, vlc_bool_t b_signal )
{
vlc_value_t val;
- playlist_add_t *p_add = (playlist_add_t *)malloc(sizeof( playlist_add_t));
+ playlist_add_t *p_add = (playlist_add_t *)malloc( sizeof( playlist_add_t) );
p_add->i_item = i_item_id;
p_add->i_node = i_node_id;
val.p_address = p_add;
* Playlist item accessors
*****************************************************************************/
-/** Set the name of a playlist item */
+/**
+ * Set the name of a playlist item
+ *
+ * \param p_item the item
+ * \param psz_name the name
+ * \return VLC_SUCCESS or VLC_EGENERIC
+ */
int playlist_ItemSetName( playlist_item_t *p_item, const char *psz_name )
{
if( psz_name && p_item )
{
- input_ItemSetName( p_item->p_input, psz_name );
+ input_item_SetName( p_item->p_input, psz_name );
return VLC_SUCCESS;
}
return VLC_EGENERIC;
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( input_item_GetArtist( p_item_cat->p_input ) ) ||
- ( EMPTY_STR( input_item_GetAlbum( p_item_cat->p_input ) ) ) )
+ ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) )
) ) )
playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input );
/* If we already have it, signal it */
- else if( !EMPTY_STR( input_item_GetArtist( p_item_cat->p_input ) ) &&
- !EMPTY_STR( input_item_GetAlbum( p_item_cat->p_input ) ) )
+ 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 */
projects / vlc / blobdiff