Drop prehistoric avahi versions support

configure.ac

@@ -5220,17 +5220,16 @@ dnl  Bonjour services discovery
 dnl
 AC_ARG_ENABLE(bonjour,
   [  --enable-bonjour        Bonjour services discovery (default enabled)])
-if test "${enable_bonjour}" != "no"
-then
-  PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.3,
-    [PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.6,
-       [AC_DEFINE(HAVE_AVAHI_06, 1, [Define if you have avahi-client 0.6 or greater])],)
-      AC_DEFINE(HAVE_AVAHI_CLIENT, 1, [Define if you have the avahi-client library])
+AS_IF([test "${enable_bonjour}" != "no"], [
+  PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.6, [
+    AC_DEFINE(HAVE_AVAHI_CLIENT, 1, [Define to 1 if you have libavahi-client])
     VLC_ADD_LIBS([bonjour access_output_http],[$BONJOUR_LIBS])
     VLC_ADD_CFLAGS([bonjour access_output_http],[$BONJOUR_CFLAGS])
-      VLC_ADD_PLUGIN([bonjour]) ],
-    [AC_MSG_WARN(avahi-client library not found)])
-fi
+    VLC_ADD_PLUGIN([bonjour])
+  ], [
+    AC_MSG_WARN(avahi-client library not found)
+  ])
+])
 
 dnl
 dnl  Lirc plugin

modules/services_discovery/bonjour.c

@@ -35,10 +35,8 @@
 #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>
@@ -77,7 +75,7 @@ struct services_discovery_sys_t
  *****************************************************************************/
 
 /* Main functions */
-    static void Run    ( services_discovery_t *p_intf );
+static void Run    ( services_discovery_t *p_intf );
 
 /*****************************************************************************
  * client_callback
@@ -88,12 +86,8 @@ static void client_callback( AvahiClient *c, AvahiClientState state,
     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 );
@@ -115,24 +109,16 @@ static void resolve_callback(
     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'",
@@ -217,24 +203,18 @@ static void browse_callback(
     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,
@@ -287,10 +267,7 @@ static int Open( vlc_object_t *p_this )
     }
 
     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",
@@ -301,10 +278,7 @@ static int Open( vlc_object_t *p_this )
     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" );