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

output/Internal: remove mutex code from Close()

Browse Source
This commit is contained in:
Max Kellermann 2017-08-07 16:25:23 +02:00
parent 15dcaeda0f
commit 546b773b21
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output/Internal.cxx
View File

@ -108,8 +108,6 @@ AudioOutput::CloseFilter() noexcept
void void
AudioOutput::Close(bool drain) noexcept AudioOutput::Close(bool drain) noexcept
{ {
const ScopeUnlock unlock(mutex);
CloseOutput(drain); CloseOutput(drain);
CloseFilter(); CloseFilter();

5
src/output/Internal.hxx
View File

@ -142,6 +142,11 @@ public:
void Disable() noexcept; void Disable() noexcept;
/**
* Invoke OutputPlugin::close().
*
* Caller must not lock the mutex.
*/
void Close(bool drain) noexcept; void Close(bool drain) noexcept;
/** /**

14
src/output/Thread.cxx
View File

@ -87,7 +87,12 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
output->out_audio_format); output->out_audio_format);
} catch (const std::runtime_error &e) { } catch (const std::runtime_error &e) {
open = false; open = false;
output->Close(false);
{
const ScopeUnlock unlock(mutex);
output->Close(false);
}
std::throw_with_nested(FormatRuntimeError("Failed to convert for \"%s\" [%s]", std::throw_with_nested(FormatRuntimeError("Failed to convert for \"%s\" [%s]",
GetName(), output->plugin.name)); GetName(), output->plugin.name));
} }
@ -194,7 +199,12 @@ AudioOutputControl::InternalClose(bool drain) noexcept
assert(IsOpen()); assert(IsOpen());
open = false; open = false;
output->Close(drain);
{
const ScopeUnlock unlock(mutex);
output->Close(drain);
}
source.Close(); source.Close();
} }