From 2444f5d41a3ccefdf14f5336430ef46baf976626 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 16 Jun 2008 02:48:07 +0000 Subject: Backport Bonjour support from trunk Thanks to Qball, pat, and jat :) ------------------------------------------------------------------------ r6477 | jat | 2007-06-04 19:41:18 +0200 (Mo, 04 Jun 2007) | 4 lines Don't initialize zeroconf until after we've daemonized and log output has been redirected. This prevents zeroconf from blocking daemonization, and makes sure any errors get sent to the logs and not stdout. ------------------------------------------------------------------------ r6474 | jat | 2007-06-03 22:09:12 +0200 (So, 03 Jun 2007) | 3 lines Adding ChangeLog entry for zeroconf_enabled, adding Zeroconf section to mpdconf.example, and updating the zeroconf_* docs. ------------------------------------------------------------------------ r6471 | jat | 2007-06-03 21:44:19 +0200 (So, 03 Jun 2007) | 4 lines Define HAVE_ZEROCONF if Avahi or Bonjour support is enabled, so that we can silence a warning about an unused variable without using stupid checks for HAVE_AVAHI || HAVE_BONJOUR. ------------------------------------------------------------------------ r6467 | pat | 2007-06-03 20:08:51 +0200 (So, 03 Jun 2007) | 2 lines allow zeroconf to be disabled. ------------------------------------------------------------------------ r6464 | jat | 2007-06-03 02:03:20 +0200 (So, 03 Jun 2007) | 2 lines Cleaning up zeroconf configure magic. ------------------------------------------------------------------------ r6463 | jat | 2007-06-03 00:58:51 +0200 (So, 03 Jun 2007) | 2 lines Check if we need -ldns_sd for Bonjour. ------------------------------------------------------------------------ r6462 | jat | 2007-06-03 00:52:53 +0200 (So, 03 Jun 2007) | 2 lines Adding a missing include. ------------------------------------------------------------------------ r6453 | pat | 2007-06-02 19:06:08 +0200 (Sa, 02 Jun 2007) | 3 lines Added Bonjour zeroconf support. This works now natively on MacOS X. I couldn't test mDNSResponder support on Linux, as Debian doesn't include it - but should work as well. git-svn-id: https://svn.musicpd.org/mpd/branches/branch-0.13.0-fixes@7381 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- doc/mpdconf.example | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'doc/mpdconf.example') diff --git a/doc/mpdconf.example b/doc/mpdconf.example index 8cd367541..aff3db430 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -45,9 +45,17 @@ error_file "~/.mpd/mpd.error" # #log_level "default" # -# If Zeroconf is configured, the service name to publish. This -# should be unique on your local network, but name collisions -# will be taken care of for you. +################################################################ + + +########################### ZEROCONF ########################### +# +# If yes, service information will be published with Zeroconf. +# +#zeroconf_enabled "yes" +# +# The service name to publish. This name should be unique on +# your local network. # #zeroconf_name "Music Player" # -- cgit v1.2.3