[vlc-commits] playlist: remove constant playlist_NodeEmpty() parameter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Nov 16 19:01:13 2016 +0200| [a71f611fa4ea386050276664825879677f3cf21e] | committer: Rémi Denis-Courmont

playlist: remove constant playlist_NodeEmpty() parameter

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

 src/playlist/item.c              | 2 +-
 src/playlist/playlist_internal.h | 2 +-
 src/playlist/tree.c              | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/playlist/item.c b/src/playlist/item.c
index cb02815..e3d1179 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -383,7 +383,7 @@ int playlist_DeleteFromInput( playlist_t *p_playlist, input_item_t *p_input,
 void playlist_Clear( playlist_t * p_playlist, bool b_locked )
 {
     PL_LOCK_IF( !b_locked );
-    playlist_NodeEmpty( p_playlist, p_playlist->p_playing, true );
+    playlist_NodeEmpty( p_playlist, p_playlist->p_playing );
     PL_UNLOCK_IF( !b_locked );
 }
 
diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index 837915f..210fa7b 100644
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -139,7 +139,7 @@ int playlist_DeleteFromInputInParent( playlist_t *, input_item_t *,
 int playlist_DeleteFromItemId( playlist_t*, int );
 void playlist_ItemRelease( playlist_item_t * );
 
-void playlist_NodeEmpty( playlist_t *, playlist_item_t *, bool );
+void playlist_NodeEmpty( playlist_t *, playlist_item_t * );
 
 void ResetCurrentlyPlaying( playlist_t *p_playlist, playlist_item_t *p_cur );
 void ResyncCurrentIndex( playlist_t *p_playlist, playlist_item_t *p_cur );
diff --git a/src/playlist/tree.c b/src/playlist/tree.c
index 8f9d167..a2dbfdf 100644
--- a/src/playlist/tree.c
+++ b/src/playlist/tree.c
@@ -96,10 +96,8 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist,
  *
  * \param p_playlist the playlist
  * \param p_root the node
- * \param b_delete_items do we have to delete the children items ?
  */
-void playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root,
-                        bool b_delete_items )
+void playlist_NodeEmpty( playlist_t *p_playlist, playlist_item_t *p_root )
 {
     PL_ASSERT_LOCKED;
 
@@ -112,9 +110,9 @@ void 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 , false );
+                                 true, false );
         }
-        else if( b_delete_items )
+        else
         {
             /* Delete the item here */
             playlist_DeleteFromItemId( p_playlist,