From 596f36bb78425c8bd6aa4e9a81c796cb78b011c0 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 1 Sep 2011 18:13:05 +0200
Subject: [PATCH] output/osx: don't drain the buffer when closing

Eliminate an unnecessary source of deadlocks.
---
 NEWS                    | 1 +
 src/output/osx_plugin.c | 6 ------
 2 files changed, 1 insertion(+), 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);