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

Use a ScopeLock around condition.wait()

Browse Source
This commit is contained in:
Jacob Vosmaer 2016-08-07 15:47:21 +02:00
parent 9f1ada898e
commit 4d6192adcd
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/output/plugins/OSXOutputPlugin.cxx
View File

@ -618,7 +618,9 @@ osx_output_play(AudioOutput *ao, const void *chunk, size_t size,
{ {
OSXOutput *od = (OSXOutput *)ao; OSXOutput *od = (OSXOutput *)ao;
od->mutex.lock(); {
const ScopeLock protect(od->mutex);
while (true) { while (true) {
if (od->ring_buffer->write_available() > 0) if (od->ring_buffer->write_available() > 0)
break; break;
@ -626,7 +628,7 @@ osx_output_play(AudioOutput *ao, const void *chunk, size_t size,
/* wait for some free space in the buffer */ /* wait for some free space in the buffer */
od->condition.wait(od->mutex); od->condition.wait(od->mutex);
} }
od->mutex.unlock(); }
return od->ring_buffer->push((uint8_t *) chunk, size); return od->ring_buffer->push((uint8_t *) chunk, size);
} }