Skip to content

M
mpd
Commit 88abfc0d authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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".
parent 4ec25b5d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
NEWS
View file @ 88abfc0d
...@@ -34,6 +34,7 @@ ver 0.16 (20??/??/??) ...@@ -34,6 +34,7 @@ ver 0.16 (20??/??/??)
- pulse: connect to server on MPD startup, implement pause - pulse: connect to server on MPD startup, implement pause
- jack: don't disconnect during pause - jack: don't disconnect during pause
- jack: connect to server on MPD startup - jack: connect to server on MPD startup
- jack: added option "client_name"
- wildcards allowed in audio_format configuration - wildcards allowed in audio_format configuration
- alsa: don't recover on CANCEL - alsa: don't recover on CANCEL
- consistently lock audio output objects - consistently lock audio output objects
......
doc/mpd.conf.5
View file @ 88abfc0d
...@@ -348,13 +348,12 @@ after another until it successfully establishes a connection. ...@@ -348,13 +348,12 @@ after another until it successfully establishes a connection.
.TP .TP
.B sink <sink> .B sink <sink>
The sink to output to. The default is to let PulseAudio choose a 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 .TP
.B name <name> .B client_name <name>
The client name to use when connecting to JACK. The output ports <name>:left 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, and <name>:right will also be created for the left and right channels,
respectively. respectively.
.SH OPTIONAL JACK OUTPUT PARAMETERS
.TP .TP
.B ports <left_port,right_port> .B ports <left_port,right_port>
This specifies the left and right ports to connect to for the left and right This specifies the left and right ports to connect to for the left and right
......
src/output/jack_output_plugin.c
View file @ 88abfc0d
...@@ -212,9 +212,8 @@ mpd_jack_init(G_GNUC_UNUSED const struct audio_format *audio_format, ...@@ -212,9 +212,8 @@ mpd_jack_init(G_GNUC_UNUSED const struct audio_format *audio_format,
const char *value; const char *value;
jd = g_new(struct jack_data, 1); jd = g_new(struct jack_data, 1);
jd->name = config_get_block_string(param, "name", "mpd_jack"); jd->name = config_get_block_string(param, "client_name",
"Music Player Daemon");
g_debug("mpd_jack_init (pid=%d)", getpid());
value = config_get_block_string(param, "ports", NULL); value = config_get_block_string(param, "ports", NULL);
if (value != NULL) { if (value != NULL) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment