aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-29 18:11:23 +0100
committerMax Kellermann <max@duempel.org>2009-01-29 18:11:23 +0100
commit6e31071249d0bfe7923eba4cd76ae25e2270f82d (patch)
tree763dee65e20eadacf8a4fc763cafe5a784ad1f75
parentb2eb82fd03e1b5d4f2c559d439d92bb2676fdf06 (diff)
downloadmpd-6e31071249d0bfe7923eba4cd76ae25e2270f82d.tar.gz
mpd-6e31071249d0bfe7923eba4cd76ae25e2270f82d.tar.xz
mpd-6e31071249d0bfe7923eba4cd76ae25e2270f82d.zip
jack: register ports before activating clients
Call jack_port_register() before jack_activate().
-rw-r--r--src/output/jack_plugin.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/output/jack_plugin.c b/src/output/jack_plugin.c
index 29c0befd5..b66dd4a1f 100644
--- a/src/output/jack_plugin.c
+++ b/src/output/jack_plugin.c
@@ -272,11 +272,6 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
jack_set_sample_rate_callback(jd->client, mpd_jack_srate, jd);
jack_on_shutdown(jd->client, mpd_jack_shutdown, jd);
- if ( jack_activate(jd->client) ) {
- ERROR("cannot activate client\n");
- return -1;
- }
-
jd->ports[0] = jack_port_register(jd->client, "left",
JACK_DEFAULT_AUDIO_TYPE,
JackPortIsOutput, 0);
@@ -293,6 +288,11 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
return -1;
}
+ if ( jack_activate(jd->client) ) {
+ ERROR("cannot activate client\n");
+ return -1;
+ }
+
/* hay que buscar que hay */
if (!jd->output_ports[1] &&
(jports = jack_get_ports(jd->client, NULL, NULL,