diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-06-16 02:48:07 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-06-16 02:48:07 +0000 |
| commit | 2444f5d41a3ccefdf14f5336430ef46baf976626 (patch) | |
| tree | ee147c111fea3c7f808fd2f27a4dc55500d7d013 /src/conf.c | |
| parent | ac74ef1fde5859aabcffe6ec6c57100cb680d89f (diff) | |
| download | mpd-2444f5d41a3ccefdf14f5336430ef46baf976626.tar.gz mpd-2444f5d41a3ccefdf14f5336430ef46baf976626.tar.xz mpd-2444f5d41a3ccefdf14f5336430ef46baf976626.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/conf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/conf.c b/src/conf.c index 15d95a78b..307d85dfd 100644 --- a/src/conf.c +++ b/src/conf.c @@ -145,6 +145,7 @@ void initConf(void) registerConfigParam(CONF_PORT, 0, 0); registerConfigParam(CONF_LOG_LEVEL, 0, 0); registerConfigParam(CONF_ZEROCONF_NAME, 0, 0); + registerConfigParam(CONF_ZEROCONF_ENABLED, 0, 0); registerConfigParam(CONF_PASSWORD, 1, 0); registerConfigParam(CONF_DEFAULT_PERMS, 0, 0); registerConfigParam(CONF_AUDIO_OUTPUT, 1, 1); |