X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=29142f536be40f65b75a0c710898233295f9804d;hb=7e4419bcc6ed629cd9a06863965260b96b9cb1fa;hp=d131d45985f75ae0dc28b7f86fad0505f22471da;hpb=587f46a9b50b6bee11c83d9afa471a7fc8fe90d6;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index d131d45985..29142f536b 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -87,19 +87,19 @@ static void input_item_subitem_added( const vlc_event_t * p_event, 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 ); } } @@ -134,6 +134,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 +151,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 +161,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 +183,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; } @@ -224,6 +225,7 @@ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, 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 && @@ -312,8 +314,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 ); } @@ -341,7 +343,7 @@ int playlist_Add( playlist_t *p_playlist, const char *psz_uri, 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,20 +357,22 @@ 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 */ 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, + input_item_t *p_input = input_item_NewExt( p_playlist, psz_uri, psz_name, + i_options, ppsz_options, i_option_flags, i_duration ); i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist, @@ -399,7 +403,7 @@ 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 ); @@ -593,11 +597,31 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, ChangeToNode( p_playlist, p_item_in_one ); else { + 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->i_id, p_playlist->p_root_onelevel, false ); } - p_playlist->b_reset_currently_playing = true; - vlc_object_signal_unlocked( p_playlist ); + 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 ); PL_UNLOCK_IF( !b_locked ); @@ -607,7 +631,7 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, { ChangeToNode( p_playlist, p_item ); PL_UNLOCK_IF( !b_locked ); - return NULL; + return p_item; } } @@ -661,6 +685,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; @@ -683,6 +714,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 ) @@ -704,7 +737,7 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item, 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; @@ -724,8 +757,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; } @@ -742,6 +775,8 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, int i_node_id, bool b_signal ) { vlc_value_t val; + PL_ASSERT_LOCKED; + playlist_add_t *p_add = (playlist_add_t *)malloc( sizeof( playlist_add_t) ); if( !p_add ) return; @@ -749,34 +784,14 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, 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; + pl_priv(p_playlist)->b_reset_currently_playing = true; if( b_signal ) - vlc_object_signal_maybe( VLC_OBJECT(p_playlist) ); + vlc_cond_signal( &pl_priv(p_playlist)->signal ); + var_Set( p_playlist, "item-append", val ); free( p_add ); } -/***************************************************************************** - * Playlist item accessors - *****************************************************************************/ - -/** - * 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; -} - /*************************************************************************** * The following functions are local ***************************************************************************/ @@ -786,6 +801,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; @@ -803,23 +819,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_StopThread( pl_priv(p_playlist)->p_input ); + 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 ); @@ -831,6 +847,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); @@ -839,7 +856,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 ) ); } @@ -863,13 +880,13 @@ 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; + pl_priv(p_playlist)->b_reset_currently_playing = true; var_SetInteger( p_playlist, "item-deleted", i_id ); /* Remove the item from the bank */ @@ -887,13 +904,12 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, /* 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; + 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_object_signal_maybe( VLC_OBJECT(p_playlist) ); + vlc_cond_signal( &pl_priv(p_playlist)->signal ); } - b_delay_deletion = true; } PL_DEBUG( "deleting item `%s'", p_item->p_input->psz_name ); @@ -901,13 +917,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; }