From 86ae45108c72522f188c89a3d6cc2e975fb76d2a Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Tue, 7 Mar 2023 11:54:19 +0100
Subject: [PATCH] output/Finish: fold into Filtered.cxx

---
 src/output/Filtered.cxx |  8 ++++++++
 src/output/Finish.cxx   | 13 -------------
 src/output/meson.build  |  1 -
 3 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 src/output/Finish.cxx

diff --git a/src/output/Filtered.cxx b/src/output/Filtered.cxx
index a9428767b..9ac0b0055 100644
--- a/src/output/Filtered.cxx
+++ b/src/output/Filtered.cxx
@@ -7,12 +7,20 @@
 #include "lib/fmt/AudioFormatFormatter.hxx"
 #include "lib/fmt/ExceptionFormatter.hxx"
 #include "lib/fmt/RuntimeError.hxx"
+#include "mixer/Control.hxx"
 #include "mixer/Mixer.hxx"
 #include "mixer/plugins/SoftwareMixerPlugin.hxx"
+#include "filter/Prepared.hxx"
 #include "filter/plugins/ConvertFilterPlugin.hxx"
 #include "util/StringBuffer.hxx"
 #include "Log.hxx"
 
+FilteredAudioOutput::~FilteredAudioOutput()
+{
+	if (mixer != nullptr)
+		mixer_free(mixer);
+}
+
 bool
 FilteredAudioOutput::SupportsEnableDisable() const noexcept
 {
diff --git a/src/output/Finish.cxx b/src/output/Finish.cxx
deleted file mode 100644
index a3e6d6634..000000000
--- a/src/output/Finish.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-// Copyright The Music Player Daemon Project
-
-#include "Filtered.hxx"
-#include "Interface.hxx"
-#include "mixer/Control.hxx"
-#include "filter/Prepared.hxx"
-
-FilteredAudioOutput::~FilteredAudioOutput()
-{
-	if (mixer != nullptr)
-		mixer_free(mixer);
-}
diff --git a/src/output/meson.build b/src/output/meson.build
index 96af6b8c5..53bc526eb 100644
--- a/src/output/meson.build
+++ b/src/output/meson.build
@@ -47,7 +47,6 @@ output_glue = static_library(
   'State.cxx',
   'Print.cxx',
   'OutputCommand.cxx',
-  'Finish.cxx',
   'Init.cxx',
   include_directories: inc,
   dependencies: [