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

output/Finish: fold internal function into FinishDestroy()

Browse Source
This commit is contained in:
Max Kellermann
2017-08-07 18:15:15 +02:00
parent 33f67d418f
commit 04738636ca
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/Finish.cxx
View File

@@ -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)
@@ -35,12 +33,6 @@ AudioOutput::~AudioOutput()
delete prepared_filter; delete prepared_filter;
} }
void
audio_output_free(AudioOutput *ao) noexcept
{
ao_plugin_finish(ao);
}
void void
AudioOutput::BeginDestroy() noexcept 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);
} }

3
src/output/Internal.hxx
View File

@@ -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