X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fitem.c;h=a1f1d72c52e39e4b9c304f7e020818d23f0f811b;hb=c00b6cab199aced4b4b748591e18cd70be10f6e8;hp=dee676c86fd75be33a6347679910fd1c94a49bd8;hpb=b1eb791bf65795473a20209854c75e792dbbb037;p=vlc diff --git a/src/playlist/item.c b/src/playlist/item.c index dee676c86f..a1f1d72c52 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -161,7 +161,9 @@ 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 ); @@ -181,21 +183,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 ***************************************************************************/ @@ -357,7 +344,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 ); } /** @@ -371,20 +358,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_item_NewExt( p_playlist, psz_uri, psz_name, - i_options, ppsz_options, + i_options, ppsz_options, i_option_flags, i_duration ); i_ret = playlist_AddInput( p_playlist, p_input, i_mode, i_pos, b_playlist, @@ -633,7 +622,7 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist, p_playlist->p_root_onelevel, false ); } pl_priv(p_playlist)->b_reset_currently_playing = true; - vlc_object_signal_unlocked( p_playlist ); + 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 ); @@ -698,7 +687,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 ) @@ -770,7 +759,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; } @@ -798,33 +787,12 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, val.p_address = p_add; pl_priv(p_playlist)->b_reset_currently_playing = true; if( b_signal ) - vlc_object_signal_unlocked( 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 ***************************************************************************/ @@ -858,7 +826,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, 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_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 ); @@ -868,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 ); @@ -941,7 +909,7 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item, 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) ); + vlc_cond_signal( &pl_priv(p_playlist)->signal ); } }