vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun May 14 12:54:40 2017 +0300| [630160db855df31c929a7722e1b5cbabda8e55c0] | committer: Rémi Denis-Courmont
playlist: remove unused argument > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=630160db855df31c929a7722e1b5cbabda8e55c0 --- src/playlist/item.c | 2 +- src/playlist/playlist_internal.h | 3 +-- src/playlist/tree.c | 8 ++------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/playlist/item.c b/src/playlist/item.c index 00153fa284..1f03e72dde 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -753,7 +753,7 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, PL_ASSERT_LOCKED; ARRAY_APPEND(p_playlist->items, p_item); - playlist_NodeInsert( p_playlist, p_item, p_node, i_pos ); + playlist_NodeInsert( p_node, p_item, i_pos ); playlist_SendAddNotify( p_playlist, p_item ); } diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h index 8d0daa4352..b3d589aef3 100644 --- a/src/playlist/playlist_internal.h +++ b/src/playlist/playlist_internal.h @@ -124,8 +124,7 @@ int playlist_InsertInputItemTree ( playlist_t *, playlist_item_t *, input_item_node_t *, int, bool ); /* Tree walking */ -int playlist_NodeInsert(playlist_t *, playlist_item_t*, playlist_item_t *, - int); +int playlist_NodeInsert(playlist_item_t*, playlist_item_t *, int); void playlist_ItemRelease( playlist_t *, playlist_item_t * ); diff --git a/src/playlist/tree.c b/src/playlist/tree.c index dc129292ce..a50c620a49 100644 --- a/src/playlist/tree.c +++ b/src/playlist/tree.c @@ -77,7 +77,7 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, p_item->i_children = 0; if( p_parent != NULL ) - playlist_NodeInsert( p_playlist, p_item, p_parent, i_pos ); + playlist_NodeInsert( p_parent, p_item, i_pos ); playlist_SendAddNotify( p_playlist, p_item ); p_item->i_flags |= i_flags; @@ -150,13 +150,9 @@ void playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root, playlist_ItemRelease( p_playlist, p_root ); } -int playlist_NodeInsert( playlist_t *p_playlist, - playlist_item_t *p_item, - playlist_item_t *p_parent, +int playlist_NodeInsert( playlist_item_t *p_parent, playlist_item_t *p_item, int i_position ) { - PL_ASSERT_LOCKED; - (void)p_playlist; assert( p_parent && p_parent->i_children != -1 ); if( i_position == -1 ) i_position = p_parent->i_children ; assert( i_position <= p_parent->i_children); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
