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

output/Control: move code to method StopThread()

Browse Source
This commit is contained in:
Max Kellermann 2020-01-18 21:16:51 +01:00
parent 37f984ba74
commit 7732db0aee
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/output/Control.cxx
View File

@ -38,10 +38,7 @@ AudioOutputControl::AudioOutputControl(std::unique_ptr<FilteredAudioOutput> _out
AudioOutputControl::~AudioOutputControl() noexcept
{
BeginDestroy();
if (thread.IsDefined())
thread.Join();
StopThread();
}
void
@ -383,3 +380,14 @@ AudioOutputControl::BeginDestroy() noexcept
}
}
}
void
AudioOutputControl::StopThread() noexcept
{
BeginDestroy();
if (thread.IsDefined())
thread.Join();
assert(IsCommandFinished());
}

2
src/output/Control.hxx
View File

@ -566,6 +566,8 @@ private:
*/
void InternalDrain() noexcept;
void StopThread() noexcept;
/**
* The OutputThread.
*/