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

output/Internal: remove mutex code from Enable() and Disable()

Browse Source
This commit is contained in:
Max Kellermann 2017-08-07 17:39:20 +02:00
parent 3197c0fd7d
commit 5990017d51
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output/Internal.cxx
View File

@ -32,7 +32,6 @@ void
AudioOutput::Enable() AudioOutput::Enable()
{ {
try { try {
const ScopeUnlock unlock(mutex);
ao_plugin_enable(*this); ao_plugin_enable(*this);
} catch (const std::runtime_error &e) { } catch (const std::runtime_error &e) {
std::throw_with_nested(FormatRuntimeError("Failed to enable output \"%s\" [%s]", std::throw_with_nested(FormatRuntimeError("Failed to enable output \"%s\" [%s]",
@ -43,7 +42,6 @@ AudioOutput::Enable()
void void
AudioOutput::Disable() noexcept AudioOutput::Disable() noexcept
{ {
const ScopeUnlock unlock(mutex);
ao_plugin_disable(*this); ao_plugin_disable(*this);
} }

6
src/output/Thread.cxx
View File

@ -104,7 +104,11 @@ AudioOutputControl::InternalEnable() noexcept
last_error = nullptr; last_error = nullptr;
try { try {
{
const ScopeUnlock unlock(mutex);
output->Enable(); output->Enable();
}
really_enabled = true; really_enabled = true;
return true; return true;
} catch (const std::runtime_error &e) { } catch (const std::runtime_error &e) {
@ -124,6 +128,8 @@ AudioOutputControl::InternalDisable() noexcept
InternalCheckClose(false); InternalCheckClose(false);
really_enabled = false; really_enabled = false;
const ScopeUnlock unlock(mutex);
output->Disable(); output->Disable();
} }