Filter*: move to filter/

This commit is contained in:
Max Kellermann 2014-01-24 16:31:52 +01:00
parent 9d34fc394c
commit 7c52a1c04b
29 changed files with 67 additions and 67 deletions

View File

@ -118,10 +118,10 @@ src_mpd_SOURCES = \
src/db/Visitor.hxx \ src/db/Visitor.hxx \
src/db/Selection.cxx src/db/Selection.hxx \ src/db/Selection.cxx src/db/Selection.hxx \
src/ExcludeList.cxx src/ExcludeList.hxx \ src/ExcludeList.cxx src/ExcludeList.hxx \
src/FilterConfig.cxx src/FilterConfig.hxx \ src/filter/FilterConfig.cxx src/filter/FilterConfig.hxx \
src/FilterPlugin.cxx src/FilterPlugin.hxx \ src/filter/FilterPlugin.cxx src/filter/FilterPlugin.hxx \
src/FilterInternal.hxx \ src/filter/FilterInternal.hxx \
src/FilterRegistry.cxx src/FilterRegistry.hxx \ src/filter/FilterRegistry.cxx src/filter/FilterRegistry.hxx \
src/db/update/UpdateDomain.cxx src/db/update/UpdateDomain.hxx \ src/db/update/UpdateDomain.cxx src/db/update/UpdateDomain.hxx \
src/db/update/UpdateGlue.cxx src/db/update/UpdateGlue.hxx \ src/db/update/UpdateGlue.cxx src/db/update/UpdateGlue.hxx \
src/db/update/UpdateQueue.cxx src/db/update/UpdateQueue.hxx \ src/db/update/UpdateQueue.cxx src/db/update/UpdateQueue.hxx \
@ -1112,19 +1112,19 @@ endif
# #
libfilter_plugins_a_SOURCES = \ libfilter_plugins_a_SOURCES = \
src/filter/NullFilterPlugin.cxx \ src/filter/plugins/NullFilterPlugin.cxx \
src/filter/ChainFilterPlugin.cxx \ src/filter/plugins/ChainFilterPlugin.cxx \
src/filter/ChainFilterPlugin.hxx \ src/filter/plugins/ChainFilterPlugin.hxx \
src/filter/AutoConvertFilterPlugin.cxx \ src/filter/plugins/AutoConvertFilterPlugin.cxx \
src/filter/AutoConvertFilterPlugin.hxx \ src/filter/plugins/AutoConvertFilterPlugin.hxx \
src/filter/ConvertFilterPlugin.cxx \ src/filter/plugins/ConvertFilterPlugin.cxx \
src/filter/ConvertFilterPlugin.hxx \ src/filter/plugins/ConvertFilterPlugin.hxx \
src/filter/RouteFilterPlugin.cxx \ src/filter/plugins/RouteFilterPlugin.cxx \
src/filter/NormalizeFilterPlugin.cxx \ src/filter/plugins/NormalizeFilterPlugin.cxx \
src/filter/ReplayGainFilterPlugin.cxx \ src/filter/plugins/ReplayGainFilterPlugin.cxx \
src/filter/ReplayGainFilterPlugin.hxx \ src/filter/plugins/ReplayGainFilterPlugin.hxx \
src/filter/VolumeFilterPlugin.cxx \ src/filter/plugins/VolumeFilterPlugin.cxx \
src/filter/VolumeFilterPlugin.hxx src/filter/plugins/VolumeFilterPlugin.hxx
FILTER_LIBS = \ FILTER_LIBS = \
libfilter_plugins.a \ libfilter_plugins.a \
@ -1414,7 +1414,7 @@ test_run_filter_SOURCES = test/run_filter.cxx \
test/FakeReplayGainConfig.cxx \ test/FakeReplayGainConfig.cxx \
test/stdbin.h \ test/stdbin.h \
src/Log.cxx src/LogBackend.cxx \ src/Log.cxx src/LogBackend.cxx \
src/FilterPlugin.cxx src/FilterRegistry.cxx \ src/filter/FilterPlugin.cxx src/filter/FilterRegistry.cxx \
src/CheckAudioFormat.cxx \ src/CheckAudioFormat.cxx \
src/AudioFormat.cxx \ src/AudioFormat.cxx \
src/AudioParser.cxx \ src/AudioParser.cxx \
@ -1542,8 +1542,8 @@ test_run_output_SOURCES = test/run_output.cxx \
src/output/OutputPlugin.cxx \ src/output/OutputPlugin.cxx \
src/MixerControl.cxx \ src/MixerControl.cxx \
src/MixerType.cxx \ src/MixerType.cxx \
src/FilterPlugin.cxx \ src/filter/FilterPlugin.cxx \
src/FilterConfig.cxx \ src/filter/FilterConfig.cxx \
src/AudioCompress/compress.c \ src/AudioCompress/compress.c \
src/ReplayGainInfo.cxx src/ReplayGainInfo.cxx
@ -1560,9 +1560,9 @@ test_read_mixer_LDADD = \
test_read_mixer_SOURCES = test/read_mixer.cxx \ test_read_mixer_SOURCES = test/read_mixer.cxx \
src/Log.cxx src/LogBackend.cxx \ src/Log.cxx src/LogBackend.cxx \
src/MixerControl.cxx \ src/MixerControl.cxx \
src/FilterPlugin.cxx \ src/filter/FilterPlugin.cxx \
src/AudioFormat.cxx \ src/AudioFormat.cxx \
src/filter/VolumeFilterPlugin.cxx src/filter/plugins/VolumeFilterPlugin.cxx
if ENABLE_BZIP2_TEST if ENABLE_BZIP2_TEST
TESTS += test/test_archive_bzip2.sh TESTS += test/test_archive_bzip2.sh

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "FilterConfig.hxx" #include "FilterConfig.hxx"
#include "filter/ChainFilterPlugin.hxx" #include "plugins/ChainFilterPlugin.hxx"
#include "FilterPlugin.hxx" #include "FilterPlugin.hxx"
#include "config/ConfigData.hxx" #include "config/ConfigData.hxx"
#include "config/ConfigOption.hxx" #include "config/ConfigOption.hxx"

View File

@ -20,9 +20,9 @@
#include "config.h" #include "config.h"
#include "AutoConvertFilterPlugin.hxx" #include "AutoConvertFilterPlugin.hxx"
#include "ConvertFilterPlugin.hxx" #include "ConvertFilterPlugin.hxx"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "config/ConfigData.hxx" #include "config/ConfigData.hxx"

View File

@ -19,9 +19,9 @@
#include "config.h" #include "config.h"
#include "ChainFilterPlugin.hxx" #include "ChainFilterPlugin.hxx"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

View File

@ -19,9 +19,9 @@
#include "config.h" #include "config.h"
#include "ConvertFilterPlugin.hxx" #include "ConvertFilterPlugin.hxx"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "pcm/PcmConvert.hxx" #include "pcm/PcmConvert.hxx"
#include "util/Manual.hxx" #include "util/Manual.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"

View File

@ -18,9 +18,9 @@
*/ */
#include "config.h" #include "config.h"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "pcm/PcmBuffer.hxx" #include "pcm/PcmBuffer.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "AudioCompress/compress.h" #include "AudioCompress/compress.h"

View File

@ -25,9 +25,9 @@
*/ */
#include "config.h" #include "config.h"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "Compiler.h" #include "Compiler.h"

View File

@ -19,9 +19,9 @@
#include "config.h" #include "config.h"
#include "ReplayGainFilterPlugin.hxx" #include "ReplayGainFilterPlugin.hxx"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "ReplayGainInfo.hxx" #include "ReplayGainInfo.hxx"
#include "ReplayGainConfig.hxx" #include "ReplayGainConfig.hxx"

View File

@ -43,9 +43,9 @@
#include "config/ConfigError.hxx" #include "config/ConfigError.hxx"
#include "config/ConfigData.hxx" #include "config/ConfigData.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "pcm/PcmBuffer.hxx" #include "pcm/PcmBuffer.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

View File

@ -19,9 +19,9 @@
#include "config.h" #include "config.h"
#include "VolumeFilterPlugin.hxx" #include "VolumeFilterPlugin.hxx"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"

View File

@ -20,10 +20,10 @@
#include "config.h" #include "config.h"
#include "SoftwareMixerPlugin.hxx" #include "SoftwareMixerPlugin.hxx"
#include "MixerInternal.hxx" #include "MixerInternal.hxx"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "filter/VolumeFilterPlugin.hxx" #include "filter/plugins/VolumeFilterPlugin.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "config/ConfigData.hxx" #include "config/ConfigData.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

View File

@ -26,7 +26,7 @@
#include "OutputError.hxx" #include "OutputError.hxx"
#include "MixerControl.hxx" #include "MixerControl.hxx"
#include "notify.hxx" #include "notify.hxx"
#include "filter/ReplayGainFilterPlugin.hxx" #include "filter/plugins/ReplayGainFilterPlugin.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"

View File

@ -21,7 +21,7 @@
#include "OutputInternal.hxx" #include "OutputInternal.hxx"
#include "OutputPlugin.hxx" #include "OutputPlugin.hxx"
#include "MixerControl.hxx" #include "MixerControl.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include <assert.h> #include <assert.h>

View File

@ -22,17 +22,17 @@
#include "OutputList.hxx" #include "OutputList.hxx"
#include "OutputError.hxx" #include "OutputError.hxx"
#include "OutputAPI.hxx" #include "OutputAPI.hxx"
#include "FilterConfig.hxx" #include "filter/FilterConfig.hxx"
#include "AudioParser.hxx" #include "AudioParser.hxx"
#include "MixerList.hxx" #include "MixerList.hxx"
#include "MixerType.hxx" #include "MixerType.hxx"
#include "MixerControl.hxx" #include "MixerControl.hxx"
#include "mixer/SoftwareMixerPlugin.hxx" #include "mixer/SoftwareMixerPlugin.hxx"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "filter/AutoConvertFilterPlugin.hxx" #include "filter/plugins/AutoConvertFilterPlugin.hxx"
#include "filter/ReplayGainFilterPlugin.hxx" #include "filter/plugins/ReplayGainFilterPlugin.hxx"
#include "filter/ChainFilterPlugin.hxx" #include "filter/plugins/ChainFilterPlugin.hxx"
#include "config/ConfigError.hxx" #include "config/ConfigError.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

View File

@ -24,9 +24,9 @@
#include "OutputError.hxx" #include "OutputError.hxx"
#include "pcm/PcmMix.hxx" #include "pcm/PcmMix.hxx"
#include "notify.hxx" #include "notify.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "filter/ConvertFilterPlugin.hxx" #include "filter/plugins/ConvertFilterPlugin.hxx"
#include "filter/ReplayGainFilterPlugin.hxx" #include "filter/plugins/ReplayGainFilterPlugin.hxx"
#include "PlayerControl.hxx" #include "PlayerControl.hxx"
#include "MusicPipe.hxx" #include "MusicPipe.hxx"
#include "MusicChunk.hxx" #include "MusicChunk.hxx"

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "MixerControl.hxx" #include "MixerControl.hxx"
#include "MixerList.hxx" #include "MixerList.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "GlobalEvents.hxx" #include "GlobalEvents.hxx"
#include "Main.hxx" #include "Main.hxx"

View File

@ -23,8 +23,8 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "AudioParser.hxx" #include "AudioParser.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "FilterInternal.hxx" #include "filter/FilterInternal.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "MixerControl.hxx" #include "MixerControl.hxx"
#include "stdbin.h" #include "stdbin.h"
@ -153,7 +153,7 @@ int main(int argc, char **argv)
dest = filter->FilterPCM(buffer, (size_t)nbytes, dest = filter->FilterPCM(buffer, (size_t)nbytes,
&length, error); &length, error);
if (dest == NULL) { if (dest == NULL) {
LogError(error, "Filter failed"); LogError(error, "filter/Filter failed");
filter->Close(); filter->Close();
delete filter; delete filter;
return EXIT_FAILURE; return EXIT_FAILURE;

View File

@ -32,7 +32,7 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "AudioParser.hxx" #include "AudioParser.hxx"
#include "pcm/PcmConvert.hxx" #include "pcm/PcmConvert.hxx"
#include "FilterRegistry.hxx" #include "filter/FilterRegistry.hxx"
#include "PlayerControl.hxx" #include "PlayerControl.hxx"
#include "stdbin.h" #include "stdbin.h"
#include "util/Error.hxx" #include "util/Error.hxx"