Compiler warnings rampage

[vlc] / src / playlist / playlist_internal.h

diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index e9304a1710802645de318b48fc0c24791de3a9b6..e82b677ee5eb31d54ff736fafc16c4e7657c5e78 100644 (file)
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -31,6 +31,8 @@
  * @{
  */
 
+#include "input/input_internal.h"
+
 struct playlist_preparse_t
 {
     VLC_COMMON_MEMBERS
@@ -39,11 +41,32 @@ struct playlist_preparse_t
     input_item_t  **pp_waiting;
 };
 
+typedef struct preparse_item_t
+{
+    input_item_t *p_item;
+    vlc_bool_t   b_fetch_art;
+} preparse_item_t;
+
+struct playlist_fetcher_t
+{
+    VLC_COMMON_MEMBERS
+    vlc_mutex_t     lock;
+    int             i_art_policy;
+    int             i_waiting;
+    preparse_item_t *p_waiting;
+
+    DECL_ARRAY(playlist_album_t) albums;
+};
 
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
 
+/* Global thread */
+#define playlist_ThreadCreate(a) __playlist_ThreadCreate(VLC_OBJECT(a))
+void        __playlist_ThreadCreate   ( vlc_object_t * );
+int           playlist_ThreadDestroy  ( playlist_t * );
+
 /* Creation/Deletion */
 playlist_t *playlist_Create   ( vlc_object_t * );
 void        playlist_Destroy  ( playlist_t * );
@@ -52,7 +75,9 @@ void        playlist_Destroy  ( playlist_t * );
 void playlist_MainLoop( playlist_t * );
 void playlist_LastLoop( playlist_t * );
 void playlist_PreparseLoop( playlist_preparse_t * );
-void playlist_SecondaryPreparseLoop( playlist_preparse_t * );
+void playlist_FetcherLoop( playlist_fetcher_t * );
+
+void ResetCurrentlyPlaying( playlist_t *, vlc_bool_t, playlist_item_t * );
 
 /* Control */
 playlist_item_t * playlist_NextItem  ( playlist_t * );
@@ -66,7 +91,8 @@ int playlist_MLDump( playlist_t *p_playlist );
  * Item management
  **********************************************************************/
 
-void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, int i_node_id );
+void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
+                             int i_node_id, vlc_bool_t b_signal );
 
 /* Tree walking */
 int playlist_GetAllEnabledChildren( playlist_t *p_playlist,
@@ -81,16 +107,26 @@ playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist,
 playlist_item_t *playlist_GetLastLeaf( playlist_t *p_playlist,
                                     playlist_item_t *p_root );
 
+int playlist_DeleteFromItemId( playlist_t*, int );
+int playlist_ItemDelete ( playlist_item_t * );
+
 /**
  * @}
  */
 
 #define PLAYLIST_DEBUG 1
+//#undef PLAYLIST_DEBUG2
 
 #ifdef PLAYLIST_DEBUG
-#define PL_DEBUG( msg, args... ) msg_Dbg( p_playlist, msg, ## args )
+ #define PL_DEBUG( msg, args... ) msg_Dbg( p_playlist, msg, ## args )
+ #ifdef PLAYLIST_DEBUG2
+  #define PL_DEBUG2( msg, args... ) msg_Dbg( p_playlist, msg, ## args )
+ #else
+  #define PL_DEBUG2( msg, args... ) {}
+ #endif
 #else
-#define PL_DEBUG( msg, args ... ) {}
+ #define PL_DEBUG( msg, args ... ) {}
+ #define PL_DEBUG2( msg, args... ) {}
 #endif
 
-#define PLI_NAME( p ) p ? p->p_input->psz_name : "null"
+#define PLI_NAME( p ) p && p->p_input ? p->p_input->psz_name : "null"