3 files changed, 45 insertions, 21 deletions
diff --git a/src/output/plugins/wasapi/ForMixer.hxx b/src/output/plugins/wasapi/ForMixer.hxx
new file mode 100644
index 000000000..2d815ce61
--- /dev/null
+++ b/src/output/plugins/wasapi/ForMixer.hxx
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020-2021 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_WASAPI_OUTPUT_FOR_MIXER_HXX
+#define MPD_WASAPI_OUTPUT_FOR_MIXER_HXX
+
+struct IMMDevice;
+struct IAudioClient;
+class AudioOutput;
+class WasapiOutput;
+
+[[gnu::pure]]
+WasapiOutput &
+wasapi_output_downcast(AudioOutput &output) noexcept;
+
+[[gnu::pure]]
+bool
+wasapi_is_exclusive(WasapiOutput &output) noexcept;
+
+[[gnu::pure]]
+IMMDevice *
+wasapi_output_get_device(WasapiOutput &output) noexcept;
+
+[[gnu::pure]]
+IAudioClient *
+wasapi_output_get_client(WasapiOutput &output) noexcept;
+
+#endif
diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
index f9a509386..70add3c08 100644
--- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "WasapiOutputPlugin.hxx"
+#include "ForMixer.hxx"
 #include "output/OutputAPI.hxx"
 #include "lib/icu/Win32.hxx"
 #include "mixer/MixerList.hxx"
diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.hxx b/src/output/plugins/wasapi/WasapiOutputPlugin.hxx
index 67ebaf426..9194b5059 100644
--- a/src/output/plugins/wasapi/WasapiOutputPlugin.hxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.hxx
@@ -22,25 +22,4 @@
 
 extern const struct AudioOutputPlugin wasapi_output_plugin;
 
-struct IMMDevice;
-struct IAudioClient;
-class AudioOutput;
-class WasapiOutput;
-
-[[gnu::pure]]
-WasapiOutput &
-wasapi_output_downcast(AudioOutput &output) noexcept;
-
-[[gnu::pure]]
-bool
-wasapi_is_exclusive(WasapiOutput &output) noexcept;
-
-[[gnu::pure]]
-IMMDevice *
-wasapi_output_get_device(WasapiOutput &output) noexcept;
-
-[[gnu::pure]]
-IAudioClient *
-wasapi_output_get_client(WasapiOutput &output) noexcept;
-
 #endif