Mixer*: move to mixer/

36 files changed, 44 insertions, 44 deletions

diff --git a/Makefile.am b/Makefile.am
index e909bc111..59f887788 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -209,7 +209,7 @@ src_mpd_SOURCES = \
 	src/TagSave.cxx src/TagSave.hxx \
 	src/TagFile.cxx src/TagFile.hxx \
 	src/TagStream.cxx src/TagStream.hxx \
-	src/Volume.cxx src/Volume.hxx \
+	src/mixer/Volume.cxx src/mixer/Volume.hxx \
 	src/SongFilter.cxx src/SongFilter.hxx \
 	src/PlaylistFile.cxx src/PlaylistFile.hxx \
 	src/Timer.cxx
@@ -935,16 +935,16 @@ MIXER_LIBS = \
 	$(PULSE_LIBS)
 
 MIXER_API_SRC = \
-	src/MixerPlugin.hxx \
-	src/MixerList.hxx \
-	src/MixerControl.cxx src/MixerControl.hxx \
-	src/MixerType.cxx src/MixerType.hxx \
-	src/MixerAll.cxx src/MixerAll.hxx \
-	src/MixerInternal.hxx
+	src/mixer/MixerPlugin.hxx \
+	src/mixer/MixerList.hxx \
+	src/mixer/MixerControl.cxx src/mixer/MixerControl.hxx \
+	src/mixer/MixerType.cxx src/mixer/MixerType.hxx \
+	src/mixer/MixerAll.cxx src/mixer/MixerAll.hxx \
+	src/mixer/MixerInternal.hxx
 
 libmixer_plugins_a_SOURCES = \
-	src/mixer/SoftwareMixerPlugin.cxx \
-	src/mixer/SoftwareMixerPlugin.hxx
+	src/mixer/plugins/SoftwareMixerPlugin.cxx \
+	src/mixer/plugins/SoftwareMixerPlugin.hxx
 libmixer_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ALSA_CFLAGS) \
 	$(PULSE_CFLAGS)
@@ -953,14 +953,14 @@ if HAVE_ALSA
 liboutput_plugins_a_SOURCES += \
 	src/output/plugins/AlsaOutputPlugin.cxx \
 	src/output/plugins/AlsaOutputPlugin.hxx
-libmixer_plugins_a_SOURCES += src/mixer/AlsaMixerPlugin.cxx
+libmixer_plugins_a_SOURCES += src/mixer/plugins/AlsaMixerPlugin.cxx
 endif
 
 if HAVE_ROAR
 liboutput_plugins_a_SOURCES += \
 	src/output/plugins/RoarOutputPlugin.cxx \
 	src/output/plugins/RoarOutputPlugin.hxx
-libmixer_plugins_a_SOURCES += src/mixer/RoarMixerPlugin.cxx
+libmixer_plugins_a_SOURCES += src/mixer/plugins/RoarMixerPlugin.cxx
 endif
 
 if HAVE_AO
@@ -991,7 +991,7 @@ if HAVE_OSS
 liboutput_plugins_a_SOURCES += \
 	src/output/plugins/OssOutputPlugin.cxx \
 	src/output/plugins/OssOutputPlugin.hxx
-libmixer_plugins_a_SOURCES += src/mixer/OssMixerPlugin.cxx
+libmixer_plugins_a_SOURCES += src/mixer/plugins/OssMixerPlugin.cxx
 endif
 
 if HAVE_OPENAL
@@ -1011,7 +1011,7 @@ liboutput_plugins_a_SOURCES += \
 	src/output/plugins/PulseOutputPlugin.cxx \
 	src/output/plugins/PulseOutputPlugin.hxx
 libmixer_plugins_a_SOURCES += \
-	src/mixer/PulseMixerPlugin.cxx src/mixer/PulseMixerPlugin.hxx
+	src/mixer/plugins/PulseMixerPlugin.cxx src/mixer/plugins/PulseMixerPlugin.hxx
 endif
 
 if HAVE_SHOUT
@@ -1045,7 +1045,7 @@ if ENABLE_WINMM_OUTPUT
 liboutput_plugins_a_SOURCES += \
 	src/output/plugins/WinmmOutputPlugin.cxx \
 	src/output/plugins/WinmmOutputPlugin.hxx
-libmixer_plugins_a_SOURCES += src/mixer/WinmmMixerPlugin.cxx
+libmixer_plugins_a_SOURCES += src/mixer/plugins/WinmmMixerPlugin.cxx
 endif
 
 
@@ -1540,8 +1540,8 @@ test_run_output_SOURCES = test/run_output.cxx \
 	src/output/OutputError.cxx \
 	src/output/OutputInit.cxx src/output/OutputFinish.cxx src/output/OutputList.cxx \
 	src/output/OutputPlugin.cxx \
-	src/MixerControl.cxx \
-	src/MixerType.cxx \
+	src/mixer/MixerControl.cxx \
+	src/mixer/MixerType.cxx \
 	src/filter/FilterPlugin.cxx \
 	src/filter/FilterConfig.cxx \
 	src/AudioCompress/compress.c \
@@ -1559,7 +1559,7 @@ test_read_mixer_LDADD = \
 	$(GLIB_LIBS)
 test_read_mixer_SOURCES = test/read_mixer.cxx \
 	src/Log.cxx src/LogBackend.cxx \
-	src/MixerControl.cxx \
+	src/mixer/MixerControl.cxx \
 	src/filter/FilterPlugin.cxx \
 	src/AudioFormat.cxx \
 	src/filter/plugins/VolumeFilterPlugin.cxx
diff --git a/src/Main.cxx b/src/Main.cxx
index e71814cff..fc7efd036 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -36,7 +36,7 @@
 #include "client/ClientList.hxx"
 #include "command/AllCommands.hxx"
 #include "Partition.hxx"
-#include "Volume.hxx"
+#include "mixer/Volume.hxx"
 #include "output/OutputAll.hxx"
 #include "tag/TagConfig.hxx"
 #include "ReplayGainConfig.hxx"
diff --git a/src/StateFile.cxx b/src/StateFile.cxx
index 06b7f0779..b28e8c617 100644
--- a/src/StateFile.cxx
+++ b/src/StateFile.cxx
@@ -23,7 +23,7 @@
 #include "PlaylistState.hxx"
 #include "fs/TextFile.hxx"
 #include "Partition.hxx"
-#include "Volume.hxx"
+#include "mixer/Volume.hxx"
 
 #include "fs/FileSystem.hxx"
 #include "util/Domain.hxx"
diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx
index 67d2aecf3..6432ce4e7 100644
--- a/src/command/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
@@ -34,7 +34,7 @@
 #include "protocol/ArgParser.hxx"
 #include "protocol/Result.hxx"
 #include "ls.hxx"
-#include "Volume.hxx"
+#include "mixer/Volume.hxx"
 #include "util/ASCII.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx
index f703057cf..28258dded 100644
--- a/src/command/PlayerCommands.cxx
+++ b/src/command/PlayerCommands.cxx
@@ -24,7 +24,7 @@
 #include "PlaylistPrint.hxx"
 #include "db/update/UpdateGlue.hxx"
 #include "client/Client.hxx"
-#include "Volume.hxx"
+#include "mixer/Volume.hxx"
 #include "output/OutputAll.hxx"
 #include "Partition.hxx"
 #include "protocol/Result.hxx"
diff --git a/src/filter/plugins/ReplayGainFilterPlugin.cxx b/src/filter/plugins/ReplayGainFilterPlugin.cxx
index d89e79480..a5d9668cc 100644
--- a/src/filter/plugins/ReplayGainFilterPlugin.cxx
+++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx
@@ -25,7 +25,7 @@
 #include "AudioFormat.hxx"
 #include "ReplayGainInfo.hxx"
 #include "ReplayGainConfig.hxx"
-#include "MixerControl.hxx"
+#include "mixer/MixerControl.hxx"
 #include "pcm/Volume.hxx"
 #include "pcm/PcmBuffer.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/src/MixerAll.cxx b/src/mixer/MixerAll.cxx
index 3cc92baee..3cc92baee 100644
--- a/src/MixerAll.cxx
+++ b/src/mixer/MixerAll.cxx
diff --git a/src/MixerAll.hxx b/src/mixer/MixerAll.hxx
index f868f64b5..f868f64b5 100644
--- a/src/MixerAll.hxx
+++ b/src/mixer/MixerAll.hxx
diff --git a/src/MixerControl.cxx b/src/mixer/MixerControl.cxx
index bdf6fcc2b..bdf6fcc2b 100644
--- a/src/MixerControl.cxx
+++ b/src/mixer/MixerControl.cxx
diff --git a/src/MixerControl.hxx b/src/mixer/MixerControl.hxx
index caa1c3054..caa1c3054 100644
--- a/src/MixerControl.hxx
+++ b/src/mixer/MixerControl.hxx
diff --git a/src/MixerInternal.hxx b/src/mixer/MixerInternal.hxx
index 1732b4f3b..1732b4f3b 100644
--- a/src/MixerInternal.hxx
+++ b/src/mixer/MixerInternal.hxx
diff --git a/src/MixerList.hxx b/src/mixer/MixerList.hxx
index eb3dba938..eb3dba938 100644
--- a/src/MixerList.hxx
+++ b/src/mixer/MixerList.hxx
diff --git a/src/MixerPlugin.hxx b/src/mixer/MixerPlugin.hxx
index b29ecbab8..b29ecbab8 100644
--- a/src/MixerPlugin.hxx
+++ b/src/mixer/MixerPlugin.hxx
diff --git a/src/MixerType.cxx b/src/mixer/MixerType.cxx
index cd45db0d9..cd45db0d9 100644
--- a/src/MixerType.cxx
+++ b/src/mixer/MixerType.cxx
diff --git a/src/MixerType.hxx b/src/mixer/MixerType.hxx
index bfa2637b7..bfa2637b7 100644
--- a/src/MixerType.hxx
+++ b/src/mixer/MixerType.hxx
diff --git a/src/Volume.cxx b/src/mixer/Volume.cxx
index 4c897b21f..4c897b21f 100644
--- a/src/Volume.cxx
+++ b/src/mixer/Volume.cxx
diff --git a/src/Volume.hxx b/src/mixer/Volume.hxx
index 06d3551eb..06d3551eb 100644
--- a/src/Volume.hxx
+++ b/src/mixer/Volume.hxx
diff --git a/src/mixer/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx
index 9d04ad98b..a15820fc7 100644
--- a/src/mixer/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "MixerInternal.hxx"
+#include "mixer/MixerInternal.hxx"
 #include "output/OutputAPI.hxx"
 #include "GlobalEvents.hxx"
 #include "Main.hxx"
diff --git a/src/mixer/OssMixerPlugin.cxx b/src/mixer/plugins/OssMixerPlugin.cxx
index 4e116c2fb..095ace015 100644
--- a/src/mixer/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "MixerInternal.hxx"
+#include "mixer/MixerInternal.hxx"
 #include "config/ConfigData.hxx"
 #include "system/fd_util.h"
 #include "util/ASCII.hxx"
diff --git a/src/mixer/PulseMixerPlugin.cxx b/src/mixer/plugins/PulseMixerPlugin.cxx
index a379cebae..4df88d06b 100644
--- a/src/mixer/PulseMixerPlugin.cxx
+++ b/src/mixer/plugins/PulseMixerPlugin.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PulseMixerPlugin.hxx"
-#include "MixerInternal.hxx"
+#include "mixer/MixerInternal.hxx"
 #include "output/plugins/PulseOutputPlugin.hxx"
 #include "GlobalEvents.hxx"
 #include "util/Error.hxx"
diff --git a/src/mixer/PulseMixerPlugin.hxx b/src/mixer/plugins/PulseMixerPlugin.hxx
index 993945e9b..993945e9b 100644
--- a/src/mixer/PulseMixerPlugin.hxx
+++ b/src/mixer/plugins/PulseMixerPlugin.hxx
diff --git a/src/mixer/RoarMixerPlugin.cxx b/src/mixer/plugins/RoarMixerPlugin.cxx
index 18f8c14f8..958688cd7 100644
--- a/src/mixer/RoarMixerPlugin.cxx
+++ b/src/mixer/plugins/RoarMixerPlugin.cxx
@@ -20,7 +20,7 @@
 
 
 #include "config.h"
-#include "MixerInternal.hxx"
+#include "mixer/MixerInternal.hxx"
 #include "output/plugins/RoarOutputPlugin.hxx"
 #include "Compiler.h"
 
diff --git a/src/mixer/SoftwareMixerPlugin.cxx b/src/mixer/plugins/SoftwareMixerPlugin.cxx
index a0de727af..67ddee1a4 100644
--- a/src/mixer/SoftwareMixerPlugin.cxx
+++ b/src/mixer/plugins/SoftwareMixerPlugin.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "SoftwareMixerPlugin.hxx"
-#include "MixerInternal.hxx"
+#include "mixer/MixerInternal.hxx"
 #include "filter/FilterPlugin.hxx"
 #include "filter/FilterRegistry.hxx"
 #include "filter/FilterInternal.hxx"
diff --git a/src/mixer/SoftwareMixerPlugin.hxx b/src/mixer/plugins/SoftwareMixerPlugin.hxx
index 581d2ac17..581d2ac17 100644
--- a/src/mixer/SoftwareMixerPlugin.hxx
+++ b/src/mixer/plugins/SoftwareMixerPlugin.hxx
diff --git a/src/mixer/WinmmMixerPlugin.cxx b/src/mixer/plugins/WinmmMixerPlugin.cxx
index 6f10fd71b..093a026a9 100644
--- a/src/mixer/WinmmMixerPlugin.cxx
+++ b/src/mixer/plugins/WinmmMixerPlugin.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "MixerInternal.hxx"
+#include "mixer/MixerInternal.hxx"
 #include "output/OutputAPI.hxx"
 #include "output/plugins/WinmmOutputPlugin.hxx"
 #include "util/Error.hxx"
diff --git a/src/output/OutputCommand.cxx b/src/output/OutputCommand.cxx
index 839e9bd88..d82b7c696 100644
--- a/src/output/OutputCommand.cxx
+++ b/src/output/OutputCommand.cxx
@@ -29,7 +29,7 @@
 #include "OutputAll.hxx"
 #include "OutputInternal.hxx"
 #include "PlayerControl.hxx"
-#include "MixerControl.hxx"
+#include "mixer/MixerControl.hxx"
 #include "Idle.hxx"
 
 extern unsigned audio_output_state_version;
diff --git a/src/output/OutputControl.cxx b/src/output/OutputControl.cxx
index 234980a52..1532dbd83 100644
--- a/src/output/OutputControl.cxx
+++ b/src/output/OutputControl.cxx
@@ -24,7 +24,7 @@
 #include "OutputInternal.hxx"
 #include "OutputPlugin.hxx"
 #include "OutputError.hxx"
-#include "MixerControl.hxx"
+#include "mixer/MixerControl.hxx"
 #include "notify.hxx"
 #include "filter/plugins/ReplayGainFilterPlugin.hxx"
 #include "util/Error.hxx"
diff --git a/src/output/OutputFinish.cxx b/src/output/OutputFinish.cxx
index 109662fb0..16b16f5ce 100644
--- a/src/output/OutputFinish.cxx
+++ b/src/output/OutputFinish.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "OutputInternal.hxx"
 #include "OutputPlugin.hxx"
-#include "MixerControl.hxx"
+#include "mixer/MixerControl.hxx"
 #include "filter/FilterInternal.hxx"
 
 #include <assert.h>
diff --git a/src/output/OutputInit.cxx b/src/output/OutputInit.cxx
index 7815dc921..16180a415 100644
--- a/src/output/OutputInit.cxx
+++ b/src/output/OutputInit.cxx
@@ -24,10 +24,10 @@
 #include "OutputAPI.hxx"
 #include "filter/FilterConfig.hxx"
 #include "AudioParser.hxx"
-#include "MixerList.hxx"
-#include "MixerType.hxx"
-#include "MixerControl.hxx"
-#include "mixer/SoftwareMixerPlugin.hxx"
+#include "mixer/MixerList.hxx"
+#include "mixer/MixerType.hxx"
+#include "mixer/MixerControl.hxx"
+#include "mixer/plugins/SoftwareMixerPlugin.hxx"
 #include "filter/FilterPlugin.hxx"
 #include "filter/FilterRegistry.hxx"
 #include "filter/plugins/AutoConvertFilterPlugin.hxx"
diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx
index f2e4fc643..f2d6916a5 100644
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "AlsaOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "MixerList.hxx"
+#include "mixer/MixerList.hxx"
 #include "pcm/PcmExport.hxx"
 #include "util/Manual.hxx"
 #include "util/Error.hxx"
diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx
index cdf055df9..2157a9476 100644
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "OssOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "MixerList.hxx"
+#include "mixer/MixerList.hxx"
 #include "system/fd_util.h"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/output/plugins/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx
index c133d9796..6bb66450e 100644
--- a/src/output/plugins/PulseOutputPlugin.cxx
+++ b/src/output/plugins/PulseOutputPlugin.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "PulseOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "MixerList.hxx"
-#include "mixer/PulseMixerPlugin.hxx"
+#include "mixer/MixerList.hxx"
+#include "mixer/plugins/PulseMixerPlugin.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
diff --git a/src/output/plugins/RoarOutputPlugin.cxx b/src/output/plugins/RoarOutputPlugin.cxx
index 7c1c41b47..1192b2625 100644
--- a/src/output/plugins/RoarOutputPlugin.cxx
+++ b/src/output/plugins/RoarOutputPlugin.cxx
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "RoarOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "MixerList.hxx"
+#include "mixer/MixerList.hxx"
 #include "thread/Mutex.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/output/plugins/WinmmOutputPlugin.cxx b/src/output/plugins/WinmmOutputPlugin.cxx
index 87861180f..66d49eb9a 100644
--- a/src/output/plugins/WinmmOutputPlugin.cxx
+++ b/src/output/plugins/WinmmOutputPlugin.cxx
@@ -21,7 +21,7 @@
 #include "WinmmOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "pcm/PcmBuffer.hxx"
-#include "MixerList.hxx"
+#include "mixer/MixerList.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "util/Macros.hxx"
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx
index d080f46ca..1401a6a1e 100644
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "MixerControl.hxx"
-#include "MixerList.hxx"
+#include "mixer/MixerControl.hxx"
+#include "mixer/MixerList.hxx"
 #include "filter/FilterRegistry.hxx"
 #include "pcm/Volume.hxx"
 #include "GlobalEvents.hxx"
diff --git a/test/run_filter.cxx b/test/run_filter.cxx
index 3ce116280..7816827d7 100644
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@@ -26,7 +26,7 @@
 #include "filter/FilterPlugin.hxx"
 #include "filter/FilterInternal.hxx"
 #include "pcm/Volume.hxx"
-#include "MixerControl.hxx"
+#include "mixer/MixerControl.hxx"
 #include "stdbin.h"
 #include "util/Error.hxx"
 #include "system/FatalError.hxx"