From 681956a963390f2a6edeebdc028efbf335f558a2 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Fri, 5 Mar 2021 16:31:39 +0100
Subject: [PATCH] output/wasapi: include cleanup
---
src/mixer/plugins/WasapiMixerPlugin.cxx | 6 ++++--
src/output/plugins/wasapi/WasapiOutputPlugin.cxx | 11 +++++++----
src/output/plugins/wasapi/WasapiOutputPlugin.hxx | 3 ---
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/mixer/plugins/WasapiMixerPlugin.cxx b/src/mixer/plugins/WasapiMixerPlugin.cxx
index d4d7626ff..d940ca279 100644
--- a/src/mixer/plugins/WasapiMixerPlugin.cxx
+++ b/src/mixer/plugins/WasapiMixerPlugin.cxx
@@ -17,15 +17,17 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "mixer/MixerInternal.hxx"
#include "output/plugins/wasapi/WasapiOutputPlugin.hxx"
+#include "mixer/MixerInternal.hxx"
+#include "win32/ComPtr.hxx"
#include "win32/ComWorker.hxx"
#include "win32/HResult.hxx"
#include <cmath>
-#include <endpointvolume.h>
#include <optional>
+#include <endpointvolume.h>
+
class WasapiMixer final : public Mixer {
WasapiOutput &output;
diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
index 9c0ffd555..4ec50db50 100644
--- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
@@ -16,9 +16,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <initguid.h>
-#include "Log.hxx"
#include "WasapiOutputPlugin.hxx"
#include "lib/icu/Win32.hxx"
#include "mixer/MixerList.hxx"
@@ -36,19 +34,24 @@
#include "util/StringBuffer.hxx"
#include "win32/Com.hxx"
#include "win32/ComHeapPtr.hxx"
+#include "win32/ComPtr.hxx"
#include "win32/ComWorker.hxx"
#include "win32/HResult.hxx"
#include "win32/WinEvent.hxx"
+#include "Log.hxx"
#include "config.h"
-#include <algorithm>
#include <boost/lockfree/spsc_queue.hpp>
+
+#include <algorithm>
#include <cinttypes>
#include <cmath>
-#include <functiondiscoverykeys_devpkey.h>
#include <optional>
#include <variant>
+#include <initguid.h>
+#include <functiondiscoverykeys_devpkey.h>
+
namespace {
static constexpr Domain wasapi_output_domain("wasapi_output");
diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.hxx b/src/output/plugins/wasapi/WasapiOutputPlugin.hxx
index 904caeba0..eaf063e3b 100644
--- a/src/output/plugins/wasapi/WasapiOutputPlugin.hxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.hxx
@@ -20,11 +20,8 @@
#ifndef MPD_WASAPI_OUTPUT_PLUGIN_HXX
#define MPD_WASAPI_OUTPUT_PLUGIN_HXX
-#include "output/Features.h"
-
#include "output/OutputAPI.hxx"
#include "util/Compiler.h"
-#include "win32/ComPtr.hxx"
#include <audioclient.h>
#include <mmdeviceapi.h>