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

output/Control: add LockWaitForCommand()

Browse Source
This commit is contained in:
Max Kellermann 2019-04-26 18:25:36 +02:00
parent 684bd9153e
commit 2c8d004f78
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/output/Control.hxx
View File

@ -309,6 +309,11 @@ public:
*/ */
void WaitForCommand() noexcept; void WaitForCommand() noexcept;
void LockWaitForCommand() noexcept {
const std::lock_guard<Mutex> protect(mutex);
WaitForCommand();
}
/** /**
* Sends a command, but does not wait for completion. * Sends a command, but does not wait for completion.
* *

6
src/output/MultipleOutputs.cxx
View File

@ -158,10 +158,8 @@ MultipleOutputs::EnableDisable()
void void
MultipleOutputs::WaitAll() noexcept MultipleOutputs::WaitAll() noexcept
{ {
for (const auto &ao : outputs) { for (const auto &ao : outputs)
const std::lock_guard<Mutex> protect(ao->mutex); ao->LockWaitForCommand();
ao->WaitForCommand();
}
} }
void void