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

output/Filtered: remove BeginDestroy()

Browse Source 
All it does is "sometimes" close the mixer, but that is also done in
the destructor.
This commit is contained in:
Max Kellermann 2018-01-04 10:29:27 +01:00
parent 192f4240e3
commit 0227af5bb7
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output/Control.cxx
View File

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

2
src/output/Filtered.hxx
View File

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

7
src/output/Finish.cxx
View File

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