[vlc-commits] playlist: remove playlist_DeleteFromInput()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Nov 17 00:03:45 2016 +0200| [286b556dbca0d54c4b6d528662699b1e1f00743d] | committer: Rémi Denis-Courmont

playlist: remove playlist_DeleteFromInput()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=286b556dbca0d54c4b6d528662699b1e1f00743d
---

 include/vlc_playlist.h |  6 +-----
 src/libvlccore.sym     |  1 -
 src/playlist/item.c    | 30 ------------------------------
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 6a421d6..521c0ad 100644
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -95,8 +95,7 @@ struct intf_thread_t;
  * You can create nodes with playlist_NodeCreate and can create items from
  * existing input items to be placed under any node with playlist_NodeAddInput.
  *
- * To delete an item, use playlist_DeleteFromInput( p_item ) which will
- * remove all occurrences of the input.
+ * To delete an item, use playlist_NodeDelete( p_item ).
  *
  *
  * The playlist defines the following event variables:
@@ -329,9 +328,6 @@ VLC_API int playlist_ServicesDiscoveryControl( playlist_t *, const char *, int,
  * Item management
  ********************************************************/
 
-/*************************** Item deletion **************************/
-VLC_API int playlist_DeleteFromInput( playlist_t *, input_item_t *, bool );
-
 /******************** Item addition ********************/
 VLC_API int playlist_Add( playlist_t *, const char *, const char *, int, int, bool );
 VLC_API int playlist_AddExt( playlist_t *, const char *, const char *, int, int, mtime_t, int, const char *const *, unsigned, bool );
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index bd8e024..d322841 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -340,7 +340,6 @@ playlist_CurrentInput
 playlist_CurrentInputLocked
 playlist_CurrentPlayingItem
 playlist_Deactivate
-playlist_DeleteFromInput
 playlist_Export
 playlist_GetNodeDuration
 playlist_Import
diff --git a/src/playlist/item.c b/src/playlist/item.c
index 1058a2e..4caaa34 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -314,36 +314,6 @@ void playlist_ItemRelease( playlist_item_t *p_item )
 }
 
 /**
- * Delete from input
- *
- * Search anywhere in playlist for an an input item and delete it
- * \param p_playlist playlist object
- * \param p_input the input to delete
- * \param b_locked TRUE if the playlist is locked
- * \return VLC_SUCCESS or VLC_ENOITEM
- */
-int playlist_DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input,
-                              bool b_locked )
-{
-    playlist_item_t *p_item;
-    int i_ret;
-
-    PL_LOCK_IF( !b_locked );
-    p_item = playlist_ItemFindFromInputAndRoot( p_playlist, p_input,
-                                                p_playlist->p_root );
-    if( p_item != NULL )
-    {
-        playlist_NodeDelete( p_playlist, p_item, false );
-        i_ret = VLC_SUCCESS;
-    }
-    else
-        i_ret = VLC_ENOITEM;
-    PL_UNLOCK_IF( !b_locked );
-
-    return i_ret;
-}
-
-/**
  * Clear the playlist
  *
  * \param p_playlist playlist object