Removes trailing spaces. Removes tabs.

[vlc] / src / playlist / tree.c

diff --git a/src/playlist/tree.c b/src/playlist/tree.c
index fe4f70abe7ec529d302052f303b31b07bb04d0ce..3f9b4262170c02dc64d2de164fd003f7f6a1e022 100644 (file)
--- a/src/playlist/tree.c
+++ b/src/playlist/tree.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * tree.c : Playlist tree walking functions
  *****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright (C) 1999-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -22,7 +22,6 @@
  *****************************************************************************/
 #include <vlc/vlc.h>
 #include <assert.h>
-#include <vlc/input.h>
 #include "vlc_playlist.h"
 #include "playlist_internal.h"
 
@@ -47,10 +46,12 @@ playlist_item_t *GetPrevItem( playlist_t *p_playlist,
  * \param p_playlist the playlist
  * \paam psz_name the name of the node
  * \param p_parent the parent node to attach to or NULL if no attach
+ * \param p_flags miscellaneous flags
  * \return the new node
  */
-playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, const char *psz_name,
-                                       playlist_item_t *p_parent )
+playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist,
+                                       const char *psz_name,
+                                       playlist_item_t *p_parent, int i_flags )
 {
     input_item_t *p_input;
     playlist_item_t *p_item;
@@ -68,9 +69,9 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, const char *psz_n
 
     if( p_parent != NULL )
         playlist_NodeAppend( p_playlist, p_item, p_parent );
-
     playlist_SendAddNotify( p_playlist, p_item->i_id,
-                            p_parent ? p_parent->i_id : -1 );
+                            p_parent ? p_parent->i_id : -1,
+                            !( i_flags & PLAYLIST_NO_REBUILD ));
     return p_item;
 }
 
@@ -150,7 +151,7 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
     else
     {
         int i;
-        var_SetInteger( p_playlist, "item-deleted", p_root->p_input->i_id );
+        var_SetInteger( p_playlist, "item-deleted", p_root->i_id );
         ARRAY_BSEARCH( p_playlist->all_items, ->p_input->i_id, int,
                        p_root->p_input->i_id, i );
         if( i != -1 )
@@ -186,6 +187,7 @@ int playlist_NodeInsert( playlist_t *p_playlist,
                          playlist_item_t *p_parent,
                          int i_position )
 {
+   (void)p_playlist;
    assert( p_parent && p_parent->i_children != -1 );
    if( i_position == -1 ) i_position = p_parent->i_children ;
 
@@ -209,8 +211,9 @@ int playlist_NodeRemoveItem( playlist_t *p_playlist,
                         playlist_item_t *p_item,
                         playlist_item_t *p_parent )
 {
-   int i;
-   for( i= 0; i< p_parent->i_children ; i++ )
+   (void)p_playlist;
+
+   for(int i= 0; i< p_parent->i_children ; i++ )
    {
        if( p_parent->pp_children[i] == p_item )
        {
@@ -291,9 +294,9 @@ void playlist_NodesPairCreate( playlist_t *p_playlist, const char *psz_name,
                                vlc_bool_t b_for_sd )
 {
     *pp_node_cat = playlist_NodeCreate( p_playlist, psz_name,
-                                        p_playlist->p_root_category );
+                                        p_playlist->p_root_category, 0 );
     *pp_node_one = playlist_NodeCreate( p_playlist, psz_name,
-                                        p_playlist->p_root_onelevel );
+                                        p_playlist->p_root_onelevel, 0 );
     (*pp_node_one)->p_input->i_id = (*pp_node_cat)->p_input->i_id;
     if( b_for_sd )
     {
@@ -306,7 +309,7 @@ void playlist_NodesPairCreate( playlist_t *p_playlist, const char *psz_name,
 
 /**
  * Get the node in the preferred tree from a node in one of category
- * or onelevel tree. 
+ * or onelevel tree.
  * For example, for the SAP node, it will return the node in the category
  * tree if --playlist-tree is not set to never, because the SAP node prefers
  * category
@@ -525,6 +528,8 @@ playlist_item_t *GetNextUncle( playlist_t *p_playlist, playlist_item_t *p_item,
     playlist_item_t *p_grandparent;
     vlc_bool_t b_found = VLC_FALSE;
 
+    (void)p_playlist;
+
     if( p_parent != NULL )
     {
         p_grandparent = p_parent->p_parent;
@@ -569,6 +574,8 @@ playlist_item_t *GetPrevUncle( playlist_t *p_playlist, playlist_item_t *p_item,
     playlist_item_t *p_grandparent;
     vlc_bool_t b_found = VLC_FALSE;
 
+    (void)p_playlist;
+
     if( p_parent != NULL )
     {
         p_grandparent = p_parent->p_parent;