* 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 )
{
playlist_item_t *p_item = user_data;
VLC_UNUSED( p_event );
- var_SetInteger( p_item->p_playlist, "item-change", p_item->p_input->i_id );
+ var_SetAddress( p_item->p_playlist, "item-change", p_item->p_input );
}
/*****************************************************************************
*
* 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 ) ?
* 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,
* \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,
- int i_options, const char *const *ppsz_options, unsigned i_option_flags,
+ 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_option_flags,
- 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;
}
/**
}
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],
/** \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 );
}
pl_priv(p_playlist)->b_reset_currently_playing = true;
vlc_cond_signal( &pl_priv(p_playlist)->signal );
- var_SetInteger( p_playlist, "item-change", p_item_in_category->p_input->i_id );
+ 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;
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_node->p_input,
p_playlist->p_root_onelevel,
false );
p_item_onelevel = playlist_ItemFindFromInputAndRoot( p_playlist,
- p_item->p_input->i_id,
+ p_item->p_input,
p_playlist->p_root_onelevel,
false );
if( p_node_onelevel && p_item_onelevel )
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_node->p_input,
p_playlist->p_root_category,
false );
p_item_category = playlist_ItemFindFromInputAndRoot( p_playlist,
- p_item->p_input->i_id,
+ p_item->p_input,
p_playlist->p_root_category,
false );
if( p_node_category && p_item_category )
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;
- pl_priv(p_playlist)->b_reset_currently_playing = true;
+ p_sys->b_reset_currently_playing = true;
if( b_signal )
- vlc_cond_signal( &pl_priv(p_playlist)->signal );
+ vlc_cond_signal( &p_sys->signal );
+
+ playlist_add_t add;
+ add.i_item = i_item_id;
+ add.i_node = i_node_id;
+
+ vlc_value_t val;
+ val.p_address = &add;
- var_Set( p_playlist, "item-append", val );
- free( p_add );
+ 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_cond_signal( &pl_priv(p_playlist)->signal );
}
return playlist_NodeDelete( p_playlist, p_item, true, false );
}
pl_priv(p_playlist)->b_reset_currently_playing = true;
- var_SetInteger( p_playlist, "item-deleted", i_id );
+ 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 );
ARRAY_REMOVE( p_playlist->items, i );
/* Check if it is the current item */
- if( get_current_status_item( p_playlist ) == p_item )
+ if( get_current_status_item( p_playlist ) == p_item && b_stop )
{
- /* Hack we don't call playlist_Control for lock reasons */
- 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;
- msg_Info( p_playlist, "stopping playback" );
- vlc_cond_signal( &pl_priv(p_playlist)->signal );
- }
+ playlist_Control( p_playlist, PLAYLIST_STOP, pl_Locked );
+ msg_Info( p_playlist, "stopping playback" );
}
PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name );
projects / vlc / blobdiff