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

output/Thread: unlock the mutex for several AudioOutput calls

Browse Source
This commit is contained in:
Max Kellermann
2017-08-07 17:08:49 +02:00
parent 67232453d4
commit 4580c685f1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/output/Thread.cxx
View File

@@ -63,16 +63,20 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
if (open && cf != output->filter_audio_format) { if (open && cf != output->filter_audio_format) {
/* if the filter's output format changes, the output /* if the filter's output format changes, the output
must be reopened as well */ must be reopened as well */
output->CloseOutput(true);
open = false; open = false;
const ScopeUnlock unlock(mutex);
output->CloseOutput(true);
} }
output->filter_audio_format = cf; output->filter_audio_format = cf;
if (!open) { if (!open) {
try { try {
const ScopeUnlock unlock(mutex);
output->OpenOutputAndConvert(output->filter_audio_format); output->OpenOutputAndConvert(output->filter_audio_format);
} catch (...) { } catch (...) {
const ScopeUnlock unlock(mutex);
output->CloseFilter(); output->CloseFilter();
throw; throw;
} }