static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
bool b_stop );
+static playlist_item_t *ItemToNode( playlist_t *, playlist_item_t *, bool );
+
/*****************************************************************************
* An input item has gained a subitem (Event Callback)
*****************************************************************************/
* 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_child,
p_playlist->p_root_category,
false /* Only non-node */ );
{
/* Then, transform to a node if needed */
p_item_in_category = playlist_ItemFindFromInputAndRoot(
- p_playlist, p_parent->i_id,
+ p_playlist, p_parent,
p_playlist->p_root_category,
false /* Only non-node */ );
if( !p_item_in_category )
/* 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 = ItemToNode( p_playlist,
p_item_in_category, pl_Locked );
p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST;
}
static void input_item_changed( const vlc_event_t * p_event,
void * user_data )
{
- (void)p_event;
- playlist_item_t * p_item = user_data;
- var_SetInteger( p_item->p_playlist, "item-change", p_item->i_id );
+ playlist_item_t *p_item = user_data;
+ VLC_UNUSED( p_event );
+ var_SetAddress( p_item->p_playlist, "item-change", p_item->p_input );
}
/*****************************************************************************
playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist,
input_item_t *p_input )
{
- DECMALLOC_NULL( p_item, playlist_item_t );
+ playlist_item_t* p_item = malloc( sizeof( playlist_item_t ) );
+ if( !p_item )
+ return NULL;
assert( p_input );
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->i_id = ++pl_priv(p_playlist)->i_last_playlist_id;
p_item->p_parent = NULL;
p_item->i_children = -1;
return p_item;
}
-playlist_item_t * playlist_ItemNewWithType( playlist_t *p_playlist,
- const char *psz_uri,
- const char *psz_name,
- int i_options,
- const char *const *ppsz_options,
- int i_duration, int i_type )
-{
- input_item_t *p_input;
- if( psz_uri == NULL ) return NULL;
- p_input = input_item_NewWithType( VLC_OBJECT(p_playlist), psz_uri,
- psz_name, i_options, ppsz_options,
- i_duration, i_type );
- return playlist_ItemNewFromInput( p_playlist, p_input );
-}
-
/***************************************************************************
* Playlist item destruction
***************************************************************************/
*
* Who wants to add proper memory management? */
uninstall_input_item_observer( p_item );
- ARRAY_APPEND( p_item->p_playlist->items_to_delete, p_item);
+ ARRAY_APPEND( pl_priv(p_playlist)->items_to_delete, p_item);
return VLC_SUCCESS;
}
*
* 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_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, int i_input_id,
+static int DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input,
playlist_item_t *p_root, bool 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 )
+ p_root->pp_children[i]->p_input == p_input )
{
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,
+ int i_ret = DeleteFromInput( p_playlist, p_input,
p_root->pp_children[i], b_do_stop );
if( i_ret == VLC_SUCCESS ) return VLC_SUCCESS;
}
*
* 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_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, int i_input_id,
+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, i_input_id,
- p_root, true );
+ i_ret = DeleteFromInput( p_playlist, p_item, p_root, true );
PL_UNLOCK_IF( !b_locked );
return i_ret;
}
*
* Remove an input item from ONELEVEL and CATEGORY
* \param p_playlist playlist object
- * \param i_input_id id of the input to delete
+ * \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, int i_input_id,
+int playlist_DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input,
bool b_locked )
{
int i_ret1, i_ret2;
PL_LOCK_IF( !b_locked );
- i_ret1 = DeleteFromInput( p_playlist, i_input_id,
+ i_ret1 = DeleteFromInput( p_playlist, p_input,
p_playlist->p_root_category, true );
- i_ret2 = DeleteFromInput( p_playlist, i_input_id,
+ i_ret2 = DeleteFromInput( p_playlist, p_input,
p_playlist->p_root_onelevel, true );
PL_UNLOCK_IF( !b_locked );
return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ?
int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id )
{
PL_ASSERT_LOCKED;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id,
- pl_Locked );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
if( !p_item ) return VLC_EGENERIC;
return DeleteInner( p_playlist, p_item, true );
}
* 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
+ * \return VLC_SUCCESS or a VLC error code
*/
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 )
{
return playlist_AddExt( p_playlist, psz_uri, psz_name,
- i_mode, i_pos, -1, NULL, 0, b_playlist, b_locked );
+ i_mode, i_pos, -1, 0, NULL, 0, b_playlist, b_locked );
}
/**
* PLAYLIST_END the item will be added at the end of the playlist
* regardless of its size
* \param i_duration length of the item in milliseconds.
- * \param ppsz_options an array of options
* \param i_options the number of options
+ * \param 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 The id of the playlist item
+ * \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, const char *const *ppsz_options,
- int i_options, bool b_playlist, bool b_locked )
+ 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 = input_item_NewExt( p_playlist, psz_uri, psz_name,
- i_options, ppsz_options,
- i_duration );
+ 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 );
- int i_id = (i_ret == VLC_SUCCESS) ? p_input->i_id : -1;
-
vlc_gc_decref( p_input );
-
- return i_id;
+ return i_ret;
}
/**
{
playlist_item_t *p_item_cat, *p_item_one;
if( p_playlist->b_die ) return VLC_EGENERIC;
- if( !p_playlist->b_doing_ml )
+ if( !pl_priv(p_playlist)->b_doing_ml )
PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name,
p_input->psz_uri );
}
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 )
+ if( p_playlist->p_root_onelevel->pp_children[i_top]->p_input ==
+ p_up->p_input )
{
AddItem( p_playlist, p_item_one,
p_playlist->p_root_onelevel->pp_children[i_top],
* \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,
- bool b_locked )
+static playlist_item_t *ItemToNode( playlist_t *p_playlist,
+ playlist_item_t *p_item,
+ bool b_locked )
{
playlist_item_t *p_item_in_category;
/** \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_item->p_input,
p_playlist->p_root_category,
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_item->p_input,
p_playlist->p_root_onelevel,
true );
assert( p_item_in_one );
if( p_prev_status_item )
set_current_status_item( p_playlist, p_prev_status_item );
}
- DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id,
+ DeleteFromInput( p_playlist, p_item_in_one->p_input,
p_playlist->p_root_onelevel, false );
}
- p_playlist->b_reset_currently_playing = true;
- vlc_object_signal_unlocked( p_playlist );
- var_SetInteger( p_playlist, "item-change", p_item_in_category->
- p_input->i_id );
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
+ vlc_cond_signal( &pl_priv(p_playlist)->signal );
+ var_SetAddress( p_playlist, "item-change", p_item_in_category->p_input );
PL_UNLOCK_IF( !b_locked );
return p_item_in_category;
}
* 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_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,
- int i_input_id,
+ input_item_t *p_item,
playlist_item_t *p_root,
bool b_items_only )
{
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 )
+ 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, i_input_id,
+ playlist_ItemFindFromInputAndRoot( p_playlist, p_item,
p_root->pp_children[i],
b_items_only );
if( p_search ) return p_search;
}
-static int TreeMove( playlist_t *p_playlist, playlist_item_t *p_item,
- playlist_item_t *p_node, int i_newpos )
+static int ItemIndex ( playlist_item_t *p_item )
{
- int j;
- playlist_item_t *p_detach = p_item->p_parent;
- (void)p_playlist;
+ 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;
+}
+
+/**
+ * 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 )
+{
+ PL_ASSERT_LOCKED;
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;
- }
- REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, j );
+ playlist_item_t *p_detach = p_item->p_parent;
+ int i_index = ItemIndex( p_item );
- /* If j < i_newpos, we are moving the element from the top to the
- * down of the playlist. So when removing the element we change have
- * to change the position as we loose one element
- */
- if( j < i_newpos )
+ REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, i_index );
+
+ if( p_detach == p_node && i_index < i_newpos )
i_newpos--;
- /* Attach to new parent */
INSERT_ELEM( p_node->pp_children, p_node->i_children, i_newpos, p_item );
p_item->p_parent = p_node;
+ pl_priv( p_playlist )->b_reset_currently_playing = true;
+ vlc_cond_signal( &pl_priv( p_playlist )->signal );
return VLC_SUCCESS;
}
/**
- * Moves an item
+ * Moves an array of items
*
* 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
+ * \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_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item,
- playlist_item_t *p_node, int i_newpos )
+int playlist_TreeMoveMany( playlist_t *p_playlist,
+ int i_items, playlist_item_t **pp_items,
+ playlist_item_t *p_node, int i_newpos )
{
- int i_ret;
PL_ASSERT_LOCKED;
- /* Drop on a top level node. Move in the two trees */
- if( p_node->p_parent == p_playlist->p_root_category ||
- p_node->p_parent == p_playlist->p_root_onelevel )
+ if ( p_node->i_children == -1 ) return VLC_EGENERIC;
+
+ int i;
+ for( i = 0; i < i_items; i++ )
{
- /* Fixme: avoid useless lookups but we need some clean helpers */
- {
- /* Fixme: if we try to move a node on a top-level node, it will
- * fail because the node doesn't exist in onelevel and we will
- * do some shit in onelevel. We should recursively move all items
- * within the node */
- playlist_item_t *p_node_onelevel;
- playlist_item_t *p_item_onelevel;
- p_node_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
- p_node->p_input->i_id,
- p_playlist->p_root_onelevel,
- false );
- p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
- p_item->p_input->i_id,
- p_playlist->p_root_onelevel,
- false );
- if( p_node_onelevel && p_item_onelevel )
- TreeMove( p_playlist, p_item_onelevel, p_node_onelevel, i_newpos );
- }
- {
- playlist_item_t *p_node_category;
- playlist_item_t *p_item_category;
- p_node_category = playlist_ItemFindFromInputAndRoot( p_playlist,
- p_node->p_input->i_id,
- p_playlist->p_root_category,
- false );
- p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist,
- p_item->p_input->i_id,
- p_playlist->p_root_category,
- false );
- if( p_node_category && p_item_category )
- TreeMove( p_playlist, p_item_category, p_node_category, 0 );
- }
- i_ret = VLC_SUCCESS;
+ 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--;
}
- else
- i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos );
- p_playlist->b_reset_currently_playing = true;
- vlc_object_signal_unlocked( p_playlist );
- return i_ret;
+ 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;
+ }
+
+ pl_priv( p_playlist )->b_reset_currently_playing = true;
+ vlc_cond_signal( &pl_priv( p_playlist )->signal );
+ return VLC_SUCCESS;
}
/**
void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
int i_node_id, bool b_signal )
{
- vlc_value_t val;
+ playlist_private_t *p_sys = pl_priv(p_playlist);
PL_ASSERT_LOCKED;
- playlist_add_t *p_add = (playlist_add_t *)malloc( sizeof( playlist_add_t) );
- if( !p_add )
- return;
-
- p_add->i_item = i_item_id;
- p_add->i_node = i_node_id;
- val.p_address = p_add;
- p_playlist->b_reset_currently_playing = true;
+ p_sys->b_reset_currently_playing = true;
if( b_signal )
- vlc_object_signal_unlocked( p_playlist );
+ vlc_cond_signal( &p_sys->signal );
- var_Set( p_playlist, "item-append", val );
- free( p_add );
-}
+ playlist_add_t add;
+ add.i_item = i_item_id;
+ add.i_node = i_node_id;
-/*****************************************************************************
- * Playlist item accessors
- *****************************************************************************/
+ vlc_value_t val;
+ val.p_address = &add;
-/**
- * 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_item_SetName( p_item->p_input, psz_name );
- return VLC_SUCCESS;
- }
- return VLC_EGENERIC;
+ var_Set( p_playlist, "playlist-item-append", val );
}
/***************************************************************************
pl_priv(p_playlist)->request.i_skip = 0;
pl_priv(p_playlist)->request.p_item = p_toplay;
if( pl_priv(p_playlist)->p_input )
- input_StopThread( 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_object_signal_unlocked( p_playlist );
+ vlc_cond_signal( &pl_priv(p_playlist)->signal );
}
/* 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 &&
+ if( pl_priv(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 );
+ playlist_PreparseEnqueue( p_playlist, p_item_cat->p_input, pl_Locked );
/* If we already have it, signal it */
else if( !EMPTY_STR( psz_artist ) && !EMPTY_STR( psz_album ) )
input_item_SetPreparsed( p_item_cat->p_input, true );
else
playlist_NodeInsert( p_playlist, p_item, p_node, i_pos );
- if( !p_playlist->b_doing_ml )
+ 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 ) );
}
{
return playlist_NodeDelete( p_playlist, p_item, true, false );
}
- p_playlist->b_reset_currently_playing = true;
- var_SetInteger( p_playlist, "item-deleted", i_id );
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
+ var_SetInteger( p_playlist, "playlist-item-deleted", i_id );
/* Remove the item from the bank */
ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i );
/* Check if it is the current item */
if( get_current_status_item( p_playlist ) == p_item )
{
- /* Hack we don't call playlist_Control for lock reasons */
+ /* Stop it if we have to */
if( b_stop )
{
- pl_priv(p_playlist)->request.i_status = PLAYLIST_STOPPED;
- pl_priv(p_playlist)->request.b_request = true;
- pl_priv(p_playlist)->request.p_item = NULL;
+ playlist_Control( p_playlist, PLAYLIST_STOP, pl_Locked );
msg_Info( p_playlist, "stopping playback" );
- vlc_object_signal_unlocked( VLC_OBJECT(p_playlist) );
}
+ /* In any case, this item can't be the next one to be played ! */
+ set_current_status_item( p_playlist, NULL );
}
PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name );
projects / vlc / blobdiff