aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-11-05 19:55:00 +0100
committerMax Kellermann <max@duempel.org>2009-11-05 19:55:00 +0100
commit88abfc0d0fb5cb876888aa2efca41593d0aa1ad0 (patch)
tree05e81560aaab2b35ab3ba81d6fb1b6d7ec0e08b6
parent4ec25b5d64bca0f13f5b914b8f50f1f0eb4e7662 (diff)
downloadmpd-88abfc0d0fb5cb876888aa2efca41593d0aa1ad0.tar.gz
mpd-88abfc0d0fb5cb876888aa2efca41593d0aa1ad0.tar.xz
mpd-88abfc0d0fb5cb876888aa2efca41593d0aa1ad0.zip
output/jack: added option "client_name"
Instead of using MPD's audio output name (setting "name"), use a separate configuration option. Change the default to "Music Player Daemon".
-rw-r--r--NEWS1
-rw-r--r--doc/mpd.conf.55
-rw-r--r--src/output/jack_output_plugin.c5
3 files changed, 5 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 7ce105884..004b0b2e5 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,7 @@ ver 0.16 (20??/??/??)
- pulse: connect to server on MPD startup, implement pause
- jack: don't disconnect during pause
- jack: connect to server on MPD startup
+ - jack: added option "client_name"
- wildcards allowed in audio_format configuration
- alsa: don't recover on CANCEL
- consistently lock audio output objects
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index c64dfb94c..a5c0304cf 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -348,13 +348,12 @@ after another until it successfully establishes a connection.
.TP
.B sink <sink>
The sink to output to. The default is to let PulseAudio choose a sink.
-.SH REQUIRED JACK OUTPUT PARAMETERS
+.SH OPTIONAL JACK OUTPUT PARAMETERS
.TP
-.B name <name>
+.B client_name <name>
The client name to use when connecting to JACK. The output ports <name>:left
and <name>:right will also be created for the left and right channels,
respectively.
-.SH OPTIONAL JACK OUTPUT PARAMETERS
.TP
.B ports <left_port,right_port>
This specifies the left and right ports to connect to for the left and right
diff --git a/src/output/jack_output_plugin.c b/src/output/jack_output_plugin.c
index fba921e04..3d38a9d2d 100644
--- a/src/output/jack_output_plugin.c
+++ b/src/output/jack_output_plugin.c
@@ -212,9 +212,8 @@ mpd_jack_init(G_GNUC_UNUSED const struct audio_format *audio_format,
const char *value;
jd = g_new(struct jack_data, 1);
- jd->name = config_get_block_string(param, "name", "mpd_jack");
-
- g_debug("mpd_jack_init (pid=%d)", getpid());
+ jd->name = config_get_block_string(param, "client_name",
+ "Music Player Daemon");
value = config_get_block_string(param, "ports", NULL);
if (value != NULL) {