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

output/jack: added option "client_name"

Browse Source 
Instead of using MPD's audio output name (setting "name"), use a
separate configuration option.  Change the default to "Music Player
Daemon".
This commit is contained in:
Max Kellermann 2009-11-05 19:55:00 +01:00
parent 4ec25b5d64
commit 88abfc0d0f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

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

5
doc/mpd.conf.5
View File

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

5
src/output/jack_output_plugin.c
View File

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