playlist: b_auto_preparse is private.

[vlc] / include / vlc_services_discovery.h

diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h
index b2eb0a586dcf128f4e174f6483a5b989c4ee67d7..e6778af30ed58d9da94e3be8065d242d3a1c0c4e 100644 (file)
--- a/include/vlc_services_discovery.h
+++ b/include/vlc_services_discovery.h
@@ -21,12 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
+#ifndef VLC_SERVICES_DISCOVERY_H_
+#define VLC_SERVICES_DISCOVERY_H_
 
-#ifndef _VLC_SERVICES_DISCOVERY_H_
-#define _VLC_SERVICES_DISCOVERY_H_
+/**
+ * \file
+ * This file functions and structures for service discovery in vlc
+ */
 
 # ifdef __cplusplus
 extern "C" {
@@ -36,11 +37,8 @@ extern "C" {
  * @{
  */
 
-#include <assert.h>
 #include <vlc_input.h>
 #include <vlc_events.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 struct services_discovery_t
 {
@@ -52,28 +50,39 @@ struct services_discovery_t
     vlc_event_manager_t event_manager;      /* Accessed through Setters for non class function */
 
     services_discovery_sys_t *p_sys;
-    void (*pf_run) ( services_discovery_t *);
 };
 
-
 /***********************************************************************
  * Service Discovery
  ***********************************************************************/
 
 /* 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, char ***pppsz_longnames ) );
+VLC_EXPORT( char **, __services_discovery_GetServicesNames, ( vlc_object_t * p_super, char ***pppsz_longnames ) );
+#define services_discovery_GetServicesNames(a,b) \
+        __services_discovery_GetServicesNames(VLC_OBJECT(a),b)
 
 /* 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( bool,                   services_discovery_Start, ( services_discovery_t * p_this ) );
 VLC_EXPORT( void,                   services_discovery_Stop, ( services_discovery_t * p_this ) );
 
+static inline void services_discovery_CreateAndStart( vlc_object_t * p_super, const char * psz_service_name )
+{
+    services_discovery_t * sd = services_discovery_Create( p_super, psz_service_name );
+    services_discovery_Start( sd );
+}
+
+static inline void services_discovery_StopAndRelease( services_discovery_t * p_this )
+{
+    services_discovery_Stop( p_this );
+    vlc_object_release( p_this );
+}
+
 /* Read info from discovery object */
 VLC_EXPORT( char *,                 services_discovery_GetLocalizedName, ( services_discovery_t * p_this ) );
 
-/* Receive event notification (prefered way to get new items) */
+/* Receive event notification (preferred way to get new items) */
 VLC_EXPORT( vlc_event_manager_t *,  services_discovery_EventManager, ( services_discovery_t * p_this ) );
 
 /* Used by services_discovery to post update about their items */