diff options
| author | Max Kellermann <max@duempel.org> | 2011-09-01 19:19:42 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-09-01 19:19:42 +0200 |
| commit | 6a3008d7ff787164124a43911145f7305c66aa7e (patch) | |
| tree | 54090ac05037c9ba4c7536747462469744bb2531 /src/output/osx_plugin.c | |
| parent | 140162191388063e41e33b53d4533e07529df870 (diff) | |
| parent | 2556449b361c00d9c66cf85beb64d7c6458763ed (diff) | |
| download | mpd-6a3008d7ff787164124a43911145f7305c66aa7e.tar.gz mpd-6a3008d7ff787164124a43911145f7305c66aa7e.tar.xz mpd-6a3008d7ff787164124a43911145f7305c66aa7e.zip | |
Merge branch 'v0.16.x'
Conflicts:
configure.ac
src/output_control.c
Diffstat (limited to '')
| -rw-r--r-- | src/output/osx_plugin.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/output/osx_plugin.c b/src/output/osx_plugin.c index 618cd351f..8091660ab 100644 --- a/src/output/osx_plugin.c +++ b/src/output/osx_plugin.c @@ -121,12 +121,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); @@ -169,8 +163,8 @@ osx_render(void *vdata, if (od->pos >= od->buffer_size) od->pos = 0; - g_mutex_unlock(od->mutex); g_cond_signal(od->condition); + g_mutex_unlock(od->mutex); buffer->mDataByteSize = buffer_size; |