Commit 07d1b378 authored by Max Kellermann's avatar Max Kellermann

output/Control: move two AudioOutput methods to Finish.cxx

parent 27d68d8f
...@@ -342,13 +342,6 @@ AudioOutputControl::StopThread() noexcept ...@@ -342,13 +342,6 @@ AudioOutputControl::StopThread() noexcept
} }
void void
AudioOutput::BeginDestroy() noexcept
{
if (mixer != nullptr)
mixer_auto_close(mixer);
}
void
AudioOutputControl::BeginDestroy() noexcept AudioOutputControl::BeginDestroy() noexcept
{ {
output->BeginDestroy(); output->BeginDestroy();
...@@ -360,12 +353,6 @@ AudioOutputControl::BeginDestroy() noexcept ...@@ -360,12 +353,6 @@ AudioOutputControl::BeginDestroy() noexcept
} }
void void
AudioOutput::FinishDestroy() noexcept
{
audio_output_free(this);
}
void
AudioOutputControl::FinishDestroy() noexcept AudioOutputControl::FinishDestroy() noexcept
{ {
if (thread.IsDefined()) if (thread.IsDefined())
......
...@@ -40,3 +40,16 @@ audio_output_free(AudioOutput *ao) noexcept ...@@ -40,3 +40,16 @@ audio_output_free(AudioOutput *ao) noexcept
{ {
ao_plugin_finish(ao); ao_plugin_finish(ao);
} }
void
AudioOutput::BeginDestroy() noexcept
{
if (mixer != nullptr)
mixer_auto_close(mixer);
}
void
AudioOutput::FinishDestroy() noexcept
{
audio_output_free(this);
}
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