oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

allow zeroconf to be disabled.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@6467 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Patrik Weiskircher 2007-06-03 18:08:51 +00:00
parent 4025498488
commit d67737bc64
5 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/mpd.conf.5
View File

@ -71,6 +71,9 @@ reports from what address a connection is opened, and when it is closed, and
"verbose" records excessive amounts of information for debugging purposes. The
default is "default".
.TP
.B zeroconf_enabled <yes or no>
Specifies if zeroconf should be enabled or not.
.TP
.B zeroconf_name <name>
If Zerconf is compiled into MPD, this is the service name to publish. This
should be unique to your local network, but name collisions will be properly

4
doc/mpdconf.example
View File

@ -45,6 +45,10 @@ error_file "~/.mpd/mpd.error"
#
#log_level "default"
#
# If Zeroconf support should be enabled.
#
#zeroconf_enabled "yes"
#
# 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.

1
src/conf.c
View File

@ -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);

1
src/conf.h
View File

@ -33,6 +33,7 @@
#define CONF_PORT "port"
#define CONF_LOG_LEVEL "log_level"
#define CONF_ZEROCONF_NAME "zeroconf_name"
#define CONF_ZEROCONF_ENABLED "zeroconf_enabled"
#define CONF_PASSWORD "password"
#define CONF_DEFAULT_PERMS "default_permissions"
#define CONF_AUDIO_OUTPUT "audio_output"

9
src/zeroconf.c
View File

@ -549,6 +549,10 @@ void initZeroconf(void)
{
const char* serviceName = SERVICE_NAME;
ConfigParam *param;
int enabled = getBoolConfigParam(CONF_ZEROCONF_ENABLED);
if (enabled != -1 && enabled != 1)
return;
param = getConfigParam(CONF_ZEROCONF_NAME);
@ -566,6 +570,11 @@ void initZeroconf(void)
void finishZeroconf(void)
{
int enabled = getBoolConfigParam(CONF_ZEROCONF_ENABLED);
if (enabled != -1 && enabled != 1)
return;
#ifdef HAVE_AVAHI
DEBUG( "Avahi: Shutting down interface\n" );
deregisterIO( &zeroConfIo );