X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=9210971ccba44b753bc233901ccbbc4eceaa4764;hb=ad77d955a5dc051976d94d6e08ee0f717ec3a938;hp=66573c98c660b10623c8f3e409d8e5dadd22a71d;hpb=7f717d69f39e3be46972fb9a462748424b09d0c3;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index 66573c98c6..9210971ccb 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -38,6 +38,8 @@ static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ); 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) *****************************************************************************/ @@ -62,7 +64,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event, * 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 */ ); @@ -70,7 +72,7 @@ static void input_item_subitem_added( const vlc_event_t * p_event, { /* 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 ) @@ -86,20 +88,20 @@ static void input_item_subitem_added( const vlc_event_t * p_event, /* 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, true ); + p_item_in_category = ItemToNode( p_playlist, + p_item_in_category, pl_Locked ); p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST; } int i_ret = playlist_BothAddInput( p_playlist, p_child, p_item_in_category, PLAYLIST_APPEND | PLAYLIST_SPREPARSE , PLAYLIST_END, - NULL, NULL, true ); + NULL, NULL, pl_Locked ); if( i_ret == VLC_SUCCESS && b_play ) { playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, - true, p_item_in_category, NULL ); + pl_Locked, p_item_in_category, NULL ); } } @@ -113,9 +115,9 @@ static void input_item_subitem_added( const vlc_event_t * p_event, 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 ); } /***************************************************************************** @@ -134,6 +136,8 @@ static void install_input_item_observer( playlist_item_t * p_item ) input_item_changed, p_item ); vlc_event_attach( p_em, vlc_InputItemInfoChanged, input_item_changed, p_item ); + vlc_event_attach( p_em, vlc_InputItemErrorWhenReadingChanged, + input_item_changed, p_item ); } static void uninstall_input_item_observer( playlist_item_t * p_item ) @@ -149,6 +153,8 @@ static void uninstall_input_item_observer( playlist_item_t * p_item ) input_item_changed, p_item ); vlc_event_detach( p_em, vlc_InputItemInfoChanged, input_item_changed, p_item ); + vlc_event_detach( p_em, vlc_InputItemErrorWhenReadingChanged, + input_item_changed, p_item ); } /***************************************************************************** @@ -157,12 +163,16 @@ static void uninstall_input_item_observer( playlist_item_t * p_item ) 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; @@ -175,38 +185,31 @@ playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist, 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_ItemNewWithType( 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 ***************************************************************************/ /** - * Delete item + * Release an 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 ) +int playlist_ItemRelease( playlist_item_t *p_item ) { + /* For the assert */ + playlist_t *p_playlist = p_item->p_playlist; + PL_ASSERT_LOCKED; + + /* Surprise, we can't actually do more because we + * don't do refcounting, or eauivalent. + * Because item are not only accessed by their id + * using playlist_item outside the PL_LOCK isn't safe. + * Most of the modules does that. + * + * Who wants to add proper memory management? */ uninstall_input_item_observer( p_item ); - - vlc_gc_decref( p_item->p_input ); - free( p_item ); + ARRAY_APPEND( pl_priv(p_playlist)->items_to_delete, p_item); return VLC_SUCCESS; } @@ -215,26 +218,27 @@ int playlist_ItemDelete( playlist_item_t *p_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_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; + PL_ASSERT_LOCKED; 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; } @@ -247,19 +251,19 @@ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, * * 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_DeleteInputInParent( playlist_t *p_playlist, int i_input_id, - playlist_item_t *p_root, bool b_locked ) +int playlist_DeleteFromInputInParent( playlist_t *p_playlist, + input_item_t *p_item, + 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, true ); - if( !b_locked ) PL_UNLOCK; + PL_LOCK_IF( !b_locked ); + i_ret = DeleteFromInput( p_playlist, p_item, p_root, true ); + PL_UNLOCK_IF( !b_locked ); return i_ret; } @@ -268,20 +272,20 @@ int playlist_DeleteInputInParent( playlist_t *p_playlist, int i_input_id, * * 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; - if( !b_locked ) PL_LOCK; - i_ret1 = DeleteFromInput( p_playlist, i_input_id, + PL_LOCK_IF( !b_locked ); + 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 ); - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ? VLC_SUCCESS : VLC_ENOITEM; } @@ -295,10 +299,10 @@ int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id, */ void playlist_Clear( playlist_t * p_playlist, bool b_locked ) { - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); 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; + PL_UNLOCK_IF( !b_locked ); } /** @@ -312,8 +316,8 @@ void playlist_Clear( playlist_t * p_playlist, bool b_locked ) */ int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) { - playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id, - true ); + PL_ASSERT_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 ); } @@ -334,14 +338,14 @@ int playlist_DeleteFromItemId( playlist_t *p_playlist, int i_id ) * 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 ); } /** @@ -355,29 +359,32 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, * 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_ItemNewExt( 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; } /** @@ -399,11 +406,11 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, { 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 ); - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); /* Add to ONELEVEL */ p_item_one = playlist_ItemNewFromInput( p_playlist, p_input ); @@ -421,7 +428,7 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one ); - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return VLC_SUCCESS; } @@ -452,13 +459,10 @@ int playlist_BothAddInput( playlist_t *p_playlist, int i_top; assert( p_input ); - if( !b_locked ) PL_LOCK; - if( !vlc_object_alive( p_playlist ) ) - { - if( !b_locked ) PL_UNLOCK; return VLC_EGENERIC; - } + + PL_LOCK_IF( !b_locked ); /* Add to category */ p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input ); @@ -477,8 +481,8 @@ int playlist_BothAddInput( playlist_t *p_playlist, } 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], @@ -491,7 +495,7 @@ int playlist_BothAddInput( playlist_t *p_playlist, 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; + PL_UNLOCK_IF( !b_locked ); return VLC_SUCCESS; } @@ -520,13 +524,13 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, if( p_playlist->b_die ) return NULL; - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); 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; + PL_UNLOCK_IF( !b_locked ); return p_item; } @@ -546,9 +550,9 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, * \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; @@ -566,24 +570,24 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, * useful for later BothAddInput ) */ - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); /* Fast track the media library, no time to loose */ if( p_item == p_playlist->p_ml_category ) { - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return p_item; } /** \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 ); @@ -596,21 +600,40 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, ChangeToNode( p_playlist, p_item_in_one ); else { - DeleteFromInput( p_playlist, p_item_in_one->p_input->i_id, + playlist_item_t *p_status_item = get_current_status_item( p_playlist ); + playlist_item_t *p_status_node = get_current_status_node( p_playlist ); + if( p_item_in_one == p_status_item ) + { + /* We're deleting the current playlist item. Update + * the playlist object to point at the previous item + * so the playlist won't be restarted */ + playlist_item_t *p_prev_status_item = NULL; + int i = 0; + while( i < p_status_node->i_children && + p_status_node->pp_children[i] != p_status_item ) + { + p_prev_status_item = p_status_node->pp_children[i]; + i++; + } + if( i == p_status_node->i_children ) + p_prev_status_item = NULL; + if( p_prev_status_item ) + set_current_status_item( p_playlist, p_prev_status_item ); + } + 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 ); - if( !b_locked ) PL_UNLOCK; + 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; } else { ChangeToNode( p_playlist, p_item ); - if( !b_locked ) PL_UNLOCK; - return NULL; + PL_UNLOCK_IF( !b_locked ); + return p_item; } } @@ -618,13 +641,13 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, * 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 ) { @@ -632,14 +655,14 @@ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, 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; @@ -664,6 +687,13 @@ static int TreeMove( playlist_t *p_playlist, playlist_item_t *p_item, } REMOVE_ELEM( p_detach->pp_children, p_detach->i_children, j ); + /* If j < i_newpos, we are moving the element from the top to the + * down of the playlist. So when removing the element we have + * to change the position as we loose one element + */ + if( j < 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; @@ -686,6 +716,8 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, 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 ) @@ -699,25 +731,25 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, 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 ) - TreeMove( p_playlist, p_item_onelevel, p_node_onelevel, 0 ); + 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_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 ) @@ -727,8 +759,8 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, } else i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos ); - p_playlist->b_reset_currently_playing = true; - vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); + pl_priv(p_playlist)->b_reset_currently_playing = true; + vlc_cond_signal( &pl_priv(p_playlist)->signal ); return i_ret; } @@ -744,40 +776,21 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, int i_node_id, bool b_signal ) { - vlc_value_t val; - 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; + playlist_private_t *p_sys = pl_priv(p_playlist); + PL_ASSERT_LOCKED; + + p_sys->b_reset_currently_playing = true; if( b_signal ) - vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); - var_Set( p_playlist, "item-append", val ); - free( p_add ); -} + vlc_cond_signal( &p_sys->signal ); -/***************************************************************************** - * Playlist item accessors - *****************************************************************************/ + playlist_add_t add; + add.i_item = i_item_id; + add.i_node = i_node_id; -/** - * 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; + vlc_value_t val; + val.p_address = &add; + + var_Set( p_playlist, "playlist-item-append", val ); } /*************************************************************************** @@ -789,6 +802,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, playlist_item_t *p_item_cat, playlist_item_t *p_item_one ) { + PL_ASSERT_LOCKED; if( (i_mode & PLAYLIST_GO ) ) { playlist_item_t *p_parent = p_item_one; @@ -806,23 +820,23 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, p_parent = p_parent->p_parent; } assert( p_toplay ); - p_playlist->request.b_request = 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_object_signal_maybe( VLC_OBJECT(p_playlist) ); + pl_priv(p_playlist)->request.b_request = true; + 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_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 ); } /* 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 ); @@ -834,6 +848,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, playlist_item_t *p_node, int i_mode, int i_pos ) { + PL_ASSERT_LOCKED; ARRAY_APPEND(p_playlist->items, p_item); ARRAY_APPEND(p_playlist->all_items, p_item); @@ -842,7 +857,7 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, 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 ) ); } @@ -866,14 +881,14 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, { int i; int i_id = p_item->i_id; - bool b_delay_deletion = false; + PL_ASSERT_LOCKED; if( p_item->i_children > -1 ) { 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 ); @@ -885,18 +900,10 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, 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 ) - { - p_playlist->request.i_status = PLAYLIST_STOPPED; - p_playlist->request.b_request = true; - p_playlist->request.p_item = NULL; - msg_Info( p_playlist, "stopping playback" ); - vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); - } - b_delay_deletion = true; + 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 ); @@ -904,13 +911,7 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, /* Remove the item from its parent */ playlist_NodeRemoveItem( p_playlist, p_item, p_item->p_parent ); - 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; - } + playlist_ItemRelease( p_item ); return VLC_SUCCESS; }