Skip to content

M
mpd
Commit 0227af5b authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/Filtered: remove BeginDestroy()

All it does is "sometimes" close the mixer, but that is also done in the destructor.
parent 192f4240
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 11 deletions
src/output/Control.cxx
View file @ 0227af5b
...@@ -371,8 +371,6 @@ AudioOutputControl::LockCloseWait() noexcept ...@@ -371,8 +371,6 @@ AudioOutputControl::LockCloseWait() noexcept
void void
AudioOutputControl::BeginDestroy() noexcept AudioOutputControl::BeginDestroy() noexcept
{ {
output->BeginDestroy();
if (thread.IsDefined()) { if (thread.IsDefined()) {
const std::lock_guard<Mutex> protect(mutex); const std::lock_guard<Mutex> protect(mutex);
CommandAsync(Command::KILL); CommandAsync(Command::KILL);
......
src/output/Filtered.hxx
View file @ 0227af5b
...@@ -141,8 +141,6 @@ public: ...@@ -141,8 +141,6 @@ public:
MixerListener &mixer_listener, MixerListener &mixer_listener,
const ConfigBlock &block); const ConfigBlock &block);
void BeginDestroy() noexcept;
const char *GetName() const { const char *GetName() const {
return name; return name;
} }
......
src/output/Finish.cxx
View file @ 0227af5b
...@@ -28,10 +28,3 @@ FilteredAudioOutput::~FilteredAudioOutput() ...@@ -28,10 +28,3 @@ FilteredAudioOutput::~FilteredAudioOutput()
if (mixer != nullptr) if (mixer != nullptr)
mixer_free(mixer); mixer_free(mixer);
} }
void
FilteredAudioOutput::BeginDestroy() noexcept
{
if (mixer != nullptr)
mixer_auto_close(mixer);
}
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