Commit d600b937 authored by Max Kellermann's avatar Max Kellermann

output/Thread: move code to InternalDisable()

parent ae713cb0
...@@ -363,6 +363,11 @@ private: ...@@ -363,6 +363,11 @@ private:
/** /**
* Runs inside the OutputThread. Handles exceptions. * Runs inside the OutputThread. Handles exceptions.
*/ */
void InternalDisable() noexcept;
/**
* Runs inside the OutputThread. Handles exceptions.
*/
void InternalOpen(AudioFormat audio_format, void InternalOpen(AudioFormat audio_format,
const MusicPipe &pipe) noexcept; const MusicPipe &pipe) noexcept;
......
...@@ -204,6 +204,12 @@ AudioOutput::OpenOutputAndConvert(AudioFormat desired_audio_format) ...@@ -204,6 +204,12 @@ AudioOutput::OpenOutputAndConvert(AudioFormat desired_audio_format)
} }
inline void inline void
AudioOutputControl::InternalDisable() noexcept
{
output->Disable();
}
inline void
AudioOutputControl::InternalOpen(const AudioFormat audio_format, AudioOutputControl::InternalOpen(const AudioFormat audio_format,
const MusicPipe &pipe) noexcept const MusicPipe &pipe) noexcept
{ {
...@@ -467,7 +473,7 @@ AudioOutputControl::Task() ...@@ -467,7 +473,7 @@ AudioOutputControl::Task()
break; break;
case Command::DISABLE: case Command::DISABLE:
output->Disable(); InternalDisable();
CommandFinished(); CommandFinished();
break; break;
...@@ -520,7 +526,7 @@ AudioOutputControl::Task() ...@@ -520,7 +526,7 @@ AudioOutputControl::Task()
continue; continue;
case Command::KILL: case Command::KILL:
output->Disable(); InternalDisable();
output->source.Cancel(); output->source.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