summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2021-03-05 16:26:57 +0100
committerMax Kellermann <max@musicpd.org>2021-03-05 16:28:36 +0100
commitafe621c25ce2bec46ed54785b0f609c3938a7c65 (patch)
treecf1fb1f685664a2e1450c14e09794fedeba96483
parent637cf8a0399e1df798c10cfb60b96bd71b6b1d00 (diff)
output/wasapi: move to separate directory
-rw-r--r--src/mixer/plugins/WasapiMixerPlugin.cxx2
-rw-r--r--src/output/Registry.cxx2
-rw-r--r--src/output/plugins/meson.build2
-rw-r--r--src/output/plugins/wasapi/WasapiOutputPlugin.cxx (renamed from src/output/plugins/WasapiOutputPlugin.cxx)0
-rw-r--r--src/output/plugins/wasapi/WasapiOutputPlugin.hxx (renamed from src/output/plugins/WasapiOutputPlugin.hxx)2
5 files changed, 4 insertions, 4 deletions
diff --git a/src/mixer/plugins/WasapiMixerPlugin.cxx b/src/mixer/plugins/WasapiMixerPlugin.cxx
index bc2604633..d4d7626ff 100644
--- a/src/mixer/plugins/WasapiMixerPlugin.cxx
+++ b/src/mixer/plugins/WasapiMixerPlugin.cxx
@@ -18,7 +18,7 @@
*/
#include "mixer/MixerInternal.hxx"
-#include "output/plugins/WasapiOutputPlugin.hxx"
+#include "output/plugins/wasapi/WasapiOutputPlugin.hxx"
#include "win32/ComWorker.hxx"
#include "win32/HResult.hxx"
diff --git a/src/output/Registry.cxx b/src/output/Registry.cxx
index 7252aa47c..f0f999895 100644
--- a/src/output/Registry.cxx
+++ b/src/output/Registry.cxx
@@ -42,7 +42,7 @@
#include "plugins/WinmmOutputPlugin.hxx"
#endif
#ifdef ENABLE_WASAPI_OUTPUT
-#include "plugins/WasapiOutputPlugin.hxx"
+#include "plugins/wasapi/WasapiOutputPlugin.hxx"
#endif
#include "util/StringAPI.hxx"
diff --git a/src/output/plugins/meson.build b/src/output/plugins/meson.build
index 53c92b9f4..0f420d8d0 100644
--- a/src/output/plugins/meson.build
+++ b/src/output/plugins/meson.build
@@ -136,7 +136,7 @@ endif
output_features.set('ENABLE_WASAPI_OUTPUT', is_windows)
if is_windows
output_plugins_sources += [
- 'WasapiOutputPlugin.cxx',
+ 'wasapi/WasapiOutputPlugin.cxx',
]
wasapi_dep = [
c_compiler.find_library('ksuser', required: true),
diff --git a/src/output/plugins/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
index 84d23dd12..84d23dd12 100644
--- a/src/output/plugins/WasapiOutputPlugin.cxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
diff --git a/src/output/plugins/WasapiOutputPlugin.hxx b/src/output/plugins/wasapi/WasapiOutputPlugin.hxx
index 3b17bcb9f..904caeba0 100644
--- a/src/output/plugins/WasapiOutputPlugin.hxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.hxx
@@ -22,7 +22,7 @@
#include "output/Features.h"
-#include "../OutputAPI.hxx"
+#include "output/OutputAPI.hxx"
#include "util/Compiler.h"
#include "win32/ComPtr.hxx"