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

output/Control: add LockEnableDisableAsync()

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

6
src/output/Control.hxx
View File

@ -360,6 +360,12 @@ public:
* Caller must lock the mutex. * Caller must lock the mutex.
*/ */
void EnableDisableAsync(); void EnableDisableAsync();
void LockEnableDisableAsync() {
const std::lock_guard<Mutex> protect(mutex);
EnableDisableAsync();
}
void LockPauseAsync() noexcept; void LockPauseAsync() noexcept;
void CloseWait() noexcept; void CloseWait() noexcept;

6
src/output/MultipleOutputs.cxx
View File

@ -147,10 +147,8 @@ MultipleOutputs::EnableDisable()
{ {
/* parallel execution */ /* parallel execution */
for (const auto &ao : outputs) { for (const auto &ao : outputs)
const std::lock_guard<Mutex> lock(ao->mutex); ao->LockEnableDisableAsync();
ao->EnableDisableAsync();
}
WaitAll(); WaitAll();
} }