aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-29 17:08:44 +0100
committerMax Kellermann <max@duempel.org>2009-01-29 18:13:03 +0100
commit1e0ceb3d881a89d360a72b373c0c0ffd6865ed43 (patch)
treefc6ac44cd9415d5a6a00123084f1cd93d34d2b7d
parent3a070d3d23052d4306a2ef26b89585d96e235129 (diff)
downloadmpd-1e0ceb3d881a89d360a72b373c0c0ffd6865ed43.tar.gz
mpd-1e0ceb3d881a89d360a72b373c0c0ffd6865ed43.tar.xz
mpd-1e0ceb3d881a89d360a72b373c0c0ffd6865ed43.zip
jack: clear "shutdown" flag on reconnect
When the connection failed once, you had to restart MPD, because it never cleared the jack_data.shutdown flag. Instead, it refused to play anything "because there is no client thread" (which is wrong at that point).
-rw-r--r--NEWS1
-rw-r--r--src/output/jack_plugin.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index f1b03f637..3a38f2a7a 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,7 @@ ver 0.15 - (200?/??/??)
ver 0.14.2 (2009/??/??)
* audio outputs:
- jack: allocate ring buffers before connecting
+ - jack: clear "shutdown" flag on reconnect
ver 0.14.1 (2009/01/17)
diff --git a/src/output/jack_plugin.c b/src/output/jack_plugin.c
index d16eb0443..2e5d5d70f 100644
--- a/src/output/jack_plugin.c
+++ b/src/output/jack_plugin.c
@@ -220,6 +220,8 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
jd->ringbuffer[0] = jack_ringbuffer_create(jd->ringbuffer_size);
jd->ringbuffer[1] = jack_ringbuffer_create(jd->ringbuffer_size);
+ jd->shutdown = false;
+
if ((jd->client = jack_client_new(mpd_jack_name(jd))) == NULL) {
g_warning("jack server not running?");
return -1;