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

output/Thread: eliminate one ScopeLock

Browse Source
This commit is contained in:
Max Kellermann
2016-12-13 21:57:03 +01:00
parent ceba6816de
commit 41fd583fbc
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/output/OutputThread.cxx
View File

@@ -261,11 +261,9 @@ AudioOutput::CloseOutput(bool drain)
void void
AudioOutput::ReopenFilter() AudioOutput::ReopenFilter()
{ {
const ScopeUnlock unlock(mutex);
CloseFilter();
try { try {
const ScopeUnlock unlock(mutex);
CloseFilter();
OpenFilter(in_audio_format); OpenFilter(in_audio_format);
convert_filter_set(convert_filter.Get(), out_audio_format); convert_filter_set(convert_filter.Get(), out_audio_format);
} catch (const std::runtime_error &e) { } catch (const std::runtime_error &e) {
@@ -273,7 +271,6 @@ AudioOutput::ReopenFilter()
"Failed to open filter for \"%s\" [%s]", "Failed to open filter for \"%s\" [%s]",
name, plugin.name); name, plugin.name);
const ScopeLock lock(mutex);
Close(false); Close(false);
} }
} }