playlist: playlist_DeleteInputInParent->playlist_DeleteFromInputInParent to match...

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 37f3290dcf2be33db67475b2aba6d392cc5a7509..2510ab7c79f8c8cc4ea6387a7150f4b5fd717502 100644 (file)
--- 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 3d888f22a382f996eaef0b5a1972889b74caa320..39df257e2b768d97782f7639346dc64516355a8e 100644 (file)
--- 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 c4e9cac55f4c0f280b3ac2526ad64a7db27e2a4d..d131d45985f75ae0dc28b7f86fad0505f22471da 100644 (file)
--- 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 4eecba32c0d54ff8936756cc921bb5cf8830ba92..d6f1ddcbcdd505e8ff11ec5559896c41ec35f3bb 100644 (file)
--- 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 );
 }