* wx : simplify some code, remove some useless duplications

[vlc] / src / playlist / view.c

diff --git a/src/playlist/view.c b/src/playlist/view.c
index 71554547bfbc1ebab7476b216854743ad24a0011..49bb08199d00cb69f887be241e8fe8df02149f0a 100644 (file)
--- a/src/playlist/view.c
+++ b/src/playlist/view.c
@@ -54,11 +54,6 @@ playlist_item_t *playlist_RecursiveFindPrev( playlist_t *p_playlist,
 void playlist_NodeDump( playlist_t *p_playlist, playlist_item_t *p_item,
                         int i_level );
 
-int playlist_NodeDeleteInternal( playlist_t *p_playlist,
-                                 playlist_item_t *p_root,
-                                 vlc_bool_t b_delete_items, vlc_bool_t b_force );
-
-
 /**********************************************************************
  * Exported View management functions
  **********************************************************************/
@@ -127,8 +122,7 @@ int playlist_ViewInsert( playlist_t *p_playlist, int i_id, char *psz_name )
  */
 int playlist_ViewDelete( playlist_t *p_playlist,playlist_view_t *p_view )
 {
-    playlist_NodeDeleteInternal( p_playlist, p_view->p_root, VLC_TRUE,
-                                 VLC_TRUE );
+    playlist_NodeDelete( p_playlist, p_view->p_root, VLC_TRUE, VLC_TRUE );
     REMOVE_ELEM( p_playlist->pp_views, p_playlist->i_views, 0 );
     return VLC_SUCCESS;
 }
@@ -338,7 +332,7 @@ int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root,
         if( p_root->pp_children[i]->i_children > -1 )
         {
             playlist_NodeDelete( p_playlist, p_root->pp_children[i],
-                                 b_delete_items );
+                                 b_delete_items , VLC_FALSE );
         }
         else if( b_delete_items )
         {
@@ -358,15 +352,7 @@ int playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root,
  * \return VLC_SUCCESS or an error
  */
 int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
-                         vlc_bool_t b_delete_items )
-{
-    return playlist_NodeDeleteInternal( p_playlist, p_root,
-                                        b_delete_items, VLC_FALSE );
-}
-
-int playlist_NodeDeleteInternal( playlist_t *p_playlist,
-                                 playlist_item_t *p_root,
-                                 vlc_bool_t b_delete_items, vlc_bool_t b_force )
+                         vlc_bool_t b_delete_items, vlc_bool_t b_force )
 {
     int i;
     if( p_root->i_children == -1 )
@@ -380,7 +366,7 @@ int playlist_NodeDeleteInternal( playlist_t *p_playlist,
         if( p_root->pp_children[i]->i_children > -1 )
         {
             playlist_NodeDelete( p_playlist, p_root->pp_children[i],
-                                b_delete_items );
+                                b_delete_items , b_force );
         }
         else if( b_delete_items )
         {
@@ -406,7 +392,6 @@ int playlist_NodeDeleteInternal( playlist_t *p_playlist,
 }
 
 
-
 /**
  * Adds an item to the childs of a node
  *