diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile.am | 88 | ||||
| -rw-r--r-- | src/CommandLine.cxx | 4 | ||||
| -rw-r--r-- | src/Main.cxx | 2 | ||||
| -rw-r--r-- | src/MixerAll.cxx | 4 | ||||
| -rw-r--r-- | src/PlayerThread.cxx | 2 | ||||
| -rw-r--r-- | src/StateFile.cxx | 2 | ||||
| -rw-r--r-- | src/command/OutputCommands.cxx | 4 | ||||
| -rw-r--r-- | src/command/PlayerCommands.cxx | 2 | ||||
| -rw-r--r-- | src/mixer/AlsaMixerPlugin.cxx | 2 | ||||
| -rw-r--r-- | src/mixer/PulseMixerPlugin.cxx | 2 | ||||
| -rw-r--r-- | src/mixer/RoarMixerPlugin.cxx | 2 | ||||
| -rw-r--r-- | src/mixer/WinmmMixerPlugin.cxx | 4 | ||||
| -rw-r--r-- | src/output/OutputAPI.hxx (renamed from src/OutputAPI.hxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputAll.cxx (renamed from src/OutputAll.cxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputAll.hxx (renamed from src/OutputAll.hxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputCommand.cxx (renamed from src/OutputCommand.cxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputCommand.hxx (renamed from src/OutputCommand.hxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputControl.cxx (renamed from src/OutputControl.cxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputControl.hxx (renamed from src/OutputControl.hxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputError.cxx (renamed from src/OutputError.cxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputError.hxx (renamed from src/OutputError.hxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputFinish.cxx (renamed from src/OutputFinish.cxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputInit.cxx (renamed from src/OutputInit.cxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputInternal.hxx (renamed from src/OutputInternal.hxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputList.cxx (renamed from src/OutputList.cxx) | 32 | ||||
| -rw-r--r-- | src/output/OutputList.hxx (renamed from src/OutputList.hxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputPlugin.cxx (renamed from src/OutputPlugin.cxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputPlugin.hxx (renamed from src/OutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputPrint.cxx (renamed from src/OutputPrint.cxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputPrint.hxx (renamed from src/OutputPrint.hxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputState.cxx (renamed from src/OutputState.cxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputState.hxx (renamed from src/OutputState.hxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputThread.cxx (renamed from src/OutputThread.cxx) | 0 | ||||
| -rw-r--r-- | src/output/OutputThread.hxx (renamed from src/OutputThread.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/AlsaOutputPlugin.cxx (renamed from src/output/AlsaOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/AlsaOutputPlugin.hxx (renamed from src/output/AlsaOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/AoOutputPlugin.cxx (renamed from src/output/AoOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/AoOutputPlugin.hxx (renamed from src/output/AoOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/FifoOutputPlugin.cxx (renamed from src/output/FifoOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/FifoOutputPlugin.hxx (renamed from src/output/FifoOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/HttpdClient.cxx (renamed from src/output/HttpdClient.cxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/HttpdClient.hxx (renamed from src/output/HttpdClient.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/HttpdInternal.hxx (renamed from src/output/HttpdInternal.hxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/HttpdOutputPlugin.cxx (renamed from src/output/HttpdOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/HttpdOutputPlugin.hxx (renamed from src/output/HttpdOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/JackOutputPlugin.cxx (renamed from src/output/JackOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/JackOutputPlugin.hxx (renamed from src/output/JackOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/NullOutputPlugin.cxx (renamed from src/output/NullOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/NullOutputPlugin.hxx (renamed from src/output/NullOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/OSXOutputPlugin.cxx (renamed from src/output/OSXOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/OSXOutputPlugin.hxx (renamed from src/output/OSXOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/OpenALOutputPlugin.cxx (renamed from src/output/OpenALOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/OpenALOutputPlugin.hxx (renamed from src/output/OpenALOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/OssOutputPlugin.cxx (renamed from src/output/OssOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/OssOutputPlugin.hxx (renamed from src/output/OssOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/PipeOutputPlugin.cxx (renamed from src/output/PipeOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/PipeOutputPlugin.hxx (renamed from src/output/PipeOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/PulseOutputPlugin.cxx (renamed from src/output/PulseOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/PulseOutputPlugin.hxx (renamed from src/output/PulseOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/RecorderOutputPlugin.cxx (renamed from src/output/RecorderOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/RecorderOutputPlugin.hxx (renamed from src/output/RecorderOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/RoarOutputPlugin.cxx (renamed from src/output/RoarOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/RoarOutputPlugin.hxx (renamed from src/output/RoarOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/ShoutOutputPlugin.cxx (renamed from src/output/ShoutOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/ShoutOutputPlugin.hxx (renamed from src/output/ShoutOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/SolarisOutputPlugin.cxx (renamed from src/output/SolarisOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/SolarisOutputPlugin.hxx (renamed from src/output/SolarisOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/WinmmOutputPlugin.cxx (renamed from src/output/WinmmOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/WinmmOutputPlugin.hxx (renamed from src/output/WinmmOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | test/read_mixer.cxx | 4 | ||||
| -rw-r--r-- | test/run_output.cxx | 6 |
71 files changed, 103 insertions, 91 deletions
diff --git a/Makefile.am b/Makefile.am index 371d46a1b..541494c21 100644 --- a/Makefile.am +++ b/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 \ diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 0667844f6..97cc2b18e 100644 --- a/src/CommandLine.cxx +++ b/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" diff --git a/src/Main.cxx b/src/Main.cxx index 8808a78d9..9eb39a7e2 100644 --- a/src/Main.cxx +++ b/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" diff --git a/src/MixerAll.cxx b/src/MixerAll.cxx index 2310048c4..3cc92baee 100644 --- a/src/MixerAll.cxx +++ b/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" diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx index 750a1732a..bde3c1372 100644 --- a/src/PlayerThread.cxx +++ b/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" diff --git a/src/StateFile.cxx b/src/StateFile.cxx index 392b3454b..06b7f0779 100644 --- a/src/StateFile.cxx +++ b/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" diff --git a/src/command/OutputCommands.cxx b/src/command/OutputCommands.cxx index 5f708bf0d..4ed3b89f1 100644 --- a/src/command/OutputCommands.cxx +++ b/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" diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx index 196fcc0bd..ae7a7ba89 100644 --- a/src/command/PlayerCommands.cxx +++ b/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" diff --git a/src/mixer/AlsaMixerPlugin.cxx b/src/mixer/AlsaMixerPlugin.cxx index 86a949a8f..9d04ad98b 100644 --- a/src/mixer/AlsaMixerPlugin.cxx +++ b/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" diff --git a/src/mixer/PulseMixerPlugin.cxx b/src/mixer/PulseMixerPlugin.cxx index 4d07a0b68..a379cebae 100644 --- a/src/mixer/PulseMixerPlugin.cxx +++ b/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" diff --git a/src/mixer/RoarMixerPlugin.cxx b/src/mixer/RoarMixerPlugin.cxx index 839b35a6b..18f8c14f8 100644 --- a/src/mixer/RoarMixerPlugin.cxx +++ b/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 { diff --git a/src/mixer/WinmmMixerPlugin.cxx b/src/mixer/WinmmMixerPlugin.cxx index bd0ec4b09..6f10fd71b 100644 --- a/src/mixer/WinmmMixerPlugin.cxx +++ b/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" diff --git a/src/OutputAPI.hxx b/src/output/OutputAPI.hxx index 322ed3971..322ed3971 100644 --- a/src/OutputAPI.hxx +++ b/src/output/OutputAPI.hxx diff --git a/src/OutputAll.cxx b/src/output/OutputAll.cxx index b3623f1af..b3623f1af 100644 --- a/src/OutputAll.cxx +++ b/src/output/OutputAll.cxx diff --git a/src/OutputAll.hxx b/src/output/OutputAll.hxx index b6166eb48..b6166eb48 100644 --- a/src/OutputAll.hxx +++ b/src/output/OutputAll.hxx diff --git a/src/OutputCommand.cxx b/src/output/OutputCommand.cxx index 839e9bd88..839e9bd88 100644 --- a/src/OutputCommand.cxx +++ b/src/output/OutputCommand.cxx diff --git a/src/OutputCommand.hxx b/src/output/OutputCommand.hxx index 4c44dff53..4c44dff53 100644 --- a/src/OutputCommand.hxx +++ b/src/output/OutputCommand.hxx diff --git a/src/OutputControl.cxx b/src/output/OutputControl.cxx index b938754fd..b938754fd 100644 --- a/src/OutputControl.cxx +++ b/src/output/OutputControl.cxx diff --git a/src/OutputControl.hxx b/src/output/OutputControl.hxx index 7195412ef..7195412ef 100644 --- a/src/OutputControl.hxx +++ b/src/output/OutputControl.hxx diff --git a/src/OutputError.cxx b/src/output/OutputError.cxx index 9d4128912..9d4128912 100644 --- a/src/OutputError.cxx +++ b/src/output/OutputError.cxx diff --git a/src/OutputError.hxx b/src/output/OutputError.hxx index e3a20142f..e3a20142f 100644 --- a/src/OutputError.hxx +++ b/src/output/OutputError.hxx diff --git a/src/OutputFinish.cxx b/src/output/OutputFinish.cxx index 43f0dd1ec..43f0dd1ec 100644 --- a/src/OutputFinish.cxx +++ b/src/output/OutputFinish.cxx diff --git a/src/OutputInit.cxx b/src/output/OutputInit.cxx index f5b1bdc81..f5b1bdc81 100644 --- a/src/OutputInit.cxx +++ b/src/output/OutputInit.cxx diff --git a/src/OutputInternal.hxx b/src/output/OutputInternal.hxx index 18404dc01..18404dc01 100644 --- a/src/OutputInternal.hxx +++ b/src/output/OutputInternal.hxx diff --git a/src/OutputList.cxx b/src/output/OutputList.cxx index a190da543..b914e6d2e 100644 --- a/src/OutputList.cxx +++ b/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> diff --git a/src/OutputList.hxx b/src/output/OutputList.hxx index dfcf7487c..dfcf7487c 100644 --- a/src/OutputList.hxx +++ b/src/output/OutputList.hxx diff --git a/src/OutputPlugin.cxx b/src/output/OutputPlugin.cxx index 29fd6455a..29fd6455a 100644 --- a/src/OutputPlugin.cxx +++ b/src/output/OutputPlugin.cxx diff --git a/src/OutputPlugin.hxx b/src/output/OutputPlugin.hxx index 7d77c92b2..7d77c92b2 100644 --- a/src/OutputPlugin.hxx +++ b/src/output/OutputPlugin.hxx diff --git a/src/OutputPrint.cxx b/src/output/OutputPrint.cxx index ee4424df2..ee4424df2 100644 --- a/src/OutputPrint.cxx +++ b/src/output/OutputPrint.cxx diff --git a/src/OutputPrint.hxx b/src/output/OutputPrint.hxx index 2d94226fd..2d94226fd 100644 --- a/src/OutputPrint.hxx +++ b/src/output/OutputPrint.hxx diff --git a/src/OutputState.cxx b/src/output/OutputState.cxx index 1141abeda..1141abeda 100644 --- a/src/OutputState.cxx +++ b/src/output/OutputState.cxx diff --git a/src/OutputState.hxx b/src/output/OutputState.hxx index a68180ae4..a68180ae4 100644 --- a/src/OutputState.hxx +++ b/src/output/OutputState.hxx diff --git a/src/OutputThread.cxx b/src/output/OutputThread.cxx index f7e28b5f4..f7e28b5f4 100644 --- a/src/OutputThread.cxx +++ b/src/output/OutputThread.cxx diff --git a/src/OutputThread.hxx b/src/output/OutputThread.hxx index 1cdbd65f2..1cdbd65f2 100644 --- a/src/OutputThread.hxx +++ b/src/output/OutputThread.hxx diff --git a/src/output/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx index 87370ba99..f2e4fc643 100644 --- a/src/output/AlsaOutputPlugin.cxx +++ b/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" diff --git a/src/output/AlsaOutputPlugin.hxx b/src/output/plugins/AlsaOutputPlugin.hxx index 63508e041..63508e041 100644 --- a/src/output/AlsaOutputPlugin.hxx +++ b/src/output/plugins/AlsaOutputPlugin.hxx diff --git a/src/output/AoOutputPlugin.cxx b/src/output/plugins/AoOutputPlugin.cxx index e6cd0b916..efc1e0c6e 100644 --- a/src/output/AoOutputPlugin.cxx +++ b/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" diff --git a/src/output/AoOutputPlugin.hxx b/src/output/plugins/AoOutputPlugin.hxx index cbf2fd589..cbf2fd589 100644 --- a/src/output/AoOutputPlugin.hxx +++ b/src/output/plugins/AoOutputPlugin.hxx diff --git a/src/output/FifoOutputPlugin.cxx b/src/output/plugins/FifoOutputPlugin.cxx index 9e5a1d5d2..5f14bcbbe 100644 --- a/src/output/FifoOutputPlugin.cxx +++ b/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" diff --git a/src/output/FifoOutputPlugin.hxx b/src/output/plugins/FifoOutputPlugin.hxx index 394ec3ae9..394ec3ae9 100644 --- a/src/output/FifoOutputPlugin.hxx +++ b/src/output/plugins/FifoOutputPlugin.hxx diff --git a/src/output/HttpdClient.cxx b/src/output/plugins/HttpdClient.cxx index d761bdf57..d761bdf57 100644 --- a/src/output/HttpdClient.cxx +++ b/src/output/plugins/HttpdClient.cxx diff --git a/src/output/HttpdClient.hxx b/src/output/plugins/HttpdClient.hxx index f94f05769..f94f05769 100644 --- a/src/output/HttpdClient.hxx +++ b/src/output/plugins/HttpdClient.hxx diff --git a/src/output/HttpdInternal.hxx b/src/output/plugins/HttpdInternal.hxx index 2ef0831ba..506730d11 100644 --- a/src/output/HttpdInternal.hxx +++ b/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" diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/plugins/HttpdOutputPlugin.cxx index 322c9a61e..6921cb808 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/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" diff --git a/src/output/HttpdOutputPlugin.hxx b/src/output/plugins/HttpdOutputPlugin.hxx index 78218e5f0..78218e5f0 100644 --- a/src/output/HttpdOutputPlugin.hxx +++ b/src/output/plugins/HttpdOutputPlugin.hxx diff --git a/src/output/JackOutputPlugin.cxx b/src/output/plugins/JackOutputPlugin.cxx index c65ae5225..5a0d2bf16 100644 --- a/src/output/JackOutputPlugin.cxx +++ b/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" diff --git a/src/output/JackOutputPlugin.hxx b/src/output/plugins/JackOutputPlugin.hxx index ee3fe9238..ee3fe9238 100644 --- a/src/output/JackOutputPlugin.hxx +++ b/src/output/plugins/JackOutputPlugin.hxx diff --git a/src/output/NullOutputPlugin.cxx b/src/output/plugins/NullOutputPlugin.cxx index 0b6476239..c336d86e6 100644 --- a/src/output/NullOutputPlugin.cxx +++ b/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 { diff --git a/src/output/NullOutputPlugin.hxx b/src/output/plugins/NullOutputPlugin.hxx index 05b8ef3d8..05b8ef3d8 100644 --- a/src/output/NullOutputPlugin.hxx +++ b/src/output/plugins/NullOutputPlugin.hxx diff --git a/src/output/OSXOutputPlugin.cxx b/src/output/plugins/OSXOutputPlugin.cxx index 6c8467752..c247336d7 100644 --- a/src/output/OSXOutputPlugin.cxx +++ b/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" diff --git a/src/output/OSXOutputPlugin.hxx b/src/output/plugins/OSXOutputPlugin.hxx index 0de10f83e..0de10f83e 100644 --- a/src/output/OSXOutputPlugin.hxx +++ b/src/output/plugins/OSXOutputPlugin.hxx diff --git a/src/output/OpenALOutputPlugin.cxx b/src/output/plugins/OpenALOutputPlugin.cxx index 52a2c9070..f590f0ea0 100644 --- a/src/output/OpenALOutputPlugin.cxx +++ b/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" diff --git a/src/output/OpenALOutputPlugin.hxx b/src/output/plugins/OpenALOutputPlugin.hxx index eb43d1aa5..eb43d1aa5 100644 --- a/src/output/OpenALOutputPlugin.hxx +++ b/src/output/plugins/OpenALOutputPlugin.hxx diff --git a/src/output/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx index 24f3f48b5..cdf055df9 100644 --- a/src/output/OssOutputPlugin.cxx +++ b/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" diff --git a/src/output/OssOutputPlugin.hxx b/src/output/plugins/OssOutputPlugin.hxx index 4762fa652..4762fa652 100644 --- a/src/output/OssOutputPlugin.hxx +++ b/src/output/plugins/OssOutputPlugin.hxx diff --git a/src/output/PipeOutputPlugin.cxx b/src/output/plugins/PipeOutputPlugin.cxx index 66d5a28ae..802e1ba4d 100644 --- a/src/output/PipeOutputPlugin.cxx +++ b/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" diff --git a/src/output/PipeOutputPlugin.hxx b/src/output/plugins/PipeOutputPlugin.hxx index 42b01b9f7..42b01b9f7 100644 --- a/src/output/PipeOutputPlugin.hxx +++ b/src/output/plugins/PipeOutputPlugin.hxx diff --git a/src/output/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx index dd1906f53..c133d9796 100644 --- a/src/output/PulseOutputPlugin.cxx +++ b/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" diff --git a/src/output/PulseOutputPlugin.hxx b/src/output/plugins/PulseOutputPlugin.hxx index 9df557282..9df557282 100644 --- a/src/output/PulseOutputPlugin.hxx +++ b/src/output/plugins/PulseOutputPlugin.hxx diff --git a/src/output/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx index cebbc2cec..16fe2c692 100644 --- a/src/output/RecorderOutputPlugin.cxx +++ b/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" diff --git a/src/output/RecorderOutputPlugin.hxx b/src/output/plugins/RecorderOutputPlugin.hxx index 4fac911a1..4fac911a1 100644 --- a/src/output/RecorderOutputPlugin.hxx +++ b/src/output/plugins/RecorderOutputPlugin.hxx diff --git a/src/output/RoarOutputPlugin.cxx b/src/output/plugins/RoarOutputPlugin.cxx index 9634379c5..7c1c41b47 100644 --- a/src/output/RoarOutputPlugin.cxx +++ b/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" diff --git a/src/output/RoarOutputPlugin.hxx b/src/output/plugins/RoarOutputPlugin.hxx index 27c5dc420..27c5dc420 100644 --- a/src/output/RoarOutputPlugin.hxx +++ b/src/output/plugins/RoarOutputPlugin.hxx diff --git a/src/output/ShoutOutputPlugin.cxx b/src/output/plugins/ShoutOutputPlugin.cxx index cccd3e0ba..e0ec6ce3d 100644 --- a/src/output/ShoutOutputPlugin.cxx +++ b/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" diff --git a/src/output/ShoutOutputPlugin.hxx b/src/output/plugins/ShoutOutputPlugin.hxx index d437e0b0d..d437e0b0d 100644 --- a/src/output/ShoutOutputPlugin.hxx +++ b/src/output/plugins/ShoutOutputPlugin.hxx diff --git a/src/output/SolarisOutputPlugin.cxx b/src/output/plugins/SolarisOutputPlugin.cxx index c06c848d1..38ed2e314 100644 --- a/src/output/SolarisOutputPlugin.cxx +++ b/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" diff --git a/src/output/SolarisOutputPlugin.hxx b/src/output/plugins/SolarisOutputPlugin.hxx index 9ce848a40..9ce848a40 100644 --- a/src/output/SolarisOutputPlugin.hxx +++ b/src/output/plugins/SolarisOutputPlugin.hxx diff --git a/src/output/WinmmOutputPlugin.cxx b/src/output/plugins/WinmmOutputPlugin.cxx index bc4ca9386..87861180f 100644 --- a/src/output/WinmmOutputPlugin.cxx +++ b/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" diff --git a/src/output/WinmmOutputPlugin.hxx b/src/output/plugins/WinmmOutputPlugin.hxx index 1409a2e8c..1409a2e8c 100644 --- a/src/output/WinmmOutputPlugin.hxx +++ b/src/output/plugins/WinmmOutputPlugin.hxx diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx index 0c1192587..41261a310 100644 --- a/test/read_mixer.cxx +++ b/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) diff --git a/test/run_output.cxx b/test/run_output.cxx index 69dbbf7b3..c18451e10 100644 --- a/test/run_output.cxx +++ b/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" |