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

output/Filtered: eliminate FinishDestroy()

Browse Source 
This is implicitly done by the destructor.
This commit is contained in:
Max Kellermann
2018-01-04 10:05:31 +01:00
parent 9f8649884b
commit 7e4e32cfe0
3 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/output/Control.cxx
View File

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

1
src/output/Filtered.hxx
View File

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

6
src/output/Finish.cxx
View File

@@ -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();
}