X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_services_discovery.h;h=92c7d19aad77f4ac1e5c270943013795cd83efc4;hb=6903d514d3ea8113f91b1bedde862607f7efc92a;hp=b2eb0a586dcf128f4e174f6483a5b989c4ee67d7;hpb=07c7cdcb2194cc5aa12b906f1489c9c4a76ef473;p=vlc diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h index b2eb0a586d..92c7d19aad 100644 --- a/include/vlc_services_discovery.h +++ b/include/vlc_services_discovery.h @@ -21,10 +21,6 @@ * 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_ @@ -36,11 +32,8 @@ extern "C" { * @{ */ -#include #include #include -#include -#include struct services_discovery_t { @@ -62,7 +55,9 @@ struct services_discovery_t /* 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 ) ); @@ -73,7 +68,7 @@ VLC_EXPORT( void, services_discovery_Stop, ( services_discover /* 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 */