X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fplaylist_internal.h;h=3d390e0fdb3b386e46a9622baad3ed0496072811;hb=89e0f5225631ceb9051b0ec9879f4b1ff324af94;hp=aed7edf04419d72b7688ae870684ca5894c971ba;hpb=c5746ee26ca344047dbb9f963a2e39483f85da4c;p=vlc

diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index aed7edf044..3d390e0fdb 100644
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -41,6 +41,8 @@
 #include "fetcher.h"
 #include "preparser.h"
 
+typedef struct vlc_sd_internal_t vlc_sd_internal_t;
+
 typedef struct playlist_private_t
 {
     playlist_t           public_data;
@@ -50,12 +52,7 @@ typedef struct playlist_private_t
     playlist_item_array_t items_to_delete; /**< Array of items and nodes to
             delete... At the very end. This sucks. */
 
-    struct playlist_services_discovery_support_t {
-        /* the playlist items for category and onelevel */
-        playlist_item_t*    p_cat;
-        playlist_item_t*    p_one;
-        services_discovery_t * p_sd; /**< Loaded service discovery modules */
-    } ** pp_sds;
+    vlc_sd_internal_t   **pp_sds;
     int                   i_sds;   /**< Number of service discovery modules */
     input_thread_t *      p_input;  /**< the input thread associated
                                      * with the current item */
@@ -83,6 +80,7 @@ typedef struct playlist_private_t
     } 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 */
@@ -134,10 +132,11 @@ playlist_item_t * playlist_NodeAddInput( playlist_t *, input_item_t *,
 
 /* Tree walking */
 playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist,
-                                   int i_input_id, playlist_item_t *p_root,
-                                   bool );
+                                input_item_t *p_input, 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 * );