[vlc-commits] Rename bonjour module to avahi
Jean-Baptiste Kempf
git at videolan.org
Sat Feb 6 11:41:42 CET 2016
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Feb 6 11:24:59 2016 +0100| [55280fa62cb68b71767778c56250352b4840b69a] | committer: Jean-Baptiste Kempf
Rename bonjour module to avahi
Bonjour is an implementation, trademarked by Apple, of Zeroconf
protocol, which avahi is a (slightly) different implementation.
Zeroconf protocol is mostly mdns + dns-sd
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=55280fa62cb68b71767778c56250352b4840b69a
---
configure.ac | 4 ++--
modules/MODULES_LIST | 2 +-
modules/services_discovery/Makefile.am | 12 ++++++------
modules/services_discovery/{bonjour.c => avahi.c} | 14 +++++++-------
po/POTFILES.in | 2 +-
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index 20c581c..7605cf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4012,8 +4012,8 @@ AS_IF([test "${enable_vsxu}" != "no"],
EXTEND_HELP_STRING([Service Discovery plugins:])
dnl
-dnl Bonjour services discovery
-PKG_ENABLE_MODULES_VLC([BONJOUR], [], [avahi-client >= 0.6], [Bonjour services discovery], [auto])
+dnl Avahi-Zeroconf services discovery
+PKG_ENABLE_MODULES_VLC([AVAHI], [], [avahi-client >= 0.6], [Zeroconf services discovery], [auto])
dnl
dnl libudev services discovery
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 53a5a9b..2afbcae 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -54,6 +54,7 @@ $Id$
* audioscrobbler: AudioScrobbler/Last.fm submission plugin
* audiounit_ios: AudioUnit output plugin for iOS
* auhal: Audio output for Mac OS X based on the AUHAL API
+ * avahi: Zeroconf services discovery
* avcapture: AVFoundation based video capture module
* avcodec: libavcodec audio/video decoder
* avformat: libavformat demuxer
@@ -64,7 +65,6 @@ $Id$
* blend: a picture filter that blends two pictures
* blendbench: a picture filter that test performance of blending routines
* bluescreen: Bluescreen (weather channel like) video filter
- * bonjour: Zeroconf services discovery
* bpg: BPG image decoder using libbpg
* caca: color ASCII art video output using libcaca
* cache_block: block stream caching stream filter
diff --git a/modules/services_discovery/Makefile.am b/modules/services_discovery/Makefile.am
index 6e69217..e72a558 100644
--- a/modules/services_discovery/Makefile.am
+++ b/modules/services_discovery/Makefile.am
@@ -13,12 +13,12 @@ libsap_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_sap)
libsap_plugin_la_LIBADD = $(LIBS_sap) $(SOCKET_LIBS)
sd_LTLIBRARIES += libsap_plugin.la
-libbonjour_plugin_la_SOURCES = services_discovery/bonjour.c
-libbonjour_plugin_la_CFLAGS = $(AM_CFLAGS) $(BONJOUR_CFLAGS)
-libbonjour_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'
-libbonjour_plugin_la_LIBADD = $(BONJOUR_LIBS)
-EXTRA_LTLIBRARIES += libbonjour_plugin.la
-sd_LTLIBRARIES += $(LTLIBbonjour)
+libavahi_plugin_la_SOURCES = services_discovery/avahi.c
+libavahi_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
+libavahi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'
+libavahi_plugin_la_LIBADD = $(AVAHI_LIBS)
+EXTRA_LTLIBRARIES += libavahi_plugin.la
+sd_LTLIBRARIES += $(LTLIBavahi)
libmtp_plugin_la_SOURCES = services_discovery/mtp.c
libmtp_plugin_la_CFLAGS = $(AM_CFLAGS) $(MTP_CFLAGS)
diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/avahi.c
similarity index 97%
rename from modules/services_discovery/bonjour.c
rename to modules/services_discovery/avahi.c
index bc234b4..8e2579b 100644
--- a/modules/services_discovery/bonjour.c
+++ b/modules/services_discovery/avahi.c
@@ -1,5 +1,5 @@
/*****************************************************************************
- * bonjour.c: Bonjour services discovery module
+ * avahi.c: Bonjour services discovery module
*****************************************************************************
* Copyright (C) 2005-2009 the VideoLAN team
* $Id$
@@ -46,14 +46,14 @@
*****************************************************************************/
/* Callbacks */
- static int Open ( vlc_object_t * );
- static void Close( vlc_object_t * );
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
-VLC_SD_PROBE_HELPER("bonjour", "Bonjour services", SD_CAT_LAN)
+VLC_SD_PROBE_HELPER("avahi", "Zeroconf network services", SD_CAT_LAN)
vlc_module_begin ()
- set_shortname( "Bonjour" )
- set_description( N_("Bonjour services") )
+ set_shortname( "Avahi" )
+ set_description( N_("Zeroconf services") )
set_category( CAT_PLAYLIST )
set_subcategory( SUBCAT_PLAYLIST_SD )
set_capability( "services_discovery", 0 )
@@ -115,7 +115,7 @@ static void resolve_callback(
{
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);
VLC_UNUSED(flags);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1cbafff..68b7f49 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1013,7 +1013,7 @@ modules/packetizer/mpeg4audio.c
modules/packetizer/mpeg4video.c
modules/packetizer/mpegvideo.c
modules/packetizer/vc1.c
-modules/services_discovery/bonjour.c
+modules/services_discovery/avahi.c
modules/services_discovery/mediadirs.c
modules/services_discovery/mtp.c
modules/services_discovery/os2drive.c
More information about the vlc-commits
mailing list