vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun May 14 12:58:35 2017 +0300| [db349e3226afe9ffdf7e96484226755dae57b811] | committer: Rémi Denis-Courmont
playlist: inline one function > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=db349e3226afe9ffdf7e96484226755dae57b811 --- src/playlist/item.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/playlist/item.c b/src/playlist/item.c index 1f03e72dde..692cb1d073 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -36,8 +36,6 @@ #include <vlc_rand.h> #include "playlist_internal.h" -static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, - playlist_item_t *p_node, int i_pos ); static void GoAndPreparse( playlist_t *p_playlist, int i_mode, playlist_item_t * ); static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ); @@ -519,11 +517,15 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *p_playlist, assert( p_parent && p_parent->i_children != -1 ); playlist_item_t *p_item = playlist_ItemNewFromInput( p_playlist, p_input ); - if( likely(p_item != NULL) ) - { - AddItem( p_playlist, p_item, p_parent, i_pos ); - GoAndPreparse( p_playlist, i_mode, p_item ); - } + if( unlikely(p_item == NULL) ) + return NULL; + + ARRAY_APPEND(p_playlist->items, p_item); + + playlist_NodeInsert( p_parent, p_item, i_pos ); + playlist_SendAddNotify( p_playlist, p_item ); + + GoAndPreparse( p_playlist, i_mode, p_item ); return p_item; } @@ -746,17 +748,6 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, free( psz_album ); } -/* Add the playlist item to the requested node and fire a notification */ -static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, - playlist_item_t *p_node, int i_pos ) -{ - PL_ASSERT_LOCKED; - ARRAY_APPEND(p_playlist->items, p_item); - - playlist_NodeInsert( p_node, p_item, i_pos ); - playlist_SendAddNotify( p_playlist, p_item ); -} - /* Actually convert an item to a node */ static void ChangeToNode( playlist_t *p_playlist, playlist_item_t *p_item ) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
