Avoid a potential segfault as vlc_object_create can fail.

[vlc] / src / playlist / playlist_internal.h

diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index 03f61c63482f2d6b8e05ad8aaa15930113ddae13..94ab3f687247ea1eb6521a9d95bc62fa170c98fe 100644 (file)
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -2,7 +2,7 @@
  * playlist_internal.h : Functions for use by the playlist
  *****************************************************************************
  * Copyright (C) 1999-2004 the VideoLAN team
- * $Id: vlc_playlist.h 16505 2006-09-03 21:53:38Z zorglub $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Clément Stenac <zorglub@videolan.org>
@@ -22,6 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifndef __LIBVLC_PLAYLIST_INTERNAL_H
+# define __LIBVLC_PLAYLIST_INTERNAL_H 1
+
 /**
  *  \file
  *  This file contain internal structures and function prototypes related
@@ -31,6 +34,8 @@
  * @{
  */
 
+#include "input/input_internal.h"
+
 struct playlist_preparse_t
 {
     VLC_COMMON_MEMBERS
@@ -39,19 +44,13 @@ 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;
+    input_item_t    **pp_waiting;
 
     DECL_ARRAY(playlist_album_t) albums;
 };
@@ -60,6 +59,11 @@ struct playlist_fetcher_t
  * 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 * );
@@ -70,7 +74,7 @@ void playlist_LastLoop( playlist_t * );
 void playlist_PreparseLoop( playlist_preparse_t * );
 void playlist_FetcherLoop( playlist_fetcher_t * );
 
-void ResetCurrentlyPlaying( playlist_t *, vlc_bool_t, playlist_item_t * );
+void ResetCurrentlyPlaying( playlist_t *, bool, playlist_item_t * );
 
 /* Control */
 playlist_item_t * playlist_NextItem  ( playlist_t * );
@@ -84,7 +88,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, bool b_signal );
 
 /* Tree walking */
 int playlist_GetAllEnabledChildren( playlist_t *p_playlist,
@@ -92,21 +97,26 @@ int playlist_GetAllEnabledChildren( playlist_t *p_playlist,
                                     playlist_item_t ***ppp_items );
 playlist_item_t *playlist_GetNextLeaf( playlist_t *p_playlist,
                                     playlist_item_t *p_root,
-                                    playlist_item_t *, vlc_bool_t, vlc_bool_t );
+                                    playlist_item_t *, bool, bool );
 playlist_item_t *playlist_GetPrevLeaf( playlist_t *p_playlist,
                                     playlist_item_t *p_root,
-                                    playlist_item_t *, vlc_bool_t, vlc_bool_t );
+                                    playlist_item_t *, bool, bool );
 playlist_item_t *playlist_GetLastLeaf( playlist_t *p_playlist,
                                     playlist_item_t *p_root );
 
+playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist,
+                                   int i_input_id, playlist_item_t *p_root,
+                                   bool );
+
 int playlist_DeleteFromItemId( playlist_t*, int );
+int playlist_ItemDelete ( playlist_item_t * );
 
 /**
  * @}
  */
 
 #define PLAYLIST_DEBUG 1
-//#undef PLAYLIST_DEBUG
+//#undef PLAYLIST_DEBUG2
 
 #ifdef PLAYLIST_DEBUG
  #define PL_DEBUG( msg, args... ) msg_Dbg( p_playlist, msg, ## args )
@@ -121,3 +131,4 @@ int playlist_DeleteFromItemId( playlist_t*, int );
 #endif
 
 #define PLI_NAME( p ) p && p->p_input ? p->p_input->psz_name : "null"
+#endif /* !__LIBVLC_PLAYLIST_INTERNAL_H */