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

output/jack: renamed "output ports" to "destination ports"

Browse Source 
Use the same name as in the libjack API documentation.
This commit is contained in:
Max Kellermann 2009-11-06 01:35:19 +01:00
parent 8cb9f9b070
commit dbbead6e72
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/user.xml
View File

@ -762,7 +762,7 @@ cd mpd-version</programlisting>
<parameter>A,B</parameter> <parameter>A,B</parameter>
</entry> </entry>
<entry> <entry>
The name of the JACK source ports created by MPD. The names of the JACK destination ports to connect to.
</entry> </entry>
</row> </row>
<row> <row>

38
src/output/jack_output_plugin.c
View File

@ -51,7 +51,9 @@ struct jack_data {
const char *name; const char *name;
/* configuration */ /* configuration */
char *output_ports[2];
char *destination_ports[2];
size_t ringbuffer_size; size_t ringbuffer_size;
/* the current audio format */ /* the current audio format */
@ -247,13 +249,13 @@ mpd_jack_init(G_GNUC_UNUSED const struct audio_format *audio_format,
return NULL; return NULL;
} }
jd->output_ports[0] = ports[0]; jd->destination_ports[0] = ports[0];
jd->output_ports[1] = ports[1]; jd->destination_ports[1] = ports[1];
g_free(ports); g_free(ports);
} else { } else {
jd->output_ports[0] = NULL; jd->destination_ports[0] = NULL;
jd->output_ports[1] = NULL; jd->destination_ports[1] = NULL;
} }
jd->ringbuffer_size = jd->ringbuffer_size =
@ -273,8 +275,8 @@ mpd_jack_finish(void *data)
{ {
struct jack_data *jd = data; struct jack_data *jd = data;
for (unsigned i = 0; i < G_N_ELEMENTS(jd->output_ports); ++i) for (unsigned i = 0; i < G_N_ELEMENTS(jd->destination_ports); ++i)
g_free(jd->output_ports[i]); g_free(jd->destination_ports[i]);
g_free(jd); g_free(jd);
} }
@ -328,7 +330,7 @@ mpd_jack_stop(struct jack_data *jd)
static bool static bool
mpd_jack_start(struct jack_data *jd, GError **error_r) mpd_jack_start(struct jack_data *jd, GError **error_r)
{ {
const char *output_ports[2], **jports; const char *destination_ports[2], **jports;
assert(jd->client != NULL); assert(jd->client != NULL);
@ -353,7 +355,7 @@ mpd_jack_start(struct jack_data *jd, GError **error_r)
return false; return false;
} }
if (jd->output_ports[1] == NULL) { if (jd->destination_ports[1] == NULL) {
/* no output ports were configured - ask libjack for /* no output ports were configured - ask libjack for
defaults */ defaults */
jports = jack_get_ports(jd->client, NULL, NULL, jports = jack_get_ports(jd->client, NULL, NULL,
@ -365,15 +367,15 @@ mpd_jack_start(struct jack_data *jd, GError **error_r)
return false; return false;
} }
output_ports[0] = jports[0]; destination_ports[0] = jports[0];
output_ports[1] = jports[1] != NULL ? jports[1] : jports[0]; destination_ports[1] = jports[1] != NULL ? jports[1] : jports[0];
g_debug("output_ports: %s %s", jports[0], jports[1]); g_debug("destination_ports: %s %s", jports[0], jports[1]);
} else { } else {
/* use the configured output ports */ /* use the configured output ports */
output_ports[0] = jd->output_ports[0]; destination_ports[0] = jd->destination_ports[0];
output_ports[1] = jd->output_ports[1]; destination_ports[1] = jd->destination_ports[1];
jports = NULL; jports = NULL;
} }
@ -382,11 +384,11 @@ mpd_jack_start(struct jack_data *jd, GError **error_r)
int ret; int ret;
ret = jack_connect(jd->client, jack_port_name(jd->ports[i]), ret = jack_connect(jd->client, jack_port_name(jd->ports[i]),
output_ports[i]); destination_ports[i]);
if (ret != 0) { if (ret != 0) {
g_set_error(error_r, jack_output_quark(), 0, g_set_error(error_r, jack_output_quark(), 0,
"Not a valid JACK port: %s", "Not a valid JACK port: %s",
output_ports[i]); destination_ports[i]);
if (jports != NULL) if (jports != NULL)
free(jports); free(jports);
@ -402,11 +404,11 @@ mpd_jack_start(struct jack_data *jd, GError **error_r)
int ret; int ret;
ret = jack_connect(jd->client, jack_port_name(jd->ports[0]), ret = jack_connect(jd->client, jack_port_name(jd->ports[0]),
output_ports[1]); destination_ports[1]);
if (ret != 0) { if (ret != 0) {
g_set_error(error_r, jack_output_quark(), 0, g_set_error(error_r, jack_output_quark(), 0,
"Not a valid JACK port: %s", "Not a valid JACK port: %s",
output_ports[1]); destination_ports[1]);
if (jports != NULL) if (jports != NULL)
free(jports); free(jports);