X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=4f8b2cdd723669a95535f10f8a59d34cc8e0ce57;hb=6bbc4b9934ba00f6495672a660927e91e904e1b9;hp=3eeda3eb77e6ffbcfc09471dfd6cd3c92bac5cd5;hpb=6b843acc086616c8df89f2805029fd81f75c4cac;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index 3eeda3eb77..4f8b2cdd72 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) *****************************************************************************/ @@ -86,7 +88,7 @@ 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 = ItemToNode( p_playlist, p_item_in_category, pl_Locked ); p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST; } @@ -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 ); } /***************************************************************************** @@ -183,21 +185,6 @@ 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_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 ***************************************************************************/ @@ -231,12 +218,12 @@ int playlist_ItemRelease( 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; @@ -244,14 +231,14 @@ static int DeleteFromInput( playlist_t *p_playlist, int i_input_id, 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; } @@ -264,18 +251,18 @@ 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_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; } @@ -285,18 +272,18 @@ int playlist_DeleteFromInputInParent( 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; 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 ) ? @@ -330,8 +317,7 @@ void playlist_Clear( playlist_t * p_playlist, bool b_locked ) 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 ); } @@ -352,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 ); } /** @@ -373,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_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; } /** @@ -561,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; @@ -631,13 +620,12 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, 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_object_signal_unlocked( p_playlist ); - var_SetInteger( p_playlist, "item-change", p_item_in_category-> - p_input->i_id ); + 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; } @@ -700,7 +688,7 @@ 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 change have + * down of the playlist. So when removing the element we have * to change the position as we loose one element */ if( j < i_newpos ) @@ -772,7 +760,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 ); pl_priv(p_playlist)->b_reset_currently_playing = true; - vlc_object_signal_unlocked( p_playlist ); + vlc_cond_signal( &pl_priv(p_playlist)->signal ); return i_ret; } @@ -788,22 +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_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_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; + + vlc_value_t val; + val.p_address = &add; + + var_Set( p_playlist, "playlist-item-append", val ); } /*************************************************************************** @@ -837,9 +824,9 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, 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 ); @@ -849,7 +836,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, ( 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 ); @@ -901,7 +888,7 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, 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 ); @@ -913,17 +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 ) - { - 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_unlocked( VLC_OBJECT(p_playlist) ); - } + 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 );