aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-01 18:13:05 +0200
committerMax Kellermann <max@duempel.org>2011-09-01 18:21:46 +0200
commit596f36bb78425c8bd6aa4e9a81c796cb78b011c0 (patch)
treeb341712312ffc5d51e381c4f3dbd737b3a43d18b
parente7abdab58dd566d9b80fb5caf5dee867f184d913 (diff)
downloadmpd-596f36bb78425c8bd6aa4e9a81c796cb78b011c0.tar.gz
mpd-596f36bb78425c8bd6aa4e9a81c796cb78b011c0.tar.xz
mpd-596f36bb78425c8bd6aa4e9a81c796cb78b011c0.zip
output/osx: don't drain the buffer when closing
Eliminate an unnecessary source of deadlocks.
Diffstat (limited to '')
-rw-r--r--NEWS1
-rw-r--r--src/output/osx_plugin.c6
2 files changed, 1 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 9a6764d9b..e580192f9 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ ver 0.16.4 (2011/??/??)
* output:
- alsa: fix SIGFPE when alsa announces a period size of 0
- httpd: don't warn on client disconnect
+ - osx: don't drain the buffer when closing
- pulse: fix deadlock when resuming the stream
- pulse: fix deadlock when the stream was suspended
diff --git a/src/output/osx_plugin.c b/src/output/osx_plugin.c
index 2c150fc41..7639f3bd9 100644
--- a/src/output/osx_plugin.c
+++ b/src/output/osx_plugin.c
@@ -95,12 +95,6 @@ static void osx_output_close(void *data)
{
struct osx_output *od = data;
- g_mutex_lock(od->mutex);
- while (od->len) {
- g_cond_wait(od->condition, od->mutex);
- }
- g_mutex_unlock(od->mutex);
-
AudioOutputUnitStop(od->au);
AudioUnitUninitialize(od->au);
CloseComponent(od->au);