* 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>
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 );
+ bool b_stop );
/*****************************************************************************
* An input item has gained a subitem (Event Callback)
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;
+ bool b_play;
p_parent = p_event->p_obj;
p_child = p_event->u.input_item_subitem_added.p_new_child;
p_child_in_category = playlist_ItemFindFromInputAndRoot(
p_playlist, p_child->i_id,
p_playlist->p_root_category,
- VLC_FALSE /* Only non-node */ );
+ false /* Only non-node */ );
if( !p_child_in_category )
{
p_item_in_category = playlist_ItemFindFromInputAndRoot(
p_playlist, p_parent->i_id,
p_playlist->p_root_category,
- VLC_FALSE /* Only non-node */ );
+ false /* Only non-node */ );
if( !p_item_in_category )
{
/* Item may have been removed */
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, true );
p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST;
}
-
- playlist_BothAddInput( p_playlist, p_child, p_item_in_category,
+
+ int i_ret = playlist_BothAddInput( p_playlist, p_child,
+ p_item_in_category,
PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END,
- NULL, NULL, VLC_TRUE );
+ NULL, NULL, true );
- if( b_play )
+ if( i_ret == VLC_SUCCESS && b_play )
{
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- VLC_TRUE, p_item_in_category, NULL );
+ true, p_item_in_category, NULL );
}
}
-
+
PL_UNLOCK;
}
vlc_InputItemSubItemAdded,
input_item_subitem_added,
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 );
return VLC_SUCCESS;
}
-/** Remove an input item when it appears from a root playlist item */
+/**
+ * Delete input item
+ *
+ * Remove an input item when it appears from a root playlist item
+ * \param p_playlist playlist object
+ * \param i_input_id id of the input to delete
+ * \param p_root root playlist item
+ * \param b_do_stop must stop or not the playlist
+ * \return VLC_SUCCESS or VLC_EGENERIC
+*/
static int DeleteFromInput( playlist_t *p_playlist, int i_input_id,
- playlist_item_t *p_root, vlc_bool_t b_do_stop )
+ playlist_item_t *p_root, bool b_do_stop )
{
int i;
for( i = 0 ; i< p_root->i_children ; i++ )
return VLC_EGENERIC;
}
-/** 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_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 )
+ playlist_item_t *p_root, bool b_locked )
{
int i_ret;
if( !b_locked ) PL_LOCK;
i_ret = DeleteFromInput( p_playlist, i_input_id,
- p_root, VLC_TRUE );
+ p_root, true );
if( !b_locked ) PL_UNLOCK;
return i_ret;
}
-/** Remove an input item from ONELEVEL and CATEGORY */
+/**
+ * Delete from input
+ *
+ * Remove an input item from ONELEVEL and CATEGORY
+ * \param p_playlist playlist object
+ * \param i_input_id id of the input to delete
+ * \param b_locked TRUE if the playlist is locked
+ * \return VLC_SUCCESS or VLC_ENOITEM
+ */
int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id,
- vlc_bool_t b_locked )
+ bool b_locked )
{
int i_ret1, i_ret2;
if( !b_locked ) PL_LOCK;
i_ret1 = DeleteFromInput( p_playlist, i_input_id,
- p_playlist->p_root_category, VLC_TRUE );
+ p_playlist->p_root_category, true );
i_ret2 = DeleteFromInput( p_playlist, i_input_id,
- p_playlist->p_root_onelevel, VLC_TRUE );
+ p_playlist->p_root_onelevel, 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 )
+/**
+ * Clear the playlist
+ *
+ * \param p_playlist playlist object
+ * \param b_locked TRUE if the playlist is locked
+ * \return nothing
+ */
+void playlist_Clear( playlist_t * p_playlist, bool b_locked )
{
if( !b_locked ) PL_LOCK;
- playlist_NodeEmpty( p_playlist, p_playlist->p_local_category, VLC_TRUE );
- playlist_NodeEmpty( p_playlist, p_playlist->p_local_onelevel, VLC_TRUE );
+ playlist_NodeEmpty( p_playlist, p_playlist->p_local_category, true );
+ playlist_NodeEmpty( p_playlist, p_playlist->p_local_onelevel, true );
if( !b_locked ) PL_UNLOCK;
}
-/** Remove a playlist item from the playlist, given its id
- * This function is to be used only by the playlist */
+/**
+ * Delete playlist item
+ *
+ * Remove a playlist item from the playlist, given its id
+ * This function is to be used only by the playlist
+ * \param p_playlist playlist object
+ * \param i_id id of the item do delete
+ * \return VLC_SUCCESS or an error
+ */
int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id )
{
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id,
- VLC_TRUE );
+ true );
if( !p_item ) return VLC_EGENERIC;
- return DeleteInner( p_playlist, p_item, VLC_TRUE );
+ return DeleteInner( p_playlist, p_item, true );
}
/***************************************************************************
* Playlist item addition
***************************************************************************/
-/** Add an item to the playlist or the media library
+/**
+ * Playlist add
+ *
+ * Add an item to the playlist or the media library
* \param p_playlist the playlist to add into
* \param psz_uri the mrl to add to the playlist
* \param psz_name a text giving a name or description of this item
* PLAYLIST_END the item will be added at the end of the playlist
* regardless of its size
* \param b_playlist TRUE for playlist, FALSE for media library
+ * \param b_locked TRUE if the playlist is locked
* \return The id of the playlist item
*/
int playlist_Add( playlist_t *p_playlist, const char *psz_uri,
const char *psz_name, int i_mode, int i_pos,
- vlc_bool_t b_playlist, vlc_bool_t b_locked )
+ bool b_playlist, bool b_locked )
{
return playlist_AddExt( p_playlist, psz_uri, psz_name,
i_mode, i_pos, -1, NULL, 0, b_playlist, b_locked );
* \param ppsz_options an array of options
* \param i_options the number of options
* \param b_playlist TRUE for playlist, FALSE for media library
+ * \param b_locked TRUE if the playlist is locked
* \return The id of the playlist item
*/
int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
const char *psz_name, int i_mode, int i_pos,
mtime_t i_duration, const char *const *ppsz_options,
- int i_options, vlc_bool_t b_playlist, vlc_bool_t b_locked )
+ 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,
return i_id;
}
-/** Add an input item to the playlist node */
+/**
+ * Add an input item to the playlist node
+ *
+ * \param p_playlist the playlist to add into
+ * \param p_input the input item to add
+ * \param i_mode the mode used when adding
+ * \param i_pos the position in the playlist where to add. If this is
+ * PLAYLIST_END the item will be added at the end of the playlist
+ * regardless of its size
+ * \param b_playlist TRUE for playlist, FALSE for media library
+ * \param b_locked TRUE if the playlist is locked
+ * \return VLC_SUCCESS or VLC_ENOMEM or VLC_EGENERIC
+*/
int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input,
- int i_mode, int i_pos, vlc_bool_t b_playlist,
- vlc_bool_t b_locked )
+ 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 );
return VLC_SUCCESS;
}
-/** Add an input item to p_direct_parent in the category tree, and to the
- * matching top category in onelevel **/
+/**
+ * Add input
+ *
+ * Add an input item to p_direct_parent in the category tree, and to the
+ * matching top category in onelevel
+ * \param p_playlist the playlist to add into
+ * \param p_input the input item to add
+ * \param p_direct_parent the parent item to add into
+ * \param i_mode the mode used when adding
+ * \param i_pos the position in the playlist where to add. If this is
+ * PLAYLIST_END the item will be added at the end of the playlist
+ * regardless of its size
+ * \param i_cat id of the items category
+ * \param i_one id of the item onelevel category
+ * \param b_locked TRUE if the playlist is locked
+ * \return VLC_SUCCESS if success, VLC_EGENERIC if fail, VLC_ENOMEM if OOM
+ */
int playlist_BothAddInput( playlist_t *p_playlist,
input_item_t *p_input,
playlist_item_t *p_direct_parent,
int i_mode, int i_pos,
- int *i_cat, int *i_one, vlc_bool_t b_locked )
+ 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 );
+ if( p_playlist->b_die ) return VLC_EGENERIC;
if( !b_locked ) PL_LOCK;
/* Add to category */
return VLC_SUCCESS;
}
-/** Add an input item to a given node */
+/**
+ * Add an input item to a given node
+ *
+ * \param p_playlist the playlist to add into
+ * \param p_input the input item to add
+ * \param p_parent the parent item to add into
+ * \param i_mode the mode used when addin
+ * \param i_pos the position in the playlist where to add. If this is
+ * PLAYLIST_END the item will be added at the end of the playlist
+ * regardless of its size
+ * \param b_locked TRUE if the playlist is locked
+ * \return the new playlist item
+ */
playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist,
input_item_t *p_input,
playlist_item_t *p_parent,
int i_mode, int i_pos,
- vlc_bool_t b_locked )
+ bool b_locked )
{
playlist_item_t *p_item;
assert( p_input );
assert( p_parent && p_parent->i_children != -1 );
+ if( p_playlist->b_die )
+ return NULL;
if( !b_locked ) PL_LOCK;
p_item = playlist_ItemNewFromInput( p_playlist, p_input );
*****************************************************************************/
/**
+ * Item to node
+ *
* Transform an item to a node. Return the node in the category tree, or NULL
* if not found there
* This function must be entered without the playlist lock
+ * \param p_playlist the playlist object
+ * \param p_item the item to transform
+ * \param b_locked TRUE if the playlist is locked
+ * \return the item transform in a node
*/
playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
playlist_item_t *p_item,
- vlc_bool_t b_locked )
+ bool b_locked )
{
playlist_item_t *p_item_in_category;
p_item_in_category = playlist_ItemFindFromInputAndRoot(
p_playlist, p_item->p_input->i_id,
p_playlist->p_root_category,
- VLC_TRUE );
+ true );
if( p_item_in_category )
{
playlist_item_t *p_item_in_one = playlist_ItemFindFromInputAndRoot(
p_playlist, p_item->p_input->i_id,
p_playlist->p_root_onelevel,
- VLC_TRUE );
+ true );
assert( p_item_in_one );
/* We already have it, and there is nothing more to do */
else
{
DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id,
- p_playlist->p_root_onelevel, VLC_FALSE );
+ p_playlist->p_root_onelevel, false );
}
- p_playlist->b_reset_currently_playing = VLC_TRUE;
+ p_playlist->b_reset_currently_playing = true;
vlc_cond_signal( &p_playlist->object_wait );
var_SetInteger( p_playlist, "item-change", p_item_in_category->
p_input->i_id );
}
}
-/** Find an item within a root, given its input id.
+/**
+ * Find an item within a root, given its input id.
+ *
+ * \param p_playlist the playlist object
+ * \param i_input_id id of the input
+ * \param p_root root playlist item
+ * \param b_items_only TRUE if we want the item himself
* \return the first found item, or NULL if not found
*/
playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist,
int i_input_id,
playlist_item_t *p_root,
- vlc_bool_t b_items_only )
+ bool b_items_only )
{
int i;
for( i = 0 ; i< p_root->i_children ; i++ )
p_node_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
p_node->p_input->i_id,
p_playlist->p_root_onelevel,
- VLC_FALSE );
+ false );
p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
p_item->p_input->i_id,
p_playlist->p_root_onelevel,
- VLC_FALSE );
+ false );
if( p_node_onelevel && p_item_onelevel )
TreeMove( p_playlist, p_item_onelevel, p_node_onelevel, 0 );
}
p_node_category = playlist_ItemFindFromInputAndRoot( p_playlist,
p_node->p_input->i_id,
p_playlist->p_root_category,
- VLC_FALSE );
+ false );
p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist,
p_item->p_input->i_id,
p_playlist->p_root_category,
- VLC_FALSE );
+ false );
if( p_node_category && p_item_category )
TreeMove( p_playlist, p_item_category, p_node_category, 0 );
}
}
else
i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos );
- p_playlist->b_reset_currently_playing = VLC_TRUE;
+ p_playlist->b_reset_currently_playing = true;
vlc_cond_signal( &p_playlist->object_wait );
return i_ret;
}
-/** Send a notification that an item has been added to a node */
+/**
+ * Send a notification that an item has been added to a node
+ *
+ * \param p_playlist the playlist object
+ * \param i_item_id id of the item added
+ * \param i_node_id id of the node in wich the item was added
+ * \param b_signal TRUE if the function must send a signal
+ * \return nothing
+ */
void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
- int i_node_id, vlc_bool_t b_signal )
+ int i_node_id, bool b_signal )
{
vlc_value_t val;
- playlist_add_t *p_add = (playlist_add_t *)malloc(sizeof( playlist_add_t));
+ playlist_add_t *p_add = (playlist_add_t *)malloc( sizeof( playlist_add_t) );
+ if( !p_add )
+ return;
+
p_add->i_item = i_item_id;
p_add->i_node = i_node_id;
val.p_address = p_add;
- p_playlist->b_reset_currently_playing = VLC_TRUE;
+ p_playlist->b_reset_currently_playing = true;
if( b_signal )
vlc_cond_signal( &p_playlist->object_wait );
var_Set( p_playlist, "item-append", val );
* 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 )
p_parent = p_parent->p_parent;
}
assert( p_toplay );
- p_playlist->request.b_request = VLC_TRUE;
+ p_playlist->request.b_request = true;
p_playlist->request.i_skip = 0;
p_playlist->request.p_item = p_toplay;
if( p_playlist->p_input )
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 );
+ input_item_SetPreparsed( p_item_cat->p_input, true );
free( psz_artist );
free( psz_album );
}
{
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 );
/* Do the actual removal */
static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
- vlc_bool_t b_stop )
+ bool b_stop )
{
int i;
int i_id = p_item->i_id;
- vlc_bool_t b_delay_deletion = VLC_FALSE;
+ bool b_delay_deletion = false;
if( p_item->i_children > -1 )
{
- return playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE );
+ return playlist_NodeDelete( p_playlist, p_item, true, false );
}
- p_playlist->b_reset_currently_playing = VLC_TRUE;
+ p_playlist->b_reset_currently_playing = true;
var_SetInteger( p_playlist, "item-deleted", i_id );
/* Remove the item from the bank */
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( p_playlist->status.p_item == p_item )
{
if( b_stop )
{
p_playlist->request.i_status = PLAYLIST_STOPPED;
- p_playlist->request.b_request = VLC_TRUE;
+ p_playlist->request.b_request = true;
p_playlist->request.p_item = NULL;
msg_Info( p_playlist, "stopping playback" );
vlc_cond_signal( &p_playlist->object_wait );
}
- b_delay_deletion = VLC_TRUE;
+ b_delay_deletion = true;
}
PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name );