From: Pierre d'Herbemont <pdherbemont@videolan.org>
Date: Sat, 19 Jul 2008 09:16:32 +0000 (+0200)
Subject: playlist: playlist_DeleteInputInParent->playlist_DeleteFromInputInParent to match... 
X-Git-Tag: 0.9.0-test3~374
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=587f46a9b50b6bee11c83d9afa471a7fc8fe90d6;p=vlc

playlist: playlist_DeleteInputInParent->playlist_DeleteFromInputInParent to match playlist_DeleteFromInput.
---

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 37f3290dcf..2510ab7c79 100644
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -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 * ) );
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 3d888f22a3..39df257e2b 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -246,7 +246,7 @@ playlist_Clear
 playlist_Control
 playlist_CurrentInput
 playlist_DeleteFromInput
-playlist_DeleteInputInParent
+playlist_DeleteFromInputInParent
 playlist_Export
 playlist_GetLastLeaf
 playlist_GetNextLeaf
diff --git a/src/playlist/item.c b/src/playlist/item.c
index c4e9cac55f..d131d45985 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -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 );
diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index 4eecba32c0..d6f1ddcbcd 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -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 );
 }