From 7efba6b3d2d1e21645ca1737f8ab78fd8eb62d5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 16 May 2009 13:53:43 +0300 Subject: [PATCH] playlist_ItemGetByInputId: remove dead code playlist_ItemGetByInput can be used instead anyway --- include/vlc_playlist.h | 1 - src/libvlccore.sym | 1 - src/playlist/search.c | 32 -------------------------------- 3 files changed, 34 deletions(-) diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index fc2b808986..c92c274d2f 100644 --- a/include/vlc_playlist.h +++ b/include/vlc_playlist.h @@ -333,7 +333,6 @@ VLC_EXPORT( int, playlist_BothAddInput, ( playlist_t *, input_item_t *,playlist_ /********************************** Item search *************************/ VLC_EXPORT( playlist_item_t *, playlist_ItemGetById, (playlist_t *, int ) ); VLC_EXPORT( playlist_item_t *, playlist_ItemGetByInput, (playlist_t *,input_item_t * ) ); -VLC_EXPORT( playlist_item_t *, playlist_ItemGetByInputId, (playlist_t *, int, playlist_item_t *) ); VLC_EXPORT( int, playlist_LiveSearchUpdate, (playlist_t *, playlist_item_t *, const char *) ); diff --git a/src/libvlccore.sym b/src/libvlccore.sym index e2216fce54..45c6bf3a00 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -301,7 +301,6 @@ playlist_Import playlist_IsServicesDiscoveryLoaded playlist_ItemGetById playlist_ItemGetByInput -playlist_ItemGetByInputId playlist_LiveSearchUpdate playlist_Lock playlist_NodeAppend diff --git a/src/playlist/search.c b/src/playlist/search.c index 66bd3ad092..262138f8b2 100644 --- a/src/playlist/search.c +++ b/src/playlist/search.c @@ -80,38 +80,6 @@ playlist_item_t* playlist_ItemGetByInput( playlist_t * p_playlist, } -/** - * Get input by item id - * - * Find the playlist item matching the input id under the given node - * \param p_playlist the playlist - * \param i_input_id the id of the input to find - * \param p_root the root node of the search - * \return the playlist item or NULL on failure - */ -playlist_item_t * playlist_ItemGetByInputId( playlist_t *p_playlist, - int i_input_id, - playlist_item_t *p_root ) -{ - int i; - PL_ASSERT_LOCKED; - assert( p_root != NULL ); - for( i = 0 ; i< p_root->i_children ; i++ ) - { - if( p_root->pp_children[i]->p_input && - p_root->pp_children[i]->p_input->i_id == i_input_id ) - { - return p_root->pp_children[i]; - } - else if( p_root->pp_children[i]->i_children >= 0 ) - { - return playlist_ItemGetByInputId( p_playlist, i_input_id, - p_root->pp_children[i] ); - } - } - return NULL; -} - /*************************************************************************** * Live search handling ***************************************************************************/ -- 2.39.2