diff --git a/src/filter/plugins/NormalizeFilterPlugin.cxx b/src/filter/plugins/NormalizeFilterPlugin.cxx index 15ffb4353..1c9832bff 100644 --- a/src/filter/plugins/NormalizeFilterPlugin.cxx +++ b/src/filter/plugins/NormalizeFilterPlugin.cxx @@ -23,7 +23,7 @@ #include "filter/Prepared.hxx" #include "pcm/Buffer.hxx" #include "pcm/AudioFormat.hxx" -#include "AudioCompress/compress.h" +#include "pcm/AudioCompress/compress.h" #include "util/ConstBuffer.hxx" #include diff --git a/src/filter/plugins/meson.build b/src/filter/plugins/meson.build index aa5dd8038..aef504aa5 100644 --- a/src/filter/plugins/meson.build +++ b/src/filter/plugins/meson.build @@ -12,7 +12,6 @@ endif filter_plugins = static_library( 'filter_plugins', - '../../AudioCompress/compress.c', 'NullFilterPlugin.cxx', 'TwoFilters.cxx', 'AutoConvertFilterPlugin.cxx', diff --git a/src/AudioCompress/compress.c b/src/pcm/AudioCompress/compress.c similarity index 100% rename from src/AudioCompress/compress.c rename to src/pcm/AudioCompress/compress.c diff --git a/src/AudioCompress/compress.h b/src/pcm/AudioCompress/compress.h similarity index 100% rename from src/AudioCompress/compress.h rename to src/pcm/AudioCompress/compress.h diff --git a/src/AudioCompress/config.h b/src/pcm/AudioCompress/config.h similarity index 100% rename from src/AudioCompress/config.h rename to src/pcm/AudioCompress/config.h diff --git a/src/pcm/meson.build b/src/pcm/meson.build index bebfdc55d..74b605b5a 100644 --- a/src/pcm/meson.build +++ b/src/pcm/meson.build @@ -46,6 +46,7 @@ pcm_sources = [ 'GlueResampler.cxx', 'FallbackResampler.cxx', 'ConfiguredResampler.cxx', + 'AudioCompress/compress.c', ] libsamplerate_dep = dependency('samplerate', version: '>= 0.1.3', required: get_option('libsamplerate')) diff --git a/test/meson.build b/test/meson.build index d3a69ccb4..75c3ff46f 100644 --- a/test/meson.build +++ b/test/meson.build @@ -538,7 +538,6 @@ executable( executable( 'run_normalize', 'run_normalize.cxx', - '../src/AudioCompress/compress.c', include_directories: inc, dependencies: [ pcm_dep, diff --git a/test/run_normalize.cxx b/test/run_normalize.cxx index 969afb5e2..fad7b81a3 100644 --- a/test/run_normalize.cxx +++ b/test/run_normalize.cxx @@ -23,7 +23,7 @@ * */ -#include "AudioCompress/compress.h" +#include "pcm/AudioCompress/compress.h" #include "pcm/AudioParser.hxx" #include "pcm/AudioFormat.hxx" #include "util/PrintException.hxx"