oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/osx: don't drain the buffer when closing

Browse Source 
Eliminate an unnecessary source of deadlocks.
This commit is contained in:
Max Kellermann 2011-09-01 18:13:05 +02:00
parent e7abdab58d
commit 596f36bb78
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -17,6 +17,7 @@ ver 0.16.4 (2011/??/??)
* output: * output:
- alsa: fix SIGFPE when alsa announces a period size of 0 - alsa: fix SIGFPE when alsa announces a period size of 0
- httpd: don't warn on client disconnect - 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 resuming the stream
- pulse: fix deadlock when the stream was suspended - pulse: fix deadlock when the stream was suspended

6
src/output/osx_plugin.c
View File

@ -95,12 +95,6 @@ static void osx_output_close(void *data)
{ {
struct osx_output *od = 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); AudioOutputUnitStop(od->au);
AudioUnitUninitialize(od->au); AudioUnitUninitialize(od->au);
CloseComponent(od->au); CloseComponent(od->au);