Skip to content

M
mpd
Commit 7e4e32cf authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/Filtered: eliminate FinishDestroy()

This is implicitly done by the destructor.
parent 9f864988
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
src/output/Control.cxx
View file @ 7e4e32cf
...@@ -377,7 +377,6 @@ AudioOutputControl::FinishDestroy() noexcept ...@@ -377,7 +377,6 @@ AudioOutputControl::FinishDestroy() noexcept
if (thread.IsDefined()) if (thread.IsDefined())
thread.Join(); thread.Join();
output->FinishDestroy();
delete output; delete output;
output = nullptr; output = nullptr;
} }
src/output/Filtered.hxx
View file @ 7e4e32cf
...@@ -142,7 +142,6 @@ public: ...@@ -142,7 +142,6 @@ public:
const ConfigBlock &block); const ConfigBlock &block);
void BeginDestroy() noexcept; void BeginDestroy() noexcept;
void FinishDestroy() noexcept;
const char *GetName() const { const char *GetName() const {
return name; return name;
......
src/output/Finish.cxx
View file @ 7e4e32cf
...@@ -35,9 +35,3 @@ FilteredAudioOutput::BeginDestroy() noexcept ...@@ -35,9 +35,3 @@ FilteredAudioOutput::BeginDestroy() noexcept
if (mixer != nullptr) if (mixer != nullptr)
mixer_auto_close(mixer); mixer_auto_close(mixer);
} }
void
FilteredAudioOutput::FinishDestroy() noexcept
{
output.reset();
}
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