Commit 587f46a9 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

playlist: playlist_DeleteInputInParent->playlist_DeleteFromInputInParent to...

playlist: playlist_DeleteInputInParent->playlist_DeleteFromInputInParent to match playlist_DeleteFromInput.
parent 3734ddc9
......@@ -360,7 +360,7 @@ VLC_EXPORT( playlist_item_t* , playlist_ItemNewWithType, ( playlist_t *,const ch
/*************************** Item deletion **************************/
VLC_EXPORT( int, playlist_DeleteFromInput, ( playlist_t *, int, bool ) );
VLC_EXPORT( int, playlist_DeleteInputInParent, ( playlist_t *, int, playlist_item_t *, bool ) );
VLC_EXPORT( int, playlist_DeleteFromInputInParent, ( playlist_t *, int, playlist_item_t *, bool ) );
/*************************** Item fields accessors **************************/
VLC_EXPORT( int, playlist_ItemSetName, (playlist_item_t *, const char * ) );
......
......@@ -246,7 +246,7 @@ playlist_Clear
playlist_Control
playlist_CurrentInput
playlist_DeleteFromInput
playlist_DeleteInputInParent
playlist_DeleteFromInputInParent
playlist_Export
playlist_GetLastLeaf
playlist_GetNextLeaf
......
......@@ -252,8 +252,8 @@ 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;
PL_LOCK_IF( !b_locked );
......
......@@ -268,8 +268,8 @@ static void playlist_sd_item_removed( const vlc_event_t * p_event, void * user_d
}
/* Delete the non-node item normally */
playlist_DeleteInputInParent( p_parent->p_playlist, p_input->i_id,
p_parent, true );
playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input->i_id,
p_parent, true );
vlc_object_unlock( p_parent->p_playlist );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment