Skip to content

M
mpd
Commit fb907f5f authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/Thread: KILL implicitly closes and disables the AudioOutput

Reduce shutdown latency by two commands per output.
parent b107a158
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 10 deletions
src/output/MultipleOutputs.cxx
View file @ fb907f5f
...@@ -43,14 +43,8 @@ MultipleOutputs::MultipleOutputs(MixerListener &_mixer_listener) ...@@ -43,14 +43,8 @@ MultipleOutputs::MultipleOutputs(MixerListener &_mixer_listener)
MultipleOutputs::~MultipleOutputs() MultipleOutputs::~MultipleOutputs()
{ {
for (auto i : outputs) { for (auto i : outputs)
{
const ScopeLock lock(i->mutex);
i->DisableWait();
}
i->Finish(); i->Finish();
}
} }
static AudioOutput * static AudioOutput *
......
src/output/OutputControl.cxx
View file @ fb907f5f
...@@ -276,9 +276,8 @@ AudioOutput::StopThread() ...@@ -276,9 +276,8 @@ AudioOutput::StopThread()
void void
AudioOutput::Finish() AudioOutput::Finish()
{ {
LockCloseWait(); if (mixer != nullptr)
mixer_auto_close(mixer);
assert(!fail_timer.IsDefined());
if (thread.IsDefined()) if (thread.IsDefined())
StopThread(); StopThread();
......
src/output/OutputThread.cxx
View file @ fb907f5f
...@@ -642,6 +642,7 @@ AudioOutput::Task() ...@@ -642,6 +642,7 @@ AudioOutput::Task()
continue; continue;
case Command::KILL: case Command::KILL:
Disable();
pipe.Cancel(); pipe.Cancel();
CommandFinished(); CommandFinished();
return; return;
......
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