X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=cf98e589ea9d33063356e97d53dc9757c0094e26;hb=fdb91a064e0291b5d69124008ec52c9d57f3fa77;hp=fa146759ff00941c5b063134a58714d6a45fb7d0;hpb=0e7a548e6e2d4e6adbdcb5f963cca635ac2a96f8;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index fa146759ff..cf98e589ea 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -80,25 +80,26 @@ static void input_item_subitem_added( const vlc_event_t * p_event, return; } - b_play = b_play && p_item_in_category == p_playlist->status.p_item; + b_play = b_play && + p_item_in_category == get_current_status_item( p_playlist ); /* 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, 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 ); } } @@ -114,8 +115,7 @@ static void input_item_changed( const vlc_event_t * p_event, { (void)p_event; playlist_item_t * p_item = user_data; - var_SetInteger( p_item->p_playlist, - "item-change", p_item->i_id ); + var_SetInteger( p_item->p_playlist, "item-change", p_item->i_id ); } /***************************************************************************** @@ -123,59 +123,45 @@ static void input_item_changed( const vlc_event_t * p_event, *****************************************************************************/ static void install_input_item_observer( playlist_item_t * p_item ) { - vlc_event_attach( &p_item->p_input->event_manager, - vlc_InputItemSubItemAdded, - input_item_subitem_added, - p_item ); - vlc_event_attach( &p_item->p_input->event_manager, - vlc_InputItemDurationChanged, - input_item_changed, - p_item ); - vlc_event_attach( &p_item->p_input->event_manager, - vlc_InputItemMetaChanged, - input_item_changed, - p_item ); + vlc_event_manager_t * p_em = &p_item->p_input->event_manager; + vlc_event_attach( p_em, vlc_InputItemSubItemAdded, + input_item_subitem_added, p_item ); + vlc_event_attach( p_em, vlc_InputItemDurationChanged, + input_item_changed, p_item ); + vlc_event_attach( p_em, vlc_InputItemMetaChanged, + input_item_changed, p_item ); + vlc_event_attach( p_em, vlc_InputItemNameChanged, + 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 ) { - vlc_event_detach( &p_item->p_input->event_manager, - vlc_InputItemMetaChanged, - input_item_changed, - p_item ); - vlc_event_detach( &p_item->p_input->event_manager, - vlc_InputItemDurationChanged, - input_item_changed, - p_item ); - vlc_event_detach( &p_item->p_input->event_manager, - vlc_InputItemSubItemAdded, - input_item_subitem_added, - p_item ); + vlc_event_manager_t * p_em = &p_item->p_input->event_manager; + vlc_event_detach( p_em, vlc_InputItemSubItemAdded, + input_item_subitem_added, p_item ); + vlc_event_detach( p_em, vlc_InputItemMetaChanged, + input_item_changed, p_item ); + vlc_event_detach( p_em, vlc_InputItemDurationChanged, + input_item_changed, p_item ); + vlc_event_detach( p_em, vlc_InputItemNameChanged, + 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 ); } /***************************************************************************** * Playlist item creation *****************************************************************************/ -playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj, - 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( p_obj, psz_uri, - psz_name, i_options, ppsz_options, - i_duration, i_type ); - return playlist_ItemNewFromInput( p_obj, p_input ); -} - -playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj, +playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist, input_item_t *p_input ) { DECMALLOC_NULL( p_item, playlist_item_t ); - playlist_t *p_playlist = pl_Yield( p_obj ); p_item->p_input = p_input; vlc_gc_incref( p_item->p_input ); @@ -190,28 +176,44 @@ playlist_item_t *__playlist_ItemNewFromInput( vlc_object_t *p_obj, install_input_item_observer( p_item ); - pl_Release( p_item->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 ) { - uninstall_input_item_observer( p_item ); - - vlc_gc_decref( p_item->p_input ); - free( p_item ); + /* 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? */ + ARRAY_APPEND( p_item->p_playlist->items_to_delete, p_item); return VLC_SUCCESS; } @@ -257,14 +259,14 @@ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, * \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, int i_input_id, + playlist_item_t *p_root, bool b_locked ) { int i_ret; - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); i_ret = DeleteFromInput( p_playlist, i_input_id, p_root, true ); - if( !b_locked ) PL_UNLOCK; + PL_UNLOCK_IF( !b_locked ); return i_ret; } @@ -281,12 +283,12 @@ int playlist_DeleteFromInput( playlist_t *p_playlist, int i_input_id, bool b_locked ) { int i_ret1, i_ret2; - if( !b_locked ) PL_LOCK; + PL_LOCK_IF( !b_locked ); i_ret1 = DeleteFromInput( p_playlist, i_input_id, p_playlist->p_root_category, true ); i_ret2 = DeleteFromInput( p_playlist, i_input_id, 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; } @@ -300,10 +302,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 ); } /** @@ -318,7 +320,7 @@ 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_Locked ); if( !p_item ) return VLC_EGENERIC; return DeleteInner( p_playlist, p_item, true ); } @@ -378,7 +380,7 @@ 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 ); - int i_id = i_ret == VLC_SUCCESS ? p_input->i_id : -1; + int i_id = (i_ret == VLC_SUCCESS) ? p_input->i_id : -1; vlc_gc_decref( p_input ); @@ -408,7 +410,7 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, 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 ); @@ -426,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; } @@ -456,8 +458,11 @@ int playlist_BothAddInput( playlist_t *p_playlist, 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; + + if( !vlc_object_alive( p_playlist ) ) + return VLC_EGENERIC; + + PL_LOCK_IF( !b_locked ); /* Add to category */ p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input ); @@ -490,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; } @@ -519,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; } @@ -565,11 +570,11 @@ 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; } @@ -599,17 +604,17 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, p_playlist->p_root_onelevel, false ); } p_playlist->b_reset_currently_playing = true; - vlc_cond_signal( &p_playlist->object_wait ); + 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_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; } } @@ -727,7 +732,7 @@ 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_cond_signal( &p_playlist->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); return i_ret; } @@ -753,7 +758,7 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, val.p_address = p_add; p_playlist->b_reset_currently_playing = true; if( b_signal ) - vlc_cond_signal( &p_playlist->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); var_Set( p_playlist, "item-append", val ); free( p_add ); } @@ -811,7 +816,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, if( p_playlist->p_input ) input_StopThread( p_playlist->p_input ); p_playlist->request.i_status = PLAYLIST_RUNNING; - vlc_cond_signal( &p_playlist->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); } /* Preparse if PREPARSE or SPREPARSE & not enough meta */ char *psz_artist = input_item_GetArtist( p_item_cat->p_input ); @@ -865,7 +870,6 @@ 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; if( p_item->i_children > -1 ) { @@ -884,7 +888,7 @@ 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( p_playlist->status.p_item == p_item ) + if( get_current_status_item( p_playlist ) == p_item ) { /* Hack we don't call playlist_Control for lock reasons */ if( b_stop ) @@ -893,9 +897,8 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, 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 ); + vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); } - b_delay_deletion = true; } PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name ); @@ -903,13 +906,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; }