diff options
| -rw-r--r-- | Makefile.am | 44 | ||||
| -rw-r--r-- | src/filter/FilterConfig.cxx (renamed from src/FilterConfig.cxx) | 2 | ||||
| -rw-r--r-- | src/filter/FilterConfig.hxx (renamed from src/FilterConfig.hxx) | 0 | ||||
| -rw-r--r-- | src/filter/FilterInternal.hxx (renamed from src/FilterInternal.hxx) | 0 | ||||
| -rw-r--r-- | src/filter/FilterPlugin.cxx (renamed from src/FilterPlugin.cxx) | 0 | ||||
| -rw-r--r-- | src/filter/FilterPlugin.hxx (renamed from src/FilterPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/filter/FilterRegistry.cxx (renamed from src/FilterRegistry.cxx) | 0 | ||||
| -rw-r--r-- | src/filter/FilterRegistry.hxx (renamed from src/FilterRegistry.hxx) | 0 | ||||
| -rw-r--r-- | src/filter/plugins/AutoConvertFilterPlugin.cxx (renamed from src/filter/AutoConvertFilterPlugin.cxx) | 6 | ||||
| -rw-r--r-- | src/filter/plugins/AutoConvertFilterPlugin.hxx (renamed from src/filter/AutoConvertFilterPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/filter/plugins/ChainFilterPlugin.cxx (renamed from src/filter/ChainFilterPlugin.cxx) | 6 | ||||
| -rw-r--r-- | src/filter/plugins/ChainFilterPlugin.hxx (renamed from src/filter/ChainFilterPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/filter/plugins/ConvertFilterPlugin.cxx (renamed from src/filter/ConvertFilterPlugin.cxx) | 6 | ||||
| -rw-r--r-- | src/filter/plugins/ConvertFilterPlugin.hxx (renamed from src/filter/ConvertFilterPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/filter/plugins/NormalizeFilterPlugin.cxx (renamed from src/filter/NormalizeFilterPlugin.cxx) | 6 | ||||
| -rw-r--r-- | src/filter/plugins/NullFilterPlugin.cxx (renamed from src/filter/NullFilterPlugin.cxx) | 6 | ||||
| -rw-r--r-- | src/filter/plugins/ReplayGainFilterPlugin.cxx (renamed from src/filter/ReplayGainFilterPlugin.cxx) | 6 | ||||
| -rw-r--r-- | src/filter/plugins/ReplayGainFilterPlugin.hxx (renamed from src/filter/ReplayGainFilterPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/filter/plugins/RouteFilterPlugin.cxx (renamed from src/filter/RouteFilterPlugin.cxx) | 6 | ||||
| -rw-r--r-- | src/filter/plugins/VolumeFilterPlugin.cxx (renamed from src/filter/VolumeFilterPlugin.cxx) | 6 | ||||
| -rw-r--r-- | src/filter/plugins/VolumeFilterPlugin.hxx (renamed from src/filter/VolumeFilterPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/mixer/SoftwareMixerPlugin.cxx | 8 | ||||
| -rw-r--r-- | src/output/OutputControl.cxx | 2 | ||||
| -rw-r--r-- | src/output/OutputFinish.cxx | 2 | ||||
| -rw-r--r-- | src/output/OutputInit.cxx | 12 | ||||
| -rw-r--r-- | src/output/OutputThread.cxx | 6 | ||||
| -rw-r--r-- | test/read_mixer.cxx | 2 | ||||
| -rw-r--r-- | test/run_filter.cxx | 6 | ||||
| -rw-r--r-- | test/run_output.cxx | 2 |
29 files changed, 67 insertions, 67 deletions
diff --git a/Makefile.am b/Makefile.am index fe069ac79..e909bc111 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,10 +118,10 @@ src_mpd_SOURCES = \ src/db/Visitor.hxx \ src/db/Selection.cxx src/db/Selection.hxx \ src/ExcludeList.cxx src/ExcludeList.hxx \ - src/FilterConfig.cxx src/FilterConfig.hxx \ - src/FilterPlugin.cxx src/FilterPlugin.hxx \ - src/FilterInternal.hxx \ - src/FilterRegistry.cxx src/FilterRegistry.hxx \ + src/filter/FilterConfig.cxx src/filter/FilterConfig.hxx \ + src/filter/FilterPlugin.cxx src/filter/FilterPlugin.hxx \ + src/filter/FilterInternal.hxx \ + src/filter/FilterRegistry.cxx src/filter/FilterRegistry.hxx \ src/db/update/UpdateDomain.cxx src/db/update/UpdateDomain.hxx \ src/db/update/UpdateGlue.cxx src/db/update/UpdateGlue.hxx \ src/db/update/UpdateQueue.cxx src/db/update/UpdateQueue.hxx \ @@ -1112,19 +1112,19 @@ endif # libfilter_plugins_a_SOURCES = \ - src/filter/NullFilterPlugin.cxx \ - src/filter/ChainFilterPlugin.cxx \ - src/filter/ChainFilterPlugin.hxx \ - src/filter/AutoConvertFilterPlugin.cxx \ - src/filter/AutoConvertFilterPlugin.hxx \ - src/filter/ConvertFilterPlugin.cxx \ - src/filter/ConvertFilterPlugin.hxx \ - src/filter/RouteFilterPlugin.cxx \ - src/filter/NormalizeFilterPlugin.cxx \ - src/filter/ReplayGainFilterPlugin.cxx \ - src/filter/ReplayGainFilterPlugin.hxx \ - src/filter/VolumeFilterPlugin.cxx \ - src/filter/VolumeFilterPlugin.hxx + src/filter/plugins/NullFilterPlugin.cxx \ + src/filter/plugins/ChainFilterPlugin.cxx \ + src/filter/plugins/ChainFilterPlugin.hxx \ + src/filter/plugins/AutoConvertFilterPlugin.cxx \ + src/filter/plugins/AutoConvertFilterPlugin.hxx \ + src/filter/plugins/ConvertFilterPlugin.cxx \ + src/filter/plugins/ConvertFilterPlugin.hxx \ + src/filter/plugins/RouteFilterPlugin.cxx \ + src/filter/plugins/NormalizeFilterPlugin.cxx \ + src/filter/plugins/ReplayGainFilterPlugin.cxx \ + src/filter/plugins/ReplayGainFilterPlugin.hxx \ + src/filter/plugins/VolumeFilterPlugin.cxx \ + src/filter/plugins/VolumeFilterPlugin.hxx FILTER_LIBS = \ libfilter_plugins.a \ @@ -1414,7 +1414,7 @@ test_run_filter_SOURCES = test/run_filter.cxx \ test/FakeReplayGainConfig.cxx \ test/stdbin.h \ src/Log.cxx src/LogBackend.cxx \ - src/FilterPlugin.cxx src/FilterRegistry.cxx \ + src/filter/FilterPlugin.cxx src/filter/FilterRegistry.cxx \ src/CheckAudioFormat.cxx \ src/AudioFormat.cxx \ src/AudioParser.cxx \ @@ -1542,8 +1542,8 @@ test_run_output_SOURCES = test/run_output.cxx \ src/output/OutputPlugin.cxx \ src/MixerControl.cxx \ src/MixerType.cxx \ - src/FilterPlugin.cxx \ - src/FilterConfig.cxx \ + src/filter/FilterPlugin.cxx \ + src/filter/FilterConfig.cxx \ src/AudioCompress/compress.c \ src/ReplayGainInfo.cxx @@ -1560,9 +1560,9 @@ test_read_mixer_LDADD = \ test_read_mixer_SOURCES = test/read_mixer.cxx \ src/Log.cxx src/LogBackend.cxx \ src/MixerControl.cxx \ - src/FilterPlugin.cxx \ + src/filter/FilterPlugin.cxx \ src/AudioFormat.cxx \ - src/filter/VolumeFilterPlugin.cxx + src/filter/plugins/VolumeFilterPlugin.cxx if ENABLE_BZIP2_TEST TESTS += test/test_archive_bzip2.sh diff --git a/src/FilterConfig.cxx b/src/filter/FilterConfig.cxx index a3a8f7ddc..5f2c3a95b 100644 --- a/src/FilterConfig.cxx +++ b/src/filter/FilterConfig.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "FilterConfig.hxx" -#include "filter/ChainFilterPlugin.hxx" +#include "plugins/ChainFilterPlugin.hxx" #include "FilterPlugin.hxx" #include "config/ConfigData.hxx" #include "config/ConfigOption.hxx" diff --git a/src/FilterConfig.hxx b/src/filter/FilterConfig.hxx index 1018eed51..1018eed51 100644 --- a/src/FilterConfig.hxx +++ b/src/filter/FilterConfig.hxx diff --git a/src/FilterInternal.hxx b/src/filter/FilterInternal.hxx index 131c3b3f5..131c3b3f5 100644 --- a/src/FilterInternal.hxx +++ b/src/filter/FilterInternal.hxx diff --git a/src/FilterPlugin.cxx b/src/filter/FilterPlugin.cxx index 98314f771..98314f771 100644 --- a/src/FilterPlugin.cxx +++ b/src/filter/FilterPlugin.cxx diff --git a/src/FilterPlugin.hxx b/src/filter/FilterPlugin.hxx index 443d29881..443d29881 100644 --- a/src/FilterPlugin.hxx +++ b/src/filter/FilterPlugin.hxx diff --git a/src/FilterRegistry.cxx b/src/filter/FilterRegistry.cxx index 286fb8db3..286fb8db3 100644 --- a/src/FilterRegistry.cxx +++ b/src/filter/FilterRegistry.cxx diff --git a/src/FilterRegistry.hxx b/src/filter/FilterRegistry.hxx index 24618a87a..24618a87a 100644 --- a/src/FilterRegistry.hxx +++ b/src/filter/FilterRegistry.hxx diff --git a/src/filter/AutoConvertFilterPlugin.cxx b/src/filter/plugins/AutoConvertFilterPlugin.cxx index b9bc12f31..cdeeefdc6 100644 --- a/src/filter/AutoConvertFilterPlugin.cxx +++ b/src/filter/plugins/AutoConvertFilterPlugin.cxx @@ -20,9 +20,9 @@ #include "config.h" #include "AutoConvertFilterPlugin.hxx" #include "ConvertFilterPlugin.hxx" -#include "FilterPlugin.hxx" -#include "FilterInternal.hxx" -#include "FilterRegistry.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterInternal.hxx" +#include "filter/FilterRegistry.hxx" #include "AudioFormat.hxx" #include "config/ConfigData.hxx" diff --git a/src/filter/AutoConvertFilterPlugin.hxx b/src/filter/plugins/AutoConvertFilterPlugin.hxx index c5dfdd2f6..c5dfdd2f6 100644 --- a/src/filter/AutoConvertFilterPlugin.hxx +++ b/src/filter/plugins/AutoConvertFilterPlugin.hxx diff --git a/src/filter/ChainFilterPlugin.cxx b/src/filter/plugins/ChainFilterPlugin.cxx index 528661163..7dc6db667 100644 --- a/src/filter/ChainFilterPlugin.cxx +++ b/src/filter/plugins/ChainFilterPlugin.cxx @@ -19,9 +19,9 @@ #include "config.h" #include "ChainFilterPlugin.hxx" -#include "FilterPlugin.hxx" -#include "FilterInternal.hxx" -#include "FilterRegistry.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterInternal.hxx" +#include "filter/FilterRegistry.hxx" #include "AudioFormat.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/filter/ChainFilterPlugin.hxx b/src/filter/plugins/ChainFilterPlugin.hxx index b36aa3322..b36aa3322 100644 --- a/src/filter/ChainFilterPlugin.hxx +++ b/src/filter/plugins/ChainFilterPlugin.hxx diff --git a/src/filter/ConvertFilterPlugin.cxx b/src/filter/plugins/ConvertFilterPlugin.cxx index 2004fe303..27e6774f8 100644 --- a/src/filter/ConvertFilterPlugin.cxx +++ b/src/filter/plugins/ConvertFilterPlugin.cxx @@ -19,9 +19,9 @@ #include "config.h" #include "ConvertFilterPlugin.hxx" -#include "FilterPlugin.hxx" -#include "FilterInternal.hxx" -#include "FilterRegistry.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterInternal.hxx" +#include "filter/FilterRegistry.hxx" #include "pcm/PcmConvert.hxx" #include "util/Manual.hxx" #include "AudioFormat.hxx" diff --git a/src/filter/ConvertFilterPlugin.hxx b/src/filter/plugins/ConvertFilterPlugin.hxx index bb4673651..bb4673651 100644 --- a/src/filter/ConvertFilterPlugin.hxx +++ b/src/filter/plugins/ConvertFilterPlugin.hxx diff --git a/src/filter/NormalizeFilterPlugin.cxx b/src/filter/plugins/NormalizeFilterPlugin.cxx index fa3a18aec..58eb0c6a2 100644 --- a/src/filter/NormalizeFilterPlugin.cxx +++ b/src/filter/plugins/NormalizeFilterPlugin.cxx @@ -18,9 +18,9 @@ */ #include "config.h" -#include "FilterPlugin.hxx" -#include "FilterInternal.hxx" -#include "FilterRegistry.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterInternal.hxx" +#include "filter/FilterRegistry.hxx" #include "pcm/PcmBuffer.hxx" #include "AudioFormat.hxx" #include "AudioCompress/compress.h" diff --git a/src/filter/NullFilterPlugin.cxx b/src/filter/plugins/NullFilterPlugin.cxx index 971598920..f79aa19f7 100644 --- a/src/filter/NullFilterPlugin.cxx +++ b/src/filter/plugins/NullFilterPlugin.cxx @@ -25,9 +25,9 @@ */ #include "config.h" -#include "FilterPlugin.hxx" -#include "FilterInternal.hxx" -#include "FilterRegistry.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterInternal.hxx" +#include "filter/FilterRegistry.hxx" #include "AudioFormat.hxx" #include "Compiler.h" diff --git a/src/filter/ReplayGainFilterPlugin.cxx b/src/filter/plugins/ReplayGainFilterPlugin.cxx index 0b96b1d6d..d89e79480 100644 --- a/src/filter/ReplayGainFilterPlugin.cxx +++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx @@ -19,9 +19,9 @@ #include "config.h" #include "ReplayGainFilterPlugin.hxx" -#include "FilterPlugin.hxx" -#include "FilterInternal.hxx" -#include "FilterRegistry.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterInternal.hxx" +#include "filter/FilterRegistry.hxx" #include "AudioFormat.hxx" #include "ReplayGainInfo.hxx" #include "ReplayGainConfig.hxx" diff --git a/src/filter/ReplayGainFilterPlugin.hxx b/src/filter/plugins/ReplayGainFilterPlugin.hxx index 346541b97..346541b97 100644 --- a/src/filter/ReplayGainFilterPlugin.hxx +++ b/src/filter/plugins/ReplayGainFilterPlugin.hxx diff --git a/src/filter/RouteFilterPlugin.cxx b/src/filter/plugins/RouteFilterPlugin.cxx index 50073778a..38c4ec43b 100644 --- a/src/filter/RouteFilterPlugin.cxx +++ b/src/filter/plugins/RouteFilterPlugin.cxx @@ -43,9 +43,9 @@ #include "config/ConfigError.hxx" #include "config/ConfigData.hxx" #include "AudioFormat.hxx" -#include "FilterPlugin.hxx" -#include "FilterInternal.hxx" -#include "FilterRegistry.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterInternal.hxx" +#include "filter/FilterRegistry.hxx" #include "pcm/PcmBuffer.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" diff --git a/src/filter/VolumeFilterPlugin.cxx b/src/filter/plugins/VolumeFilterPlugin.cxx index 8d3de3eb9..c9b7aa89e 100644 --- a/src/filter/VolumeFilterPlugin.cxx +++ b/src/filter/plugins/VolumeFilterPlugin.cxx @@ -19,9 +19,9 @@ #include "config.h" #include "VolumeFilterPlugin.hxx" -#include "FilterPlugin.hxx" -#include "FilterInternal.hxx" -#include "FilterRegistry.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterInternal.hxx" +#include "filter/FilterRegistry.hxx" #include "pcm/Volume.hxx" #include "AudioFormat.hxx" #include "util/ConstBuffer.hxx" diff --git a/src/filter/VolumeFilterPlugin.hxx b/src/filter/plugins/VolumeFilterPlugin.hxx index b5317dc6f..b5317dc6f 100644 --- a/src/filter/VolumeFilterPlugin.hxx +++ b/src/filter/plugins/VolumeFilterPlugin.hxx diff --git a/src/mixer/SoftwareMixerPlugin.cxx b/src/mixer/SoftwareMixerPlugin.cxx index ad23baa2c..a0de727af 100644 --- a/src/mixer/SoftwareMixerPlugin.cxx +++ b/src/mixer/SoftwareMixerPlugin.cxx @@ -20,10 +20,10 @@ #include "config.h" #include "SoftwareMixerPlugin.hxx" #include "MixerInternal.hxx" -#include "FilterPlugin.hxx" -#include "FilterRegistry.hxx" -#include "FilterInternal.hxx" -#include "filter/VolumeFilterPlugin.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterRegistry.hxx" +#include "filter/FilterInternal.hxx" +#include "filter/plugins/VolumeFilterPlugin.hxx" #include "pcm/Volume.hxx" #include "config/ConfigData.hxx" #include "util/Error.hxx" diff --git a/src/output/OutputControl.cxx b/src/output/OutputControl.cxx index b938754fd..234980a52 100644 --- a/src/output/OutputControl.cxx +++ b/src/output/OutputControl.cxx @@ -26,7 +26,7 @@ #include "OutputError.hxx" #include "MixerControl.hxx" #include "notify.hxx" -#include "filter/ReplayGainFilterPlugin.hxx" +#include "filter/plugins/ReplayGainFilterPlugin.hxx" #include "util/Error.hxx" #include "Log.hxx" diff --git a/src/output/OutputFinish.cxx b/src/output/OutputFinish.cxx index 43f0dd1ec..109662fb0 100644 --- a/src/output/OutputFinish.cxx +++ b/src/output/OutputFinish.cxx @@ -21,7 +21,7 @@ #include "OutputInternal.hxx" #include "OutputPlugin.hxx" #include "MixerControl.hxx" -#include "FilterInternal.hxx" +#include "filter/FilterInternal.hxx" #include <assert.h> diff --git a/src/output/OutputInit.cxx b/src/output/OutputInit.cxx index 920a04997..7815dc921 100644 --- a/src/output/OutputInit.cxx +++ b/src/output/OutputInit.cxx @@ -22,17 +22,17 @@ #include "OutputList.hxx" #include "OutputError.hxx" #include "OutputAPI.hxx" -#include "FilterConfig.hxx" +#include "filter/FilterConfig.hxx" #include "AudioParser.hxx" #include "MixerList.hxx" #include "MixerType.hxx" #include "MixerControl.hxx" #include "mixer/SoftwareMixerPlugin.hxx" -#include "FilterPlugin.hxx" -#include "FilterRegistry.hxx" -#include "filter/AutoConvertFilterPlugin.hxx" -#include "filter/ReplayGainFilterPlugin.hxx" -#include "filter/ChainFilterPlugin.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterRegistry.hxx" +#include "filter/plugins/AutoConvertFilterPlugin.hxx" +#include "filter/plugins/ReplayGainFilterPlugin.hxx" +#include "filter/plugins/ChainFilterPlugin.hxx" #include "config/ConfigError.hxx" #include "config/ConfigGlobal.hxx" #include "util/Error.hxx" diff --git a/src/output/OutputThread.cxx b/src/output/OutputThread.cxx index f7e28b5f4..52dfc63ef 100644 --- a/src/output/OutputThread.cxx +++ b/src/output/OutputThread.cxx @@ -24,9 +24,9 @@ #include "OutputError.hxx" #include "pcm/PcmMix.hxx" #include "notify.hxx" -#include "FilterInternal.hxx" -#include "filter/ConvertFilterPlugin.hxx" -#include "filter/ReplayGainFilterPlugin.hxx" +#include "filter/FilterInternal.hxx" +#include "filter/plugins/ConvertFilterPlugin.hxx" +#include "filter/plugins/ReplayGainFilterPlugin.hxx" #include "PlayerControl.hxx" #include "MusicPipe.hxx" #include "MusicChunk.hxx" diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx index 60c60c86a..d080f46ca 100644 --- a/test/read_mixer.cxx +++ b/test/read_mixer.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "MixerControl.hxx" #include "MixerList.hxx" -#include "FilterRegistry.hxx" +#include "filter/FilterRegistry.hxx" #include "pcm/Volume.hxx" #include "GlobalEvents.hxx" #include "Main.hxx" diff --git a/test/run_filter.cxx b/test/run_filter.cxx index 16808ebb2..3ce116280 100644 --- a/test/run_filter.cxx +++ b/test/run_filter.cxx @@ -23,8 +23,8 @@ #include "fs/Path.hxx" #include "AudioParser.hxx" #include "AudioFormat.hxx" -#include "FilterPlugin.hxx" -#include "FilterInternal.hxx" +#include "filter/FilterPlugin.hxx" +#include "filter/FilterInternal.hxx" #include "pcm/Volume.hxx" #include "MixerControl.hxx" #include "stdbin.h" @@ -153,7 +153,7 @@ int main(int argc, char **argv) dest = filter->FilterPCM(buffer, (size_t)nbytes, &length, error); if (dest == NULL) { - LogError(error, "Filter failed"); + LogError(error, "filter/Filter failed"); filter->Close(); delete filter; return EXIT_FAILURE; diff --git a/test/run_output.cxx b/test/run_output.cxx index de2152337..522db5e1e 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -32,7 +32,7 @@ #include "fs/Path.hxx" #include "AudioParser.hxx" #include "pcm/PcmConvert.hxx" -#include "FilterRegistry.hxx" +#include "filter/FilterRegistry.hxx" #include "PlayerControl.hxx" #include "stdbin.h" #include "util/Error.hxx" |