Commit 04738636 authored by Max Kellermann's avatar Max Kellermann

output/Finish: fold internal function into FinishDestroy()

parent 33f67d41
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include "mixer/MixerControl.hxx" #include "mixer/MixerControl.hxx"
#include "filter/FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include <assert.h>
AudioOutput::~AudioOutput() AudioOutput::~AudioOutput()
{ {
if (mixer != nullptr) if (mixer != nullptr)
...@@ -36,12 +34,6 @@ AudioOutput::~AudioOutput() ...@@ -36,12 +34,6 @@ AudioOutput::~AudioOutput()
} }
void void
audio_output_free(AudioOutput *ao) noexcept
{
ao_plugin_finish(ao);
}
void
AudioOutput::BeginDestroy() noexcept AudioOutput::BeginDestroy() noexcept
{ {
if (mixer != nullptr) if (mixer != nullptr)
...@@ -51,5 +43,5 @@ AudioOutput::BeginDestroy() noexcept ...@@ -51,5 +43,5 @@ AudioOutput::BeginDestroy() noexcept
void void
AudioOutput::FinishDestroy() noexcept AudioOutput::FinishDestroy() noexcept
{ {
audio_output_free(this); ao_plugin_finish(this);
} }
...@@ -187,7 +187,4 @@ audio_output_new(EventLoop &event_loop, ...@@ -187,7 +187,4 @@ audio_output_new(EventLoop &event_loop,
const ConfigBlock &block, const ConfigBlock &block,
MixerListener &mixer_listener); MixerListener &mixer_listener);
void
audio_output_free(AudioOutput *ao) noexcept;
#endif #endif
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