Commit 41fd583f authored by Max Kellermann's avatar Max Kellermann

output/Thread: eliminate one ScopeLock

parent ceba6816
...@@ -261,11 +261,9 @@ AudioOutput::CloseOutput(bool drain) ...@@ -261,11 +261,9 @@ AudioOutput::CloseOutput(bool drain)
void void
AudioOutput::ReopenFilter() AudioOutput::ReopenFilter()
{ {
try {
const ScopeUnlock unlock(mutex); const ScopeUnlock unlock(mutex);
CloseFilter(); CloseFilter();
try {
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() ...@@ -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);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment