Use the new API in playlist macros

[vlc] / include / vlc_playlist.h

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 6ecce99988fd3c9e4ec16c0b6ec3543817117058..4796f82585123202c48e5bfb8c7fbc8f87458a83 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -176,6 +176,8 @@ struct services_discovery_t
 struct playlist_t
 {
     VLC_COMMON_MEMBERS
+    struct playlist_internal_t * p_internal; /**< Internal members */
+
     int                   i_enabled; /**< How many items are enabled ? */
 
     playlist_item_array_t items; /**< Arrays of items */
@@ -192,9 +194,6 @@ struct playlist_t
     int                   i_last_playlist_id; /**< Last id to an item */
     int                   i_last_input_id ; /**< Last id on an input */
 
-    services_discovery_t **pp_sds; /**< Loaded service discovery modules */
-    int                   i_sds;   /**< Number of service discovery modules */
-
     /* Predefined items */
     playlist_item_t *     p_root_category; /**< Root of category tree */
     playlist_item_t *     p_root_onelevel; /**< Root of onelevel tree */
@@ -276,8 +275,8 @@ struct playlist_add_t
  *****************************************************************************/
 
 /* Helpers */
-#define PL_LOCK vlc_mutex_lock( &p_playlist->object_lock );
-#define PL_UNLOCK vlc_mutex_unlock( &p_playlist->object_lock );
+#define PL_LOCK vlc_object_lock( p_playlist );
+#define PL_UNLOCK vlc_object_unlock( p_playlist );
 
 #define pl_Get( a ) a->p_libvlc->p_playlist
 #define pl_Yield( a ) __pl_Yield( VLC_OBJECT(a) )
@@ -367,6 +366,7 @@ VLC_EXPORT( playlist_item_t *, __playlist_ItemNewFromInput, ( vlc_object_t *p_ob
 
 /*************************** Item deletion **************************/
 VLC_EXPORT( int,  playlist_DeleteFromInput, ( playlist_t *, int, vlc_bool_t ) );
+VLC_EXPORT( int,  playlist_DeleteInputInParent, ( playlist_t *, int, playlist_item_t *, vlc_bool_t ) );
 
 /*************************** Item fields accessors **************************/
 VLC_EXPORT( int, playlist_ItemSetName, (playlist_item_t *, const char * ) );
@@ -408,24 +408,26 @@ VLC_EXPORT( int, playlist_NodeDelete, ( playlist_t *, playlist_item_t *, vlc_boo
 VLC_EXPORT( int, playlist_NodeEmpty, ( playlist_t *, playlist_item_t *, vlc_bool_t ) );
 VLC_EXPORT( void, playlist_NodesPairCreate, (playlist_t *, const char *, playlist_item_t **, playlist_item_t **, vlc_bool_t ) );
 VLC_EXPORT( playlist_item_t *, playlist_GetPreferredNode, ( playlist_t *p_playlist, playlist_item_t *p_node ) );
-VLC_EXPORT( playlist_item_t *, playlist_GetNextLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, vlc_bool_t b_ena, vlc_bool_t b_unplayed ) ); 
-VLC_EXPORT( playlist_item_t *, playlist_GetPrevLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, vlc_bool_t b_ena, vlc_bool_t b_unplayed ) ); 
+VLC_EXPORT( playlist_item_t *, playlist_GetNextLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, vlc_bool_t b_ena, vlc_bool_t b_unplayed ) );
+VLC_EXPORT( playlist_item_t *, playlist_GetPrevLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, vlc_bool_t b_ena, vlc_bool_t b_unplayed ) );
 VLC_EXPORT( playlist_item_t *, playlist_GetLastLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root ) );
 
 /***********************************************************************
  * Service Discovery
  ***********************************************************************/
-/* XXX: no need to inline */
-/* XXX: no need to inline */
-/* Return the number of services_discovery available */
+
+/* Get the services discovery modules names to use in Create(), in a null
+ * terminated string array. Array and string must be freed after use. */
+VLC_EXPORT( char **, services_discovery_GetServicesNames, ( vlc_object_t * p_super ) );
 
 /* Creation of a service_discovery object */
 VLC_EXPORT( services_discovery_t *, services_discovery_Create, ( vlc_object_t * p_super, const char * psz_service_name ) );
 VLC_EXPORT( void,                   services_discovery_Destroy, ( services_discovery_t * p_this ) );
 VLC_EXPORT( int,                    services_discovery_Start, ( services_discovery_t * p_this ) );
+VLC_EXPORT( void,                   services_discovery_Stop, ( services_discovery_t * p_this ) );
 
 /* Read info from discovery object */
-VLC_EXPORT( const char *,           services_discovery_GetLocalizedName, ( services_discovery_t * p_this ) );
+VLC_EXPORT( char *,                 services_discovery_GetLocalizedName, ( services_discovery_t * p_this ) );
 
 /* Receive event notification (prefered way to get new items) */
 VLC_EXPORT( vlc_event_manager_t *,  services_discovery_EventManager, ( services_discovery_t * p_this ) );
@@ -466,7 +468,7 @@ static inline int playlist_Import( playlist_t *p_playlist, const char *psz_file)
 static inline void playlist_Signal( playlist_t *p_playlist )
 {
     PL_LOCK;
-    vlc_cond_signal( &p_playlist->object_wait );
+    vlc_object_signal( p_playlist );
     PL_UNLOCK;
 }