#include <vlc_arrays.h>
#include <avahi-client/client.h>
-#ifdef HAVE_AVAHI_06
-# include <avahi-client/publish.h>
-# include <avahi-client/lookup.h>
-#endif
+#include <avahi-client/publish.h>
+#include <avahi-client/lookup.h>
#include <avahi-common/thread-watch.h>
#include <avahi-common/malloc.h>
#include <avahi-common/error.h>
* Local prototypes
*****************************************************************************/
-/* Main functions */
- static void Run ( services_discovery_t *p_intf );
-
/*****************************************************************************
* client_callback
*****************************************************************************/
services_discovery_t *p_sd = ( services_discovery_t* )userdata;
services_discovery_sys_t *p_sys = p_sd->p_sys;
-#ifdef HAVE_AVAHI_06
if( state == AVAHI_CLIENT_FAILURE &&
(avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED) )
-#else
- if( state == AVAHI_CLIENT_DISCONNECTED )
-#endif
{
msg_Err( p_sd, "avahi client disconnected" );
avahi_threaded_poll_quit( p_sys->poll );
const AvahiAddress *address,
uint16_t port,
AvahiStringList *txt,
-#ifdef HAVE_AVAHI_06
AvahiLookupResultFlags flags,
-#endif
void* userdata )
{
services_discovery_t *p_sd = ( services_discovery_t* )userdata;
services_discovery_sys_t *p_sys = p_sd->p_sys;
VLC_UNUSED(interface); VLC_UNUSED(host_name);
-#ifdef HAVE_AVAHI_06
VLC_UNUSED(flags);
-#endif
-#ifdef HAVE_AVAHI_06
if( event == AVAHI_RESOLVER_FAILURE )
-#else
- if( event == AVAHI_RESOLVER_TIMEOUT )
-#endif
{
msg_Err( p_sd,
"failed to resolve service '%s' of type '%s' in domain '%s'",
const char *name,
const char *type,
const char *domain,
-#ifdef HAVE_AVAHI_06
AvahiLookupResultFlags flags,
-#endif
void* userdata )
{
VLC_UNUSED(b);
-#ifdef HAVE_AVAHI_06
VLC_UNUSED(flags);
-#endif
services_discovery_t *p_sd = ( services_discovery_t* )userdata;
services_discovery_sys_t *p_sys = p_sd->p_sys;
if( event == AVAHI_BROWSER_NEW )
{
if( avahi_service_resolver_new( p_sys->client, interface, protocol,
name, type, domain, AVAHI_PROTO_UNSPEC,
-#ifdef HAVE_AVAHI_06
0,
-#endif
resolve_callback, userdata ) == NULL )
{
msg_Err( p_sd, "failed to resolve service '%s': %s", name,
}
p_sys->client = avahi_client_new( avahi_threaded_poll_get(p_sys->poll),
-#ifdef HAVE_AVAHI_06
- 0,
-#endif
- client_callback, p_sd, &err );
+ 0, client_callback, p_sd, &err );
if( p_sys->client == NULL )
{
msg_Err( p_sd, "failed to create avahi client: %s",
p_sys->sb = avahi_service_browser_new( p_sys->client, AVAHI_IF_UNSPEC,
AVAHI_PROTO_UNSPEC,
"_vlc-http._tcp", NULL,
-#ifdef HAVE_AVAHI_06
- 0,
-#endif
- browse_callback, p_sd );
+ 0, browse_callback, p_sd );
if( p_sys->sb == NULL )
{
msg_Err( p_sd, "failed to create avahi service browser" );