output/*: move to output/plugins/

Makefile.am

@@ -913,23 +913,23 @@ OUTPUT_LIBS = \
 	$(SHOUT_LIBS)
 
 OUTPUT_API_SRC = \
-	src/OutputAPI.hxx \
-	src/OutputInternal.hxx \
-	src/OutputList.cxx src/OutputList.hxx \
-	src/OutputAll.cxx src/OutputAll.hxx \
-	src/OutputThread.cxx src/OutputThread.hxx \
-	src/OutputError.cxx src/OutputError.hxx \
-	src/OutputControl.cxx src/OutputControl.hxx \
-	src/OutputState.cxx src/OutputState.hxx \
-	src/OutputPrint.cxx src/OutputPrint.hxx \
-	src/OutputCommand.cxx src/OutputCommand.hxx \
-	src/OutputPlugin.cxx src/OutputPlugin.hxx \
-	src/OutputFinish.cxx \
-	src/OutputInit.cxx
+	src/output/OutputAPI.hxx \
+	src/output/OutputInternal.hxx \
+	src/output/OutputList.cxx src/output/OutputList.hxx \
+	src/output/OutputAll.cxx src/output/OutputAll.hxx \
+	src/output/OutputThread.cxx src/output/OutputThread.hxx \
+	src/output/OutputError.cxx src/output/OutputError.hxx \
+	src/output/OutputControl.cxx src/output/OutputControl.hxx \
+	src/output/OutputState.cxx src/output/OutputState.hxx \
+	src/output/OutputPrint.cxx src/output/OutputPrint.hxx \
+	src/output/OutputCommand.cxx src/output/OutputCommand.hxx \
+	src/output/OutputPlugin.cxx src/output/OutputPlugin.hxx \
+	src/output/OutputFinish.cxx \
+	src/output/OutputInit.cxx
 
 liboutput_plugins_a_SOURCES = \
-	src/output/NullOutputPlugin.cxx \
-	src/output/NullOutputPlugin.hxx
+	src/output/plugins/NullOutputPlugin.cxx \
+	src/output/plugins/NullOutputPlugin.hxx
 
 MIXER_LIBS = \
 	libmixer_plugins.a \
@@ -952,88 +952,100 @@ libmixer_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
 
 if HAVE_ALSA
 liboutput_plugins_a_SOURCES += \
-	src/output/AlsaOutputPlugin.cxx \
-	src/output/AlsaOutputPlugin.hxx
+	src/output/plugins/AlsaOutputPlugin.cxx \
+	src/output/plugins/AlsaOutputPlugin.hxx
 libmixer_plugins_a_SOURCES += src/mixer/AlsaMixerPlugin.cxx
 endif
 
 if HAVE_ROAR
 liboutput_plugins_a_SOURCES += \
-	src/output/RoarOutputPlugin.cxx src/output/RoarOutputPlugin.hxx
+	src/output/plugins/RoarOutputPlugin.cxx \
+	src/output/plugins/RoarOutputPlugin.hxx
 libmixer_plugins_a_SOURCES += src/mixer/RoarMixerPlugin.cxx
 endif
 
 if HAVE_AO
 liboutput_plugins_a_SOURCES += \
-	src/output/AoOutputPlugin.cxx src/output/AoOutputPlugin.hxx
+	src/output/plugins/AoOutputPlugin.cxx \
+	src/output/plugins/AoOutputPlugin.hxx
 endif
 
 if HAVE_FIFO
 liboutput_plugins_a_SOURCES += \
-	src/output/FifoOutputPlugin.cxx src/output/FifoOutputPlugin.hxx
+	src/output/plugins/FifoOutputPlugin.cxx \
+	src/output/plugins/FifoOutputPlugin.hxx
 endif
 
 if ENABLE_PIPE_OUTPUT
 liboutput_plugins_a_SOURCES += \
-	src/output/PipeOutputPlugin.cxx src/output/PipeOutputPlugin.hxx
+	src/output/plugins/PipeOutputPlugin.cxx \
+	src/output/plugins/PipeOutputPlugin.hxx
 endif
 
 if HAVE_JACK
 liboutput_plugins_a_SOURCES += \
-	src/output/JackOutputPlugin.cxx src/output/JackOutputPlugin.hxx
+	src/output/plugins/JackOutputPlugin.cxx \
+	src/output/plugins/JackOutputPlugin.hxx
 endif
 
 if HAVE_OSS
 liboutput_plugins_a_SOURCES += \
-	src/output/OssOutputPlugin.cxx \
-	src/output/OssOutputPlugin.hxx
+	src/output/plugins/OssOutputPlugin.cxx \
+	src/output/plugins/OssOutputPlugin.hxx
 libmixer_plugins_a_SOURCES += src/mixer/OssMixerPlugin.cxx
 endif
 
 if HAVE_OPENAL
 liboutput_plugins_a_SOURCES += \
-	src/output/OpenALOutputPlugin.cxx src/output/OpenALOutputPlugin.hxx
+	src/output/plugins/OpenALOutputPlugin.cxx \
+	src/output/plugins/OpenALOutputPlugin.hxx
 endif
 
 if HAVE_OSX
 liboutput_plugins_a_SOURCES += \
-	src/output/OSXOutputPlugin.cxx \
-	src/output/OSXOutputPlugin.hxx
+	src/output/plugins/OSXOutputPlugin.cxx \
+	src/output/plugins/OSXOutputPlugin.hxx
 endif
 
 if HAVE_PULSE
 liboutput_plugins_a_SOURCES += \
-	src/output/PulseOutputPlugin.cxx src/output/PulseOutputPlugin.hxx
+	src/output/plugins/PulseOutputPlugin.cxx \
+	src/output/plugins/PulseOutputPlugin.hxx
 libmixer_plugins_a_SOURCES += \
 	src/mixer/PulseMixerPlugin.cxx src/mixer/PulseMixerPlugin.hxx
 endif
 
 if HAVE_SHOUT
 liboutput_plugins_a_SOURCES += \
-	src/output/ShoutOutputPlugin.cxx src/output/ShoutOutputPlugin.hxx
+	src/output/plugins/ShoutOutputPlugin.cxx \
+	src/output/plugins/ShoutOutputPlugin.hxx
 endif
 
 if ENABLE_RECORDER_OUTPUT
 liboutput_plugins_a_SOURCES += \
-	src/output/RecorderOutputPlugin.cxx src/output/RecorderOutputPlugin.hxx
+	src/output/plugins/RecorderOutputPlugin.cxx \
+	src/output/plugins/RecorderOutputPlugin.hxx
 endif
 
 if ENABLE_HTTPD_OUTPUT
 liboutput_plugins_a_SOURCES += \
 	src/IcyMetaDataServer.cxx src/IcyMetaDataServer.hxx \
-	src/output/HttpdInternal.hxx \
-	src/output/HttpdClient.cxx src/output/HttpdClient.hxx \
-	src/output/HttpdOutputPlugin.cxx src/output/HttpdOutputPlugin.hxx
+	src/output/plugins/HttpdInternal.hxx \
+	src/output/plugins/HttpdClient.cxx \
+	src/output/plugins/HttpdClient.hxx \
+	src/output/plugins/HttpdOutputPlugin.cxx \
+	src/output/plugins/HttpdOutputPlugin.hxx
 endif
 
 if ENABLE_SOLARIS_OUTPUT
 liboutput_plugins_a_SOURCES += \
-	src/output/SolarisOutputPlugin.cxx src/output/SolarisOutputPlugin.hxx
+	src/output/plugins/SolarisOutputPlugin.cxx src/output/plugins/SolarisOutputPlugin.hxx
 endif
 
 if ENABLE_WINMM_OUTPUT
 liboutput_plugins_a_SOURCES += \
-	src/output/WinmmOutputPlugin.cxx src/output/WinmmOutputPlugin.hxx
+	src/output/plugins/WinmmOutputPlugin.cxx \
+	src/output/plugins/WinmmOutputPlugin.hxx
 libmixer_plugins_a_SOURCES += src/mixer/WinmmMixerPlugin.cxx
 endif
 
@@ -1528,9 +1540,9 @@ test_run_output_SOURCES = test/run_output.cxx \
 	src/AudioParser.cxx \
 	src/Timer.cxx \
 	src/Page.cxx \
-	src/OutputError.cxx \
-	src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \
-	src/OutputPlugin.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/FilterPlugin.cxx \

src/CommandLine.cxx

@@ -27,8 +27,8 @@
 #include "DatabasePlugin.hxx"
 #include "DecoderList.hxx"
 #include "DecoderPlugin.hxx"
-#include "OutputList.hxx"
-#include "OutputPlugin.hxx"
+#include "output/OutputList.hxx"
+#include "output/OutputPlugin.hxx"
 #include "InputRegistry.hxx"
 #include "InputPlugin.hxx"
 #include "playlist/PlaylistRegistry.hxx"

src/Main.cxx

@@ -37,7 +37,7 @@
 #include "command/AllCommands.hxx"
 #include "Partition.hxx"
 #include "Volume.hxx"
-#include "OutputAll.hxx"
+#include "output/OutputAll.hxx"
 #include "tag/TagConfig.hxx"
 #include "ReplayGainConfig.hxx"
 #include "Idle.hxx"

src/MixerAll.cxx

@@ -22,9 +22,9 @@
 #include "MixerControl.hxx"
 #include "MixerInternal.hxx"
 #include "MixerList.hxx"
-#include "OutputAll.hxx"
+#include "output/OutputAll.hxx"
+#include "output/OutputInternal.hxx"
 #include "pcm/Volume.hxx"
-#include "OutputInternal.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"

src/PlayerThread.cxx

@@ -28,7 +28,7 @@
 #include "system/FatalError.hxx"
 #include "CrossFade.hxx"
 #include "PlayerControl.hxx"
-#include "OutputAll.hxx"
+#include "output/OutputAll.hxx"
 #include "tag/Tag.hxx"
 #include "Idle.hxx"
 #include "GlobalEvents.hxx"

src/StateFile.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "StateFile.hxx"
-#include "OutputState.hxx"
+#include "output/OutputState.hxx"
 #include "PlaylistState.hxx"
 #include "fs/TextFile.hxx"
 #include "Partition.hxx"

src/command/OutputCommands.cxx

@@ -19,8 +19,8 @@
 
 #include "config.h"
 #include "OutputCommands.hxx"
-#include "OutputPrint.hxx"
-#include "OutputCommand.hxx"
+#include "output/OutputPrint.hxx"
+#include "output/OutputCommand.hxx"
 #include "protocol/Result.hxx"
 #include "protocol/ArgParser.hxx"
 

src/command/PlayerCommands.cxx

@@ -25,7 +25,7 @@
 #include "UpdateGlue.hxx"
 #include "Client.hxx"
 #include "Volume.hxx"
-#include "OutputAll.hxx"
+#include "output/OutputAll.hxx"
 #include "Partition.hxx"
 #include "protocol/Result.hxx"
 #include "protocol/ArgParser.hxx"

src/mixer/AlsaMixerPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "MixerInternal.hxx"
-#include "OutputAPI.hxx"
+#include "output/OutputAPI.hxx"
 #include "GlobalEvents.hxx"
 #include "Main.hxx"
 #include "event/MultiSocketMonitor.hxx"

src/mixer/PulseMixerPlugin.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "PulseMixerPlugin.hxx"
 #include "MixerInternal.hxx"
-#include "output/PulseOutputPlugin.hxx"
+#include "output/plugins/PulseOutputPlugin.hxx"
 #include "GlobalEvents.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"

src/mixer/RoarMixerPlugin.cxx

@@ -21,7 +21,7 @@
 
 #include "config.h"
 #include "MixerInternal.hxx"
-#include "output/RoarOutputPlugin.hxx"
+#include "output/plugins/RoarOutputPlugin.hxx"
 #include "Compiler.h"
 
 struct RoarMixer final : public Mixer {

src/mixer/WinmmMixerPlugin.cxx

@@ -19,8 +19,8 @@
 
 #include "config.h"
 #include "MixerInternal.hxx"
-#include "OutputAPI.hxx"
-#include "output/WinmmOutputPlugin.hxx"
+#include "output/OutputAPI.hxx"
+#include "output/plugins/WinmmOutputPlugin.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 

src/OutputList.cxx → src/output/OutputList.cxx

@@ -20,22 +20,22 @@
 #include "config.h"
 #include "OutputList.hxx"
 #include "OutputAPI.hxx"
-#include "output/AlsaOutputPlugin.hxx"
-#include "output/AoOutputPlugin.hxx"
-#include "output/FifoOutputPlugin.hxx"
-#include "output/HttpdOutputPlugin.hxx"
-#include "output/JackOutputPlugin.hxx"
-#include "output/NullOutputPlugin.hxx"
-#include "output/OpenALOutputPlugin.hxx"
-#include "output/OssOutputPlugin.hxx"
-#include "output/OSXOutputPlugin.hxx"
-#include "output/PipeOutputPlugin.hxx"
-#include "output/PulseOutputPlugin.hxx"
-#include "output/RecorderOutputPlugin.hxx"
-#include "output/RoarOutputPlugin.hxx"
-#include "output/ShoutOutputPlugin.hxx"
-#include "output/SolarisOutputPlugin.hxx"
-#include "output/WinmmOutputPlugin.hxx"
+#include "plugins/AlsaOutputPlugin.hxx"
+#include "plugins/AoOutputPlugin.hxx"
+#include "plugins/FifoOutputPlugin.hxx"
+#include "plugins/HttpdOutputPlugin.hxx"
+#include "plugins/JackOutputPlugin.hxx"
+#include "plugins/NullOutputPlugin.hxx"
+#include "plugins/OpenALOutputPlugin.hxx"
+#include "plugins/OssOutputPlugin.hxx"
+#include "plugins/OSXOutputPlugin.hxx"
+#include "plugins/PipeOutputPlugin.hxx"
+#include "plugins/PulseOutputPlugin.hxx"
+#include "plugins/RecorderOutputPlugin.hxx"
+#include "plugins/RoarOutputPlugin.hxx"
+#include "plugins/ShoutOutputPlugin.hxx"
+#include "plugins/SolarisOutputPlugin.hxx"
+#include "plugins/WinmmOutputPlugin.hxx"
 
 #include <string.h>
 

src/output/AlsaOutputPlugin.cxx → src/output/plugins/AlsaOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "AlsaOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "MixerList.hxx"
 #include "pcm/PcmExport.hxx"
 #include "util/Manual.hxx"

src/output/AoOutputPlugin.cxx → src/output/plugins/AoOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "AoOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"

src/output/FifoOutputPlugin.cxx → src/output/plugins/FifoOutputPlugin.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "FifoOutputPlugin.hxx"
 #include "ConfigError.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "Timer.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"

src/output/HttpdInternal.hxx → src/output/plugins/HttpdInternal.hxx

@@ -25,7 +25,7 @@
 #ifndef MPD_OUTPUT_HTTPD_INTERNAL_H
 #define MPD_OUTPUT_HTTPD_INTERNAL_H
 
-#include "OutputInternal.hxx"
+#include "../OutputInternal.hxx"
 #include "Timer.hxx"
 #include "thread/Mutex.hxx"
 #include "event/ServerSocket.hxx"

src/output/HttpdOutputPlugin.cxx → src/output/plugins/HttpdOutputPlugin.cxx

@@ -21,7 +21,7 @@
 #include "HttpdOutputPlugin.hxx"
 #include "HttpdInternal.hxx"
 #include "HttpdClient.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "encoder/EncoderPlugin.hxx"
 #include "encoder/EncoderList.hxx"
 #include "system/Resolver.hxx"

src/output/JackOutputPlugin.cxx → src/output/plugins/JackOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "JackOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "ConfigError.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"

src/output/NullOutputPlugin.cxx → src/output/plugins/NullOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "NullOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "Timer.hxx"
 
 struct NullOutput {

src/output/OSXOutputPlugin.cxx → src/output/plugins/OSXOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "OSXOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "util/DynamicFifoBuffer.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"

src/output/OpenALOutputPlugin.cxx → src/output/plugins/OpenALOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "OpenALOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 

src/output/OssOutputPlugin.cxx → src/output/plugins/OssOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "OssOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "MixerList.hxx"
 #include "system/fd_util.h"
 #include "util/Error.hxx"

src/output/PipeOutputPlugin.cxx → src/output/plugins/PipeOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PipeOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "ConfigError.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"

src/output/PulseOutputPlugin.cxx → src/output/plugins/PulseOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PulseOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "MixerList.hxx"
 #include "mixer/PulseMixerPlugin.hxx"
 #include "util/Error.hxx"

src/output/RecorderOutputPlugin.cxx → src/output/plugins/RecorderOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "RecorderOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "encoder/EncoderPlugin.hxx"
 #include "encoder/EncoderList.hxx"
 #include "ConfigError.hxx"

src/output/RoarOutputPlugin.cxx → src/output/plugins/RoarOutputPlugin.cxx

@@ -20,7 +20,7 @@
 
 #include "config.h"
 #include "RoarOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "MixerList.hxx"
 #include "thread/Mutex.hxx"
 #include "util/Error.hxx"

src/output/ShoutOutputPlugin.cxx → src/output/plugins/ShoutOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "ShoutOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "encoder/EncoderPlugin.hxx"
 #include "encoder/EncoderList.hxx"
 #include "ConfigError.hxx"

src/output/SolarisOutputPlugin.cxx → src/output/plugins/SolarisOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "SolarisOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "system/fd_util.h"
 #include "util/Error.hxx"
 

src/output/WinmmOutputPlugin.cxx → src/output/plugins/WinmmOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "WinmmOutputPlugin.hxx"
-#include "OutputAPI.hxx"
+#include "../OutputAPI.hxx"
 #include "pcm/PcmBuffer.hxx"
 #include "MixerList.hxx"
 #include "util/Error.hxx"

test/read_mixer.cxx

@@ -38,7 +38,7 @@
 EventLoop *main_loop;
 
 #ifdef HAVE_PULSE
-#include "output/PulseOutputPlugin.hxx"
+#include "output/plugins/PulseOutputPlugin.hxx"
 
 void
 pulse_output_lock(gcc_unused PulseOutput *po)
@@ -73,7 +73,7 @@ pulse_output_set_volume(gcc_unused PulseOutput *po,
 #endif
 
 #ifdef HAVE_ROAR
-#include "output/RoarOutputPlugin.hxx"
+#include "output/plugins/RoarOutputPlugin.hxx"
 
 int
 roar_output_get_volume(gcc_unused RoarOutput *roar)

test/run_output.cxx

@@ -18,9 +18,9 @@
  */
 
 #include "config.h"
-#include "OutputControl.hxx"
-#include "OutputInternal.hxx"
-#include "OutputPlugin.hxx"
+#include "output/OutputControl.hxx"
+#include "output/OutputInternal.hxx"
+#include "output/OutputPlugin.hxx"
 #include "ConfigData.hxx"
 #include "ConfigGlobal.hxx"
 #include "ConfigOption.hxx"