From e87f0ca7710afc6375570a44c95c5e6d14659493 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 17 Jun 2019 11:10:33 +0200 Subject: [PATCH] pcm/Pcm*: drop more "Pcm" prefixes from source file names --- src/Main.cxx | 2 +- src/decoder/Bridge.cxx | 3 +-- src/decoder/plugins/FlacPcm.hxx | 2 +- src/decoder/plugins/PcmDecoderPlugin.cxx | 2 +- src/encoder/plugins/FlacEncoderPlugin.cxx | 2 +- src/filter/plugins/ConvertFilterPlugin.cxx | 2 +- src/filter/plugins/NormalizeFilterPlugin.cxx | 2 +- src/filter/plugins/RouteFilterPlugin.cxx | 2 +- src/lib/chromaprint/DecoderClient.cxx | 2 +- src/output/Source.cxx | 2 +- src/output/Source.hxx | 4 ++-- src/pcm/{PcmBuffer.cxx => Buffer.cxx} | 2 +- src/pcm/{PcmBuffer.hxx => Buffer.hxx} | 0 src/pcm/ChannelsConverter.hxx | 2 +- src/pcm/{PcmConvert.cxx => Convert.cxx} | 2 +- src/pcm/{PcmConvert.hxx => Convert.hxx} | 0 src/pcm/{PcmDither.cxx => Dither.cxx} | 4 ++-- src/pcm/{PcmDither.hxx => Dither.hxx} | 0 src/pcm/Dop.cxx | 2 +- src/pcm/Dsd16.cxx | 2 +- src/pcm/Dsd32.cxx | 2 +- src/pcm/Export.cxx | 2 +- src/pcm/Export.hxx | 2 +- src/pcm/FallbackResampler.hxx | 2 +- src/pcm/FormatConverter.hxx | 4 ++-- src/pcm/LibsamplerateResampler.hxx | 2 +- src/pcm/{PcmMix.cxx => Mix.cxx} | 4 ++-- src/pcm/{PcmMix.hxx => Mix.hxx} | 0 src/pcm/Order.cxx | 2 +- src/pcm/{PcmPack.cxx => Pack.cxx} | 2 +- src/pcm/{PcmPack.hxx => Pack.hxx} | 0 src/pcm/PcmChannels.cxx | 2 +- src/pcm/PcmDsd.hxx | 2 +- src/pcm/PcmFormat.cxx | 4 ++-- src/pcm/{PcmPrng.hxx => Prng.hxx} | 0 src/pcm/SoxrResampler.hxx | 2 +- src/pcm/Volume.cxx | 2 +- src/pcm/Volume.hxx | 4 ++-- src/pcm/meson.build | 10 +++++----- test/RunChromaprint.cxx | 2 +- test/run_convert.cxx | 2 +- test/run_output.cxx | 2 +- test/test_pcm_channels.cxx | 2 +- test/test_pcm_dither.cxx | 2 +- test/test_pcm_format.cxx | 4 ++-- test/test_pcm_mix.cxx | 4 ++-- test/test_pcm_pack.cxx | 2 +- 47 files changed, 53 insertions(+), 54 deletions(-) rename src/pcm/{PcmBuffer.cxx => Buffer.cxx} (97%) rename src/pcm/{PcmBuffer.hxx => Buffer.hxx} (100%) rename src/pcm/{PcmConvert.cxx => Convert.cxx} (99%) rename src/pcm/{PcmConvert.hxx => Convert.hxx} (100%) rename src/pcm/{PcmDither.cxx => Dither.cxx} (98%) rename src/pcm/{PcmDither.hxx => Dither.hxx} (100%) rename src/pcm/{PcmMix.cxx => Mix.cxx} (98%) rename src/pcm/{PcmMix.hxx => Mix.hxx} (100%) rename src/pcm/{PcmPack.cxx => Pack.cxx} (99%) rename src/pcm/{PcmPack.hxx => Pack.hxx} (100%) rename src/pcm/{PcmPrng.hxx => Prng.hxx} (100%) diff --git a/src/Main.cxx b/src/Main.cxx index b8df76ec1..1de0c622d 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -47,7 +47,7 @@ #include "zeroconf/ZeroconfGlue.hxx" #include "decoder/DecoderList.hxx" #include "AudioParser.hxx" -#include "pcm/PcmConvert.hxx" +#include "pcm/Convert.hxx" #include "unix/SignalHandlers.hxx" #include "thread/Slack.hxx" #include "net/Init.hxx" diff --git a/src/decoder/Bridge.cxx b/src/decoder/Bridge.cxx index dc89fe330..315aef574 100644 --- a/src/decoder/Bridge.cxx +++ b/src/decoder/Bridge.cxx @@ -22,11 +22,10 @@ #include "Domain.hxx" #include "Control.hxx" #include "song/DetachedSong.hxx" -#include "pcm/PcmConvert.hxx" +#include "pcm/Convert.hxx" #include "MusicPipe.hxx" #include "MusicBuffer.hxx" #include "MusicChunk.hxx" -#include "pcm/PcmConvert.hxx" #include "tag/Tag.hxx" #include "Log.hxx" #include "input/InputStream.hxx" diff --git a/src/decoder/plugins/FlacPcm.hxx b/src/decoder/plugins/FlacPcm.hxx index 8acde3e11..eaf685790 100644 --- a/src/decoder/plugins/FlacPcm.hxx +++ b/src/decoder/plugins/FlacPcm.hxx @@ -20,7 +20,7 @@ #ifndef MPD_FLAC_PCM_HXX #define MPD_FLAC_PCM_HXX -#include "pcm/PcmBuffer.hxx" +#include "pcm/Buffer.hxx" #include "AudioFormat.hxx" #include diff --git a/src/decoder/plugins/PcmDecoderPlugin.cxx b/src/decoder/plugins/PcmDecoderPlugin.cxx index f084c9742..01dfb5db6 100644 --- a/src/decoder/plugins/PcmDecoderPlugin.cxx +++ b/src/decoder/plugins/PcmDecoderPlugin.cxx @@ -22,7 +22,7 @@ #include "PcmDecoderPlugin.hxx" #include "../DecoderAPI.hxx" #include "CheckAudioFormat.hxx" -#include "pcm/PcmPack.hxx" +#include "pcm/Pack.hxx" #include "input/InputStream.hxx" #include "util/ByteOrder.hxx" #include "util/Domain.hxx" diff --git a/src/encoder/plugins/FlacEncoderPlugin.cxx b/src/encoder/plugins/FlacEncoderPlugin.cxx index 05e0f2d17..6fdf7bf56 100644 --- a/src/encoder/plugins/FlacEncoderPlugin.cxx +++ b/src/encoder/plugins/FlacEncoderPlugin.cxx @@ -20,7 +20,7 @@ #include "FlacEncoderPlugin.hxx" #include "../EncoderAPI.hxx" #include "AudioFormat.hxx" -#include "pcm/PcmBuffer.hxx" +#include "pcm/Buffer.hxx" #include "config/Domain.hxx" #include "util/DynamicFifoBuffer.hxx" #include "util/RuntimeError.hxx" diff --git a/src/filter/plugins/ConvertFilterPlugin.cxx b/src/filter/plugins/ConvertFilterPlugin.cxx index 8f817f57b..dd66838c6 100644 --- a/src/filter/plugins/ConvertFilterPlugin.cxx +++ b/src/filter/plugins/ConvertFilterPlugin.cxx @@ -20,7 +20,7 @@ #include "ConvertFilterPlugin.hxx" #include "filter/Filter.hxx" #include "filter/Prepared.hxx" -#include "pcm/PcmConvert.hxx" +#include "pcm/Convert.hxx" #include "util/Manual.hxx" #include "util/ConstBuffer.hxx" #include "AudioFormat.hxx" diff --git a/src/filter/plugins/NormalizeFilterPlugin.cxx b/src/filter/plugins/NormalizeFilterPlugin.cxx index 4a84896e4..a72ad395e 100644 --- a/src/filter/plugins/NormalizeFilterPlugin.cxx +++ b/src/filter/plugins/NormalizeFilterPlugin.cxx @@ -21,7 +21,7 @@ #include "filter/FilterPlugin.hxx" #include "filter/Filter.hxx" #include "filter/Prepared.hxx" -#include "pcm/PcmBuffer.hxx" +#include "pcm/Buffer.hxx" #include "AudioFormat.hxx" #include "AudioCompress/compress.h" #include "util/ConstBuffer.hxx" diff --git a/src/filter/plugins/RouteFilterPlugin.cxx b/src/filter/plugins/RouteFilterPlugin.cxx index abf6c215b..159bc053b 100644 --- a/src/filter/plugins/RouteFilterPlugin.cxx +++ b/src/filter/plugins/RouteFilterPlugin.cxx @@ -46,7 +46,7 @@ #include "filter/FilterPlugin.hxx" #include "filter/Filter.hxx" #include "filter/Prepared.hxx" -#include "pcm/PcmBuffer.hxx" +#include "pcm/Buffer.hxx" #include "pcm/Silence.hxx" #include "util/StringStrip.hxx" #include "util/RuntimeError.hxx" diff --git a/src/lib/chromaprint/DecoderClient.cxx b/src/lib/chromaprint/DecoderClient.cxx index 98b9e37e8..e99aca07d 100644 --- a/src/lib/chromaprint/DecoderClient.cxx +++ b/src/lib/chromaprint/DecoderClient.cxx @@ -18,7 +18,7 @@ */ #include "DecoderClient.hxx" -#include "pcm/PcmConvert.hxx" +#include "pcm/Convert.hxx" #include "input/InputStream.hxx" #include "util/ConstBuffer.hxx" diff --git a/src/output/Source.cxx b/src/output/Source.cxx index a0ab5b225..cdcc6f3a1 100644 --- a/src/output/Source.cxx +++ b/src/output/Source.cxx @@ -22,7 +22,7 @@ #include "filter/Filter.hxx" #include "filter/Prepared.hxx" #include "filter/plugins/ReplayGainFilterPlugin.hxx" -#include "pcm/PcmMix.hxx" +#include "pcm/Mix.hxx" #include "thread/Mutex.hxx" #include "util/ConstBuffer.hxx" #include "util/RuntimeError.hxx" diff --git a/src/output/Source.hxx b/src/output/Source.hxx index 76cb4a2e7..517616c6d 100644 --- a/src/output/Source.hxx +++ b/src/output/Source.hxx @@ -24,8 +24,8 @@ #include "SharedPipeConsumer.hxx" #include "AudioFormat.hxx" #include "ReplayGainMode.hxx" -#include "pcm/PcmBuffer.hxx" -#include "pcm/PcmDither.hxx" +#include "pcm/Buffer.hxx" +#include "pcm/Dither.hxx" #include "thread/Mutex.hxx" #include "util/ConstBuffer.hxx" diff --git a/src/pcm/PcmBuffer.cxx b/src/pcm/Buffer.cxx similarity index 97% rename from src/pcm/PcmBuffer.cxx rename to src/pcm/Buffer.cxx index 0bad2baa5..2b8f00d54 100644 --- a/src/pcm/PcmBuffer.cxx +++ b/src/pcm/Buffer.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "PcmBuffer.hxx" +#include "Buffer.hxx" void * PcmBuffer::Get(size_t new_size) noexcept diff --git a/src/pcm/PcmBuffer.hxx b/src/pcm/Buffer.hxx similarity index 100% rename from src/pcm/PcmBuffer.hxx rename to src/pcm/Buffer.hxx diff --git a/src/pcm/ChannelsConverter.hxx b/src/pcm/ChannelsConverter.hxx index 7c4e664d4..497f69c9f 100644 --- a/src/pcm/ChannelsConverter.hxx +++ b/src/pcm/ChannelsConverter.hxx @@ -21,7 +21,7 @@ #define MPD_PCM_CHANNELS_CONVERTER_HXX #include "SampleFormat.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #ifndef NDEBUG #include diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/Convert.cxx similarity index 99% rename from src/pcm/PcmConvert.cxx rename to src/pcm/Convert.cxx index 7e7262e65..78aab247a 100644 --- a/src/pcm/PcmConvert.cxx +++ b/src/pcm/Convert.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "PcmConvert.hxx" +#include "Convert.hxx" #include "ConfiguredResampler.hxx" #include "util/ConstBuffer.hxx" diff --git a/src/pcm/PcmConvert.hxx b/src/pcm/Convert.hxx similarity index 100% rename from src/pcm/PcmConvert.hxx rename to src/pcm/Convert.hxx diff --git a/src/pcm/PcmDither.cxx b/src/pcm/Dither.cxx similarity index 98% rename from src/pcm/PcmDither.cxx rename to src/pcm/Dither.cxx index f8d24fc7a..2e835423d 100644 --- a/src/pcm/PcmDither.cxx +++ b/src/pcm/Dither.cxx @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "PcmDither.hxx" -#include "PcmPrng.hxx" +#include "Dither.hxx" +#include "Prng.hxx" #include "Traits.hxx" template diff --git a/src/pcm/PcmDither.hxx b/src/pcm/Dither.hxx similarity index 100% rename from src/pcm/PcmDither.hxx rename to src/pcm/Dither.hxx diff --git a/src/pcm/Dop.cxx b/src/pcm/Dop.cxx index 56086bb28..4d084c91b 100644 --- a/src/pcm/Dop.cxx +++ b/src/pcm/Dop.cxx @@ -18,7 +18,7 @@ */ #include "Dop.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "AudioFormat.hxx" #include "util/ConstBuffer.hxx" diff --git a/src/pcm/Dsd16.cxx b/src/pcm/Dsd16.cxx index 4c7fae7e2..bce5b2292 100644 --- a/src/pcm/Dsd16.cxx +++ b/src/pcm/Dsd16.cxx @@ -18,7 +18,7 @@ */ #include "Dsd16.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "util/ConstBuffer.hxx" /** diff --git a/src/pcm/Dsd32.cxx b/src/pcm/Dsd32.cxx index 89163e7ef..0ca7534e4 100644 --- a/src/pcm/Dsd32.cxx +++ b/src/pcm/Dsd32.cxx @@ -18,7 +18,7 @@ */ #include "Dsd32.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "util/ConstBuffer.hxx" /** diff --git a/src/pcm/Export.cxx b/src/pcm/Export.cxx index 8d091a096..48171b694 100644 --- a/src/pcm/Export.cxx +++ b/src/pcm/Export.cxx @@ -20,7 +20,7 @@ #include "Export.hxx" #include "AudioFormat.hxx" #include "Order.hxx" -#include "PcmPack.hxx" +#include "Pack.hxx" #include "util/ByteReverse.hxx" #include "util/ConstBuffer.hxx" diff --git a/src/pcm/Export.hxx b/src/pcm/Export.hxx index 4f3fcd15d..34c7fe157 100644 --- a/src/pcm/Export.hxx +++ b/src/pcm/Export.hxx @@ -21,7 +21,7 @@ #define PCM_EXPORT_HXX #include "SampleFormat.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "config.h" template struct ConstBuffer; diff --git a/src/pcm/FallbackResampler.hxx b/src/pcm/FallbackResampler.hxx index a9d39bb39..97bb1042e 100644 --- a/src/pcm/FallbackResampler.hxx +++ b/src/pcm/FallbackResampler.hxx @@ -21,7 +21,7 @@ #define MPD_PCM_FALLBACK_RESAMPLER_HXX #include "Resampler.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "AudioFormat.hxx" #include "util/Compiler.h" diff --git a/src/pcm/FormatConverter.hxx b/src/pcm/FormatConverter.hxx index 50d01aad4..f069873b5 100644 --- a/src/pcm/FormatConverter.hxx +++ b/src/pcm/FormatConverter.hxx @@ -21,8 +21,8 @@ #define MPD_PCM_FORMAT_CONVERTER_HXX #include "SampleFormat.hxx" -#include "PcmBuffer.hxx" -#include "PcmDither.hxx" +#include "Buffer.hxx" +#include "Dither.hxx" #ifndef NDEBUG #include diff --git a/src/pcm/LibsamplerateResampler.hxx b/src/pcm/LibsamplerateResampler.hxx index 26be6f805..db2d087f7 100644 --- a/src/pcm/LibsamplerateResampler.hxx +++ b/src/pcm/LibsamplerateResampler.hxx @@ -21,7 +21,7 @@ #define MPD_PCM_LIBSAMPLERATE_RESAMPLER_HXX #include "Resampler.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "AudioFormat.hxx" #include "util/Compiler.h" diff --git a/src/pcm/PcmMix.cxx b/src/pcm/Mix.cxx similarity index 98% rename from src/pcm/PcmMix.cxx rename to src/pcm/Mix.cxx index 247210013..1ca506b88 100644 --- a/src/pcm/PcmMix.cxx +++ b/src/pcm/Mix.cxx @@ -17,13 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "PcmMix.hxx" +#include "Mix.hxx" #include "Volume.hxx" #include "Clamp.hxx" #include "Traits.hxx" #include "util/Clamp.hxx" -#include "PcmDither.cxx" // including the .cxx file to get inlined templates +#include "Dither.cxx" // including the .cxx file to get inlined templates #include diff --git a/src/pcm/PcmMix.hxx b/src/pcm/Mix.hxx similarity index 100% rename from src/pcm/PcmMix.hxx rename to src/pcm/Mix.hxx diff --git a/src/pcm/Order.cxx b/src/pcm/Order.cxx index c730d84b4..1fd5f3f90 100644 --- a/src/pcm/Order.cxx +++ b/src/pcm/Order.cxx @@ -18,7 +18,7 @@ */ #include "Order.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "util/ConstBuffer.hxx" template diff --git a/src/pcm/PcmPack.cxx b/src/pcm/Pack.cxx similarity index 99% rename from src/pcm/PcmPack.cxx rename to src/pcm/Pack.cxx index 1d614e13f..df6b43041 100644 --- a/src/pcm/PcmPack.cxx +++ b/src/pcm/Pack.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "PcmPack.hxx" +#include "Pack.hxx" #include "util/ByteOrder.hxx" static void diff --git a/src/pcm/PcmPack.hxx b/src/pcm/Pack.hxx similarity index 100% rename from src/pcm/PcmPack.hxx rename to src/pcm/Pack.hxx diff --git a/src/pcm/PcmChannels.cxx b/src/pcm/PcmChannels.cxx index 5fd6bcda0..6c658e372 100644 --- a/src/pcm/PcmChannels.cxx +++ b/src/pcm/PcmChannels.cxx @@ -18,7 +18,7 @@ */ #include "PcmChannels.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "Silence.hxx" #include "Traits.hxx" #include "AudioFormat.hxx" diff --git a/src/pcm/PcmDsd.hxx b/src/pcm/PcmDsd.hxx index 4a4ae2e7b..a754cd770 100644 --- a/src/pcm/PcmDsd.hxx +++ b/src/pcm/PcmDsd.hxx @@ -20,7 +20,7 @@ #ifndef MPD_PCM_DSD_HXX #define MPD_PCM_DSD_HXX -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "AudioFormat.hxx" #include diff --git a/src/pcm/PcmFormat.cxx b/src/pcm/PcmFormat.cxx index 456169947..66c86c4f7 100644 --- a/src/pcm/PcmFormat.cxx +++ b/src/pcm/PcmFormat.cxx @@ -18,14 +18,14 @@ */ #include "PcmFormat.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "Clamp.hxx" #include "Traits.hxx" #include "FloatConvert.hxx" #include "ShiftConvert.hxx" #include "util/ConstBuffer.hxx" -#include "PcmDither.cxx" // including the .cxx file to get inlined templates +#include "Dither.cxx" // including the .cxx file to get inlined templates /** * Wrapper for a class that converts one sample at a time into one diff --git a/src/pcm/PcmPrng.hxx b/src/pcm/Prng.hxx similarity index 100% rename from src/pcm/PcmPrng.hxx rename to src/pcm/Prng.hxx diff --git a/src/pcm/SoxrResampler.hxx b/src/pcm/SoxrResampler.hxx index ea387226c..834b18982 100644 --- a/src/pcm/SoxrResampler.hxx +++ b/src/pcm/SoxrResampler.hxx @@ -21,7 +21,7 @@ #define MPD_PCM_SOXR_RESAMPLER_HXX #include "Resampler.hxx" -#include "PcmBuffer.hxx" +#include "Buffer.hxx" #include "util/Compiler.h" struct AudioFormat; diff --git a/src/pcm/Volume.cxx b/src/pcm/Volume.cxx index 2fbcfbe9a..5fc8e3edc 100644 --- a/src/pcm/Volume.cxx +++ b/src/pcm/Volume.cxx @@ -24,7 +24,7 @@ #include "util/WritableBuffer.hxx" #include "util/RuntimeError.hxx" -#include "PcmDither.cxx" // including the .cxx file to get inlined templates +#include "Dither.cxx" // including the .cxx file to get inlined templates #include #include diff --git a/src/pcm/Volume.hxx b/src/pcm/Volume.hxx index fe05b280c..eb34f111e 100644 --- a/src/pcm/Volume.hxx +++ b/src/pcm/Volume.hxx @@ -21,8 +21,8 @@ #define MPD_PCM_VOLUME_HXX #include "SampleFormat.hxx" -#include "PcmBuffer.hxx" -#include "PcmDither.hxx" +#include "Buffer.hxx" +#include "Dither.hxx" #ifndef NDEBUG #include diff --git a/src/pcm/meson.build b/src/pcm/meson.build index 40a3925f0..99e1e019e 100644 --- a/src/pcm/meson.build +++ b/src/pcm/meson.build @@ -4,15 +4,15 @@ pcm_sources = [ '../AudioParser.cxx', 'SampleFormat.cxx', 'Interleave.cxx', - 'PcmBuffer.cxx', + 'Buffer.cxx', 'Export.cxx', - 'PcmConvert.cxx', + 'Convert.cxx', 'Dop.cxx', 'Volume.cxx', 'Silence.cxx', - 'PcmMix.cxx', + 'Mix.cxx', 'PcmChannels.cxx', - 'PcmPack.cxx', + 'Pack.cxx', 'PcmFormat.cxx', 'FormatConverter.cxx', 'ChannelsConverter.cxx', @@ -20,7 +20,7 @@ pcm_sources = [ 'GlueResampler.cxx', 'FallbackResampler.cxx', 'ConfiguredResampler.cxx', - 'PcmDither.cxx', + 'Dither.cxx', ] if get_option('dsd') diff --git a/test/RunChromaprint.cxx b/test/RunChromaprint.cxx index 1318d88f3..4e8b03148 100644 --- a/test/RunChromaprint.cxx +++ b/test/RunChromaprint.cxx @@ -18,7 +18,7 @@ */ #include "ConfigGlue.hxx" -#include "pcm/PcmConvert.hxx" +#include "pcm/Convert.hxx" #include "lib/chromaprint/DecoderClient.hxx" #include "event/Thread.hxx" #include "decoder/DecoderList.hxx" diff --git a/test/run_convert.cxx b/test/run_convert.cxx index 2f718b267..a8203e655 100644 --- a/test/run_convert.cxx +++ b/test/run_convert.cxx @@ -25,7 +25,7 @@ #include "AudioParser.hxx" #include "AudioFormat.hxx" -#include "pcm/PcmConvert.hxx" +#include "pcm/Convert.hxx" #include "util/ConstBuffer.hxx" #include "util/StaticFifoBuffer.hxx" #include "util/PrintException.hxx" diff --git a/test/run_output.cxx b/test/run_output.cxx index 314dd6671..2a31c001a 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -24,7 +24,7 @@ #include "event/Thread.hxx" #include "fs/Path.hxx" #include "AudioParser.hxx" -#include "pcm/PcmConvert.hxx" +#include "pcm/Convert.hxx" #include "util/StringBuffer.hxx" #include "util/RuntimeError.hxx" #include "util/ScopeExit.hxx" diff --git a/test/test_pcm_channels.cxx b/test/test_pcm_channels.cxx index 8a76b2ff9..46b733c8f 100644 --- a/test/test_pcm_channels.cxx +++ b/test/test_pcm_channels.cxx @@ -19,7 +19,7 @@ #include "test_pcm_util.hxx" #include "pcm/PcmChannels.hxx" -#include "pcm/PcmBuffer.hxx" +#include "pcm/Buffer.hxx" #include "util/ConstBuffer.hxx" #include diff --git a/test/test_pcm_dither.cxx b/test/test_pcm_dither.cxx index 0ba5c4583..a4e27d5ea 100644 --- a/test/test_pcm_dither.cxx +++ b/test/test_pcm_dither.cxx @@ -18,7 +18,7 @@ */ #include "test_pcm_util.hxx" -#include "pcm/PcmDither.cxx" +#include "pcm/Dither.cxx" #include diff --git a/test/test_pcm_format.cxx b/test/test_pcm_format.cxx index ee3f88044..7591ca35f 100644 --- a/test/test_pcm_format.cxx +++ b/test/test_pcm_format.cxx @@ -19,8 +19,8 @@ #include "test_pcm_util.hxx" #include "pcm/PcmFormat.hxx" -#include "pcm/PcmDither.hxx" -#include "pcm/PcmBuffer.hxx" +#include "pcm/Dither.hxx" +#include "pcm/Buffer.hxx" #include "pcm/SampleFormat.hxx" #include diff --git a/test/test_pcm_mix.cxx b/test/test_pcm_mix.cxx index 346b4637d..db268e052 100644 --- a/test/test_pcm_mix.cxx +++ b/test/test_pcm_mix.cxx @@ -18,8 +18,8 @@ */ #include "test_pcm_util.hxx" -#include "pcm/PcmMix.hxx" -#include "pcm/PcmDither.hxx" +#include "pcm/Mix.hxx" +#include "pcm/Dither.hxx" #include diff --git a/test/test_pcm_pack.cxx b/test/test_pcm_pack.cxx index da9187d04..6e888dbab 100644 --- a/test/test_pcm_pack.cxx +++ b/test/test_pcm_pack.cxx @@ -18,7 +18,7 @@ */ #include "test_pcm_util.hxx" -#include "pcm/PcmPack.hxx" +#include "pcm/Pack.hxx" #include "util/ByteOrder.hxx" #include