From bbf0453709dd4e1e24d0ee7874aab7aae7c9b303 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 29 Jan 2009 18:11:23 +0100
Subject: [PATCH] jack: register ports before activating clients
Call jack_port_register() before jack_activate().
---
src/output/jack_plugin.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/output/jack_plugin.c b/src/output/jack_plugin.c
index 71957c226..c05f6a77d 100644
--- a/src/output/jack_plugin.c
+++ b/src/output/jack_plugin.c
@@ -227,11 +227,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) ) {
- g_warning("cannot activate client");
- return -1;
- }
-
jd->ports[0] = jack_port_register(jd->client, "left",
JACK_DEFAULT_AUDIO_TYPE,
JackPortIsOutput, 0);
@@ -248,6 +243,11 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
return -1;
}
+ if ( jack_activate(jd->client) ) {
+ g_warning("cannot activate client");
+ return -1;
+ }
+
/* hay que buscar que hay */
if (!jd->output_ports[1] &&
(jports = jack_get_ports(jd->client, NULL, NULL,