playlist_DeleteFromInput: pass the input item rather than its ID

[vlc] / src / playlist / playlist_internal.h

diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index dc682252494d19ad671da23b1f4d15bd31e4162b..6a8d0099c4afd02dcaab83a05b251b38d234e297 100644 (file)
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -59,7 +59,7 @@ typedef struct playlist_private_t
     int                   i_sds;   /**< Number of service discovery modules */
     input_thread_t *      p_input;  /**< the input thread associated
                                      * with the current item */
-    input_ressource_t *   p_input_ressource; /**< input ressources */
+    input_resource_t *   p_input_resource; /**< input resources */
     struct {
         /* Current status. These fields are readonly, only the playlist
          * main loop can touch it*/
@@ -82,12 +82,17 @@ typedef struct playlist_private_t
         vlc_mutex_t         lock;     /**< Lock to protect request */
     } request;
 
+    vlc_thread_t thread; /**< engine thread */
+    vlc_mutex_t lock; /**< dah big playlist global lock */
+    vlc_cond_t signal; /**< wakes up the playlist engine thread */
+
+    int      i_last_playlist_id; /**< Last id to an item */
+    bool     b_reset_currently_playing; /** Reset current item array */
+
     bool     b_tree; /**< Display as a tree */
     bool     b_doing_ml; /**< Doing media library stuff  get quicker */
     bool     b_auto_preparse;
     mtime_t  last_rebuild_date;
-    bool     b_reset_currently_playing; /** Reset current item array */
-    int      i_last_playlist_id; /**< Last id to an item */
 
 } playlist_private_t;
 
@@ -133,10 +138,16 @@ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist,
                                    int i_input_id, playlist_item_t *p_root,
                                    bool );
 
-int playlist_DeleteFromInputInParent( playlist_t *, int, playlist_item_t *, bool );
+int playlist_DeleteFromInputInParent( playlist_t *, input_item_t *,
+                                      playlist_item_t *, bool );
 int playlist_DeleteFromItemId( playlist_t*, int );
 int playlist_ItemRelease( playlist_item_t * );
 
+
+void playlist_NodesPairCreate( playlist_t *, const char *, playlist_item_t **, playlist_item_t **, bool );
+int playlist_NodeEmpty( playlist_t *, playlist_item_t *, bool );
+
+
 /**
  * @}
  */