From c654c7630aad220a4935c34b076e107b6b0561a5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 9 Apr 2013 01:24:52 +0200 Subject: [PATCH] pcm_*: move to src/pcm/ --- Makefile.am | 54 +++++++++++----------- src/DecoderInternal.hxx | 2 +- src/Main.cxx | 2 +- src/MixerAll.cxx | 2 +- src/OutputThread.cxx | 2 +- src/decoder/FLACCommon.hxx | 2 +- src/encoder/flac_encoder.c | 2 +- src/filter/ConvertFilterPlugin.cxx | 2 +- src/filter/NormalizeFilterPlugin.cxx | 2 +- src/filter/ReplayGainFilterPlugin.cxx | 4 +- src/filter/RouteFilterPlugin.cxx | 2 +- src/filter/VolumeFilterPlugin.cxx | 4 +- src/mixer/SoftwareMixerPlugin.cxx | 2 +- src/output/AlsaOutputPlugin.cxx | 2 +- src/output/OssOutputPlugin.cxx | 2 +- src/output/WinmmOutputPlugin.cxx | 2 +- src/output_internal.h | 2 +- src/{ => pcm}/PcmChannels.cxx | 0 src/{ => pcm}/PcmChannels.hxx | 0 src/{ => pcm}/PcmConvert.cxx | 0 src/{ => pcm}/PcmConvert.hxx | 0 src/{ => pcm}/PcmDither.cxx | 0 src/{ => pcm}/PcmDither.hxx | 0 src/{ => pcm}/PcmFormat.cxx | 0 src/{ => pcm}/PcmFormat.hxx | 0 src/{ => pcm}/PcmMix.cxx | 0 src/{ => pcm}/PcmMix.hxx | 0 src/{ => pcm}/PcmPrng.hxx | 0 src/{ => pcm}/PcmUtils.hxx | 0 src/{ => pcm}/PcmVolume.cxx | 0 src/{ => pcm}/PcmVolume.hxx | 0 src/{ => pcm}/dsd2pcm/dsd2pcm.c | 0 src/{ => pcm}/dsd2pcm/dsd2pcm.h | 0 src/{ => pcm}/dsd2pcm/dsd2pcm.hpp | 0 src/{ => pcm}/dsd2pcm/info.txt | 0 src/{ => pcm}/dsd2pcm/main.cpp | 0 src/{ => pcm}/dsd2pcm/noiseshape.c | 0 src/{ => pcm}/dsd2pcm/noiseshape.h | 0 src/{ => pcm}/dsd2pcm/noiseshape.hpp | 0 src/{ => pcm}/pcm_buffer.c | 0 src/{ => pcm}/pcm_buffer.h | 0 src/{ => pcm}/pcm_dsd.c | 0 src/{ => pcm}/pcm_dsd.h | 0 src/{ => pcm}/pcm_dsd_usb.c | 0 src/{ => pcm}/pcm_dsd_usb.h | 0 src/{ => pcm}/pcm_export.c | 0 src/{ => pcm}/pcm_export.h | 0 src/{ => pcm}/pcm_pack.c | 0 src/{ => pcm}/pcm_pack.h | 0 src/{ => pcm}/pcm_resample.c | 0 src/{ => pcm}/pcm_resample.h | 0 src/{ => pcm}/pcm_resample_fallback.c | 0 src/{ => pcm}/pcm_resample_internal.h | 0 src/{ => pcm}/pcm_resample_libsamplerate.c | 0 test/read_mixer.cxx | 2 +- test/run_convert.cxx | 2 +- test/run_filter.cxx | 2 +- test/run_output.cxx | 2 +- test/software_volume.cxx | 2 +- test/test_pcm_channels.cxx | 4 +- test/test_pcm_dither.cxx | 2 +- test/test_pcm_format.cxx | 8 ++-- test/test_pcm_mix.cxx | 2 +- test/test_pcm_pack.cxx | 2 +- test/test_pcm_volume.cxx | 2 +- 65 files changed, 60 insertions(+), 60 deletions(-) rename src/{ => pcm}/PcmChannels.cxx (100%) rename src/{ => pcm}/PcmChannels.hxx (100%) rename src/{ => pcm}/PcmConvert.cxx (100%) rename src/{ => pcm}/PcmConvert.hxx (100%) rename src/{ => pcm}/PcmDither.cxx (100%) rename src/{ => pcm}/PcmDither.hxx (100%) rename src/{ => pcm}/PcmFormat.cxx (100%) rename src/{ => pcm}/PcmFormat.hxx (100%) rename src/{ => pcm}/PcmMix.cxx (100%) rename src/{ => pcm}/PcmMix.hxx (100%) rename src/{ => pcm}/PcmPrng.hxx (100%) rename src/{ => pcm}/PcmUtils.hxx (100%) rename src/{ => pcm}/PcmVolume.cxx (100%) rename src/{ => pcm}/PcmVolume.hxx (100%) rename src/{ => pcm}/dsd2pcm/dsd2pcm.c (100%) rename src/{ => pcm}/dsd2pcm/dsd2pcm.h (100%) rename src/{ => pcm}/dsd2pcm/dsd2pcm.hpp (100%) rename src/{ => pcm}/dsd2pcm/info.txt (100%) rename src/{ => pcm}/dsd2pcm/main.cpp (100%) rename src/{ => pcm}/dsd2pcm/noiseshape.c (100%) rename src/{ => pcm}/dsd2pcm/noiseshape.h (100%) rename src/{ => pcm}/dsd2pcm/noiseshape.hpp (100%) rename src/{ => pcm}/pcm_buffer.c (100%) rename src/{ => pcm}/pcm_buffer.h (100%) rename src/{ => pcm}/pcm_dsd.c (100%) rename src/{ => pcm}/pcm_dsd.h (100%) rename src/{ => pcm}/pcm_dsd_usb.c (100%) rename src/{ => pcm}/pcm_dsd_usb.h (100%) rename src/{ => pcm}/pcm_export.c (100%) rename src/{ => pcm}/pcm_export.h (100%) rename src/{ => pcm}/pcm_pack.c (100%) rename src/{ => pcm}/pcm_pack.h (100%) rename src/{ => pcm}/pcm_resample.c (100%) rename src/{ => pcm}/pcm_resample.h (100%) rename src/{ => pcm}/pcm_resample_fallback.c (100%) rename src/{ => pcm}/pcm_resample_internal.h (100%) rename src/{ => pcm}/pcm_resample_libsamplerate.c (100%) diff --git a/Makefile.am b/Makefile.am index 4c6b78e47..fafc96f4a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -315,23 +315,23 @@ libevent_a_SOURCES = \ # PCM library libpcm_a_SOURCES = \ - src/pcm_buffer.c src/pcm_buffer.h \ - src/pcm_export.c src/pcm_export.h \ - src/PcmConvert.cxx src/PcmConvert.hxx \ - src/dsd2pcm/dsd2pcm.c src/dsd2pcm/dsd2pcm.h \ - src/pcm_dsd.c src/pcm_dsd.h \ - src/pcm_dsd_usb.c src/pcm_dsd_usb.h \ - src/PcmVolume.cxx src/PcmVolume.hxx \ - src/PcmMix.cxx src/PcmMix.hxx \ - src/PcmChannels.cxx src/PcmChannels.hxx \ - src/pcm_pack.c src/pcm_pack.h \ - src/PcmFormat.cxx src/PcmFormat.hxx \ - src/pcm_resample.c src/pcm_resample.h \ - src/pcm_resample_fallback.c \ - src/pcm_resample_internal.h \ - src/PcmDither.cxx src/PcmDither.hxx \ - src/PcmPrng.hxx \ - src/PcmUtils.hxx + src/pcm/pcm_buffer.c src/pcm/pcm_buffer.h \ + src/pcm/pcm_export.c src/pcm/pcm_export.h \ + src/pcm/PcmConvert.cxx src/pcm/PcmConvert.hxx \ + src/pcm/dsd2pcm/dsd2pcm.c src/pcm/dsd2pcm/dsd2pcm.h \ + src/pcm/pcm_dsd.c src/pcm/pcm_dsd.h \ + src/pcm/pcm_dsd_usb.c src/pcm/pcm_dsd_usb.h \ + src/pcm/PcmVolume.cxx src/pcm/PcmVolume.hxx \ + src/pcm/PcmMix.cxx src/pcm/PcmMix.hxx \ + src/pcm/PcmChannels.cxx src/pcm/PcmChannels.hxx \ + src/pcm/pcm_pack.c src/pcm/pcm_pack.h \ + src/pcm/PcmFormat.cxx src/pcm/PcmFormat.hxx \ + src/pcm/pcm_resample.c src/pcm/pcm_resample.h \ + src/pcm/pcm_resample_fallback.c \ + src/pcm/pcm_resample_internal.h \ + src/pcm/PcmDither.cxx src/pcm/PcmDither.hxx \ + src/pcm/PcmPrng.hxx \ + src/pcm/PcmUtils.hxx libpcm_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(SAMPLERATE_CFLAGS) @@ -340,7 +340,7 @@ PCM_LIBS = \ $(SAMPLERATE_LIBS) if HAVE_LIBSAMPLERATE -libpcm_a_SOURCES += src/pcm_resample_libsamplerate.c +libpcm_a_SOURCES += src/pcm/pcm_resample_libsamplerate.c endif # File system library @@ -1141,13 +1141,14 @@ test_dump_playlist_LDADD = \ libevent.a \ libfs.a \ libutil.a \ + libpcm.a \ $(GLIB_LIBS) test_dump_playlist_SOURCES = test/dump_playlist.cxx \ $(DECODER_SRC) \ src/IOThread.cxx \ src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \ src/tag_handler.c src/TagFile.cxx \ - src/audio_check.c src/pcm_buffer.c \ + src/audio_check.c \ src/text_input_stream.c \ src/cue/CueParser.cxx src/cue/CueParser.hxx \ src/fd_util.c @@ -1262,12 +1263,12 @@ test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \ src/audio_check.c \ src/audio_format.c \ src/AudioParser.cxx \ - src/pcm_buffer.c \ $(ENCODER_SRC) test_test_vorbis_encoder_CPPFLAGS = $(AM_CPPFLAGS) \ $(ENCODER_CFLAGS) test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \ $(ENCODER_LIBS) \ + $(PCM_LIBS) \ libconf.a \ libfs.a \ libutil.a \ @@ -1291,7 +1292,6 @@ test_run_normalize_LDADD = \ $(GLIB_LIBS) test_run_convert_SOURCES = test/run_convert.cxx \ - src/dsd2pcm/dsd2pcm.c \ src/audio_format.c \ src/audio_check.c \ src/AudioParser.cxx @@ -1401,13 +1401,13 @@ test_test_queue_priority_LDADD = \ libutil.a \ $(GLIB_LIBS) -noinst_PROGRAMS += src/dsd2pcm/dsd2pcm +noinst_PROGRAMS += src/pcm/dsd2pcm/dsd2pcm -src_dsd2pcm_dsd2pcm_SOURCES = \ - src/dsd2pcm/dsd2pcm.c src/dsd2pcm/dsd2pcm.h \ - src/dsd2pcm/noiseshape.c src/dsd2pcm/noiseshape.h \ - src/dsd2pcm/main.cpp -src_dsd2pcm_dsd2pcm_LDADD = libutil.a +src_pcm_dsd2pcm_dsd2pcm_SOURCES = \ + src/pcm/dsd2pcm/dsd2pcm.c src/pcm/dsd2pcm/dsd2pcm.h \ + src/pcm/dsd2pcm/noiseshape.c src/pcm/dsd2pcm/noiseshape.h \ + src/pcm/dsd2pcm/main.cpp +src_pcm_dsd2pcm_dsd2pcm_LDADD = libutil.a endif diff --git a/src/DecoderInternal.hxx b/src/DecoderInternal.hxx index 3423e3f95..4cc8d3aa7 100644 --- a/src/DecoderInternal.hxx +++ b/src/DecoderInternal.hxx @@ -21,7 +21,7 @@ #define MPD_DECODER_INTERNAL_HXX #include "decoder_command.h" -#include "PcmConvert.hxx" +#include "pcm/PcmConvert.hxx" #include "replay_gain_info.h" struct input_stream; diff --git a/src/Main.cxx b/src/Main.cxx index 322f4d618..35eaea4ee 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -56,7 +56,7 @@ extern "C" { #include "daemon.h" #include "stats.h" -#include "pcm_resample.h" +#include "pcm/pcm_resample.h" } #include "mpd_error.h" diff --git a/src/MixerAll.cxx b/src/MixerAll.cxx index 00343a1a0..36c83abf8 100644 --- a/src/MixerAll.cxx +++ b/src/MixerAll.cxx @@ -23,7 +23,7 @@ #include "MixerInternal.hxx" #include "MixerList.hxx" #include "OutputAll.hxx" -#include "PcmVolume.hxx" +#include "pcm/PcmVolume.hxx" extern "C" { #include "output_internal.h" diff --git a/src/OutputThread.cxx b/src/OutputThread.cxx index f1ffe876f..34b3f50ba 100644 --- a/src/OutputThread.cxx +++ b/src/OutputThread.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "OutputThread.hxx" #include "output_api.h" -#include "PcmMix.hxx" +#include "pcm/PcmMix.hxx" extern "C" { #include "output_internal.h" diff --git a/src/decoder/FLACCommon.hxx b/src/decoder/FLACCommon.hxx index b80372bbf..20f93c8c7 100644 --- a/src/decoder/FLACCommon.hxx +++ b/src/decoder/FLACCommon.hxx @@ -28,7 +28,7 @@ #include "decoder_api.h" extern "C" { -#include "pcm_buffer.h" +#include "pcm/pcm_buffer.h" } #include diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c index db6503fb0..060d63318 100644 --- a/src/encoder/flac_encoder.c +++ b/src/encoder/flac_encoder.c @@ -21,7 +21,7 @@ #include "encoder_api.h" #include "encoder_plugin.h" #include "audio_format.h" -#include "pcm_buffer.h" +#include "pcm/pcm_buffer.h" #include "util/fifo_buffer.h" #include "util/growing_fifo.h" diff --git a/src/filter/ConvertFilterPlugin.cxx b/src/filter/ConvertFilterPlugin.cxx index 2c6907655..09a2c9848 100644 --- a/src/filter/ConvertFilterPlugin.cxx +++ b/src/filter/ConvertFilterPlugin.cxx @@ -23,7 +23,7 @@ #include "FilterInternal.hxx" #include "FilterRegistry.hxx" #include "conf.h" -#include "PcmConvert.hxx" +#include "pcm/PcmConvert.hxx" #include "util/Manual.hxx" #include "audio_format.h" #include "poison.h" diff --git a/src/filter/NormalizeFilterPlugin.cxx b/src/filter/NormalizeFilterPlugin.cxx index e18c5cdf9..082d6fc94 100644 --- a/src/filter/NormalizeFilterPlugin.cxx +++ b/src/filter/NormalizeFilterPlugin.cxx @@ -21,7 +21,7 @@ #include "FilterPlugin.hxx" #include "FilterInternal.hxx" #include "FilterRegistry.hxx" -#include "pcm_buffer.h" +#include "pcm/pcm_buffer.h" #include "audio_format.h" #include "AudioCompress/compress.h" diff --git a/src/filter/ReplayGainFilterPlugin.cxx b/src/filter/ReplayGainFilterPlugin.cxx index 1fa2269b4..fed474bd5 100644 --- a/src/filter/ReplayGainFilterPlugin.cxx +++ b/src/filter/ReplayGainFilterPlugin.cxx @@ -26,10 +26,10 @@ #include "replay_gain_info.h" #include "replay_gain_config.h" #include "MixerControl.hxx" -#include "PcmVolume.hxx" +#include "pcm/PcmVolume.hxx" extern "C" { -#include "pcm_buffer.h" +#include "pcm/pcm_buffer.h" } #include diff --git a/src/filter/RouteFilterPlugin.cxx b/src/filter/RouteFilterPlugin.cxx index 559578938..c6cf302b2 100644 --- a/src/filter/RouteFilterPlugin.cxx +++ b/src/filter/RouteFilterPlugin.cxx @@ -47,7 +47,7 @@ #include "FilterPlugin.hxx" #include "FilterInternal.hxx" #include "FilterRegistry.hxx" -#include "pcm_buffer.h" +#include "pcm/pcm_buffer.h" #include #include diff --git a/src/filter/VolumeFilterPlugin.cxx b/src/filter/VolumeFilterPlugin.cxx index 0689f5da5..660ad260e 100644 --- a/src/filter/VolumeFilterPlugin.cxx +++ b/src/filter/VolumeFilterPlugin.cxx @@ -23,8 +23,8 @@ #include "FilterInternal.hxx" #include "FilterRegistry.hxx" #include "conf.h" -#include "pcm_buffer.h" -#include "PcmVolume.hxx" +#include "pcm/pcm_buffer.h" +#include "pcm/PcmVolume.hxx" #include "audio_format.h" #include diff --git a/src/mixer/SoftwareMixerPlugin.cxx b/src/mixer/SoftwareMixerPlugin.cxx index 6c287ea07..ccadadb4d 100644 --- a/src/mixer/SoftwareMixerPlugin.cxx +++ b/src/mixer/SoftwareMixerPlugin.cxx @@ -23,7 +23,7 @@ #include "FilterPlugin.hxx" #include "FilterRegistry.hxx" #include "filter/VolumeFilterPlugin.hxx" -#include "PcmVolume.hxx" +#include "pcm/PcmVolume.hxx" #include #include diff --git a/src/output/AlsaOutputPlugin.cxx b/src/output/AlsaOutputPlugin.cxx index c87c4cb99..096bf8a3c 100644 --- a/src/output/AlsaOutputPlugin.cxx +++ b/src/output/AlsaOutputPlugin.cxx @@ -21,7 +21,7 @@ #include "AlsaOutputPlugin.hxx" #include "output_api.h" #include "MixerList.hxx" -#include "pcm_export.h" +#include "pcm/pcm_export.h" #include #include diff --git a/src/output/OssOutputPlugin.cxx b/src/output/OssOutputPlugin.cxx index 0111b13f6..1cf2d2f2e 100644 --- a/src/output/OssOutputPlugin.cxx +++ b/src/output/OssOutputPlugin.cxx @@ -52,7 +52,7 @@ #endif #ifdef AFMT_S24_PACKED -#include "pcm_export.h" +#include "pcm/pcm_export.h" #endif struct oss_data { diff --git a/src/output/WinmmOutputPlugin.cxx b/src/output/WinmmOutputPlugin.cxx index b9652fc0b..2386bfc61 100644 --- a/src/output/WinmmOutputPlugin.cxx +++ b/src/output/WinmmOutputPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "WinmmOutputPlugin.hxx" #include "output_api.h" -#include "pcm_buffer.h" +#include "pcm/pcm_buffer.h" #include "MixerList.hxx" #include diff --git a/src/output_internal.h b/src/output_internal.h index 201962a72..8d0177786 100644 --- a/src/output_internal.h +++ b/src/output_internal.h @@ -21,7 +21,7 @@ #define MPD_OUTPUT_INTERNAL_H #include "audio_format.h" -#include "pcm_buffer.h" +#include "pcm/pcm_buffer.h" #include diff --git a/src/PcmChannels.cxx b/src/pcm/PcmChannels.cxx similarity index 100% rename from src/PcmChannels.cxx rename to src/pcm/PcmChannels.cxx diff --git a/src/PcmChannels.hxx b/src/pcm/PcmChannels.hxx similarity index 100% rename from src/PcmChannels.hxx rename to src/pcm/PcmChannels.hxx diff --git a/src/PcmConvert.cxx b/src/pcm/PcmConvert.cxx similarity index 100% rename from src/PcmConvert.cxx rename to src/pcm/PcmConvert.cxx diff --git a/src/PcmConvert.hxx b/src/pcm/PcmConvert.hxx similarity index 100% rename from src/PcmConvert.hxx rename to src/pcm/PcmConvert.hxx diff --git a/src/PcmDither.cxx b/src/pcm/PcmDither.cxx similarity index 100% rename from src/PcmDither.cxx rename to src/pcm/PcmDither.cxx diff --git a/src/PcmDither.hxx b/src/pcm/PcmDither.hxx similarity index 100% rename from src/PcmDither.hxx rename to src/pcm/PcmDither.hxx diff --git a/src/PcmFormat.cxx b/src/pcm/PcmFormat.cxx similarity index 100% rename from src/PcmFormat.cxx rename to src/pcm/PcmFormat.cxx diff --git a/src/PcmFormat.hxx b/src/pcm/PcmFormat.hxx similarity index 100% rename from src/PcmFormat.hxx rename to src/pcm/PcmFormat.hxx diff --git a/src/PcmMix.cxx b/src/pcm/PcmMix.cxx similarity index 100% rename from src/PcmMix.cxx rename to src/pcm/PcmMix.cxx diff --git a/src/PcmMix.hxx b/src/pcm/PcmMix.hxx similarity index 100% rename from src/PcmMix.hxx rename to src/pcm/PcmMix.hxx diff --git a/src/PcmPrng.hxx b/src/pcm/PcmPrng.hxx similarity index 100% rename from src/PcmPrng.hxx rename to src/pcm/PcmPrng.hxx diff --git a/src/PcmUtils.hxx b/src/pcm/PcmUtils.hxx similarity index 100% rename from src/PcmUtils.hxx rename to src/pcm/PcmUtils.hxx diff --git a/src/PcmVolume.cxx b/src/pcm/PcmVolume.cxx similarity index 100% rename from src/PcmVolume.cxx rename to src/pcm/PcmVolume.cxx diff --git a/src/PcmVolume.hxx b/src/pcm/PcmVolume.hxx similarity index 100% rename from src/PcmVolume.hxx rename to src/pcm/PcmVolume.hxx diff --git a/src/dsd2pcm/dsd2pcm.c b/src/pcm/dsd2pcm/dsd2pcm.c similarity index 100% rename from src/dsd2pcm/dsd2pcm.c rename to src/pcm/dsd2pcm/dsd2pcm.c diff --git a/src/dsd2pcm/dsd2pcm.h b/src/pcm/dsd2pcm/dsd2pcm.h similarity index 100% rename from src/dsd2pcm/dsd2pcm.h rename to src/pcm/dsd2pcm/dsd2pcm.h diff --git a/src/dsd2pcm/dsd2pcm.hpp b/src/pcm/dsd2pcm/dsd2pcm.hpp similarity index 100% rename from src/dsd2pcm/dsd2pcm.hpp rename to src/pcm/dsd2pcm/dsd2pcm.hpp diff --git a/src/dsd2pcm/info.txt b/src/pcm/dsd2pcm/info.txt similarity index 100% rename from src/dsd2pcm/info.txt rename to src/pcm/dsd2pcm/info.txt diff --git a/src/dsd2pcm/main.cpp b/src/pcm/dsd2pcm/main.cpp similarity index 100% rename from src/dsd2pcm/main.cpp rename to src/pcm/dsd2pcm/main.cpp diff --git a/src/dsd2pcm/noiseshape.c b/src/pcm/dsd2pcm/noiseshape.c similarity index 100% rename from src/dsd2pcm/noiseshape.c rename to src/pcm/dsd2pcm/noiseshape.c diff --git a/src/dsd2pcm/noiseshape.h b/src/pcm/dsd2pcm/noiseshape.h similarity index 100% rename from src/dsd2pcm/noiseshape.h rename to src/pcm/dsd2pcm/noiseshape.h diff --git a/src/dsd2pcm/noiseshape.hpp b/src/pcm/dsd2pcm/noiseshape.hpp similarity index 100% rename from src/dsd2pcm/noiseshape.hpp rename to src/pcm/dsd2pcm/noiseshape.hpp diff --git a/src/pcm_buffer.c b/src/pcm/pcm_buffer.c similarity index 100% rename from src/pcm_buffer.c rename to src/pcm/pcm_buffer.c diff --git a/src/pcm_buffer.h b/src/pcm/pcm_buffer.h similarity index 100% rename from src/pcm_buffer.h rename to src/pcm/pcm_buffer.h diff --git a/src/pcm_dsd.c b/src/pcm/pcm_dsd.c similarity index 100% rename from src/pcm_dsd.c rename to src/pcm/pcm_dsd.c diff --git a/src/pcm_dsd.h b/src/pcm/pcm_dsd.h similarity index 100% rename from src/pcm_dsd.h rename to src/pcm/pcm_dsd.h diff --git a/src/pcm_dsd_usb.c b/src/pcm/pcm_dsd_usb.c similarity index 100% rename from src/pcm_dsd_usb.c rename to src/pcm/pcm_dsd_usb.c diff --git a/src/pcm_dsd_usb.h b/src/pcm/pcm_dsd_usb.h similarity index 100% rename from src/pcm_dsd_usb.h rename to src/pcm/pcm_dsd_usb.h diff --git a/src/pcm_export.c b/src/pcm/pcm_export.c similarity index 100% rename from src/pcm_export.c rename to src/pcm/pcm_export.c diff --git a/src/pcm_export.h b/src/pcm/pcm_export.h similarity index 100% rename from src/pcm_export.h rename to src/pcm/pcm_export.h diff --git a/src/pcm_pack.c b/src/pcm/pcm_pack.c similarity index 100% rename from src/pcm_pack.c rename to src/pcm/pcm_pack.c diff --git a/src/pcm_pack.h b/src/pcm/pcm_pack.h similarity index 100% rename from src/pcm_pack.h rename to src/pcm/pcm_pack.h diff --git a/src/pcm_resample.c b/src/pcm/pcm_resample.c similarity index 100% rename from src/pcm_resample.c rename to src/pcm/pcm_resample.c diff --git a/src/pcm_resample.h b/src/pcm/pcm_resample.h similarity index 100% rename from src/pcm_resample.h rename to src/pcm/pcm_resample.h diff --git a/src/pcm_resample_fallback.c b/src/pcm/pcm_resample_fallback.c similarity index 100% rename from src/pcm_resample_fallback.c rename to src/pcm/pcm_resample_fallback.c diff --git a/src/pcm_resample_internal.h b/src/pcm/pcm_resample_internal.h similarity index 100% rename from src/pcm_resample_internal.h rename to src/pcm/pcm_resample_internal.h diff --git a/src/pcm_resample_libsamplerate.c b/src/pcm/pcm_resample_libsamplerate.c similarity index 100% rename from src/pcm_resample_libsamplerate.c rename to src/pcm/pcm_resample_libsamplerate.c diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx index 45344a2f6..1dc0a4f43 100644 --- a/test/read_mixer.cxx +++ b/test/read_mixer.cxx @@ -21,7 +21,7 @@ #include "MixerControl.hxx" #include "MixerList.hxx" #include "FilterRegistry.hxx" -#include "PcmVolume.hxx" +#include "pcm/PcmVolume.hxx" #include "GlobalEvents.hxx" #include "Main.hxx" #include "event/Loop.hxx" diff --git a/test/run_convert.cxx b/test/run_convert.cxx index e66d0be2b..2b0214912 100644 --- a/test/run_convert.cxx +++ b/test/run_convert.cxx @@ -26,7 +26,7 @@ #include "config.h" #include "AudioParser.hxx" #include "audio_format.h" -#include "PcmConvert.hxx" +#include "pcm/PcmConvert.hxx" #include "conf.h" #include "util/fifo_buffer.h" #include "stdbin.h" diff --git a/test/run_filter.cxx b/test/run_filter.cxx index 9ea50ff55..0b8078c1a 100644 --- a/test/run_filter.cxx +++ b/test/run_filter.cxx @@ -24,7 +24,7 @@ #include "audio_format.h" #include "FilterPlugin.hxx" #include "FilterInternal.hxx" -#include "PcmVolume.hxx" +#include "pcm/PcmVolume.hxx" #include "MixerControl.hxx" #include "stdbin.h" diff --git a/test/run_output.cxx b/test/run_output.cxx index 5b6d54a11..e41fe1cad 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -27,7 +27,7 @@ #include "IOThread.hxx" #include "fs/Path.hxx" #include "AudioParser.hxx" -#include "PcmConvert.hxx" +#include "pcm/PcmConvert.hxx" extern "C" { #include "output_plugin.h" diff --git a/test/software_volume.cxx b/test/software_volume.cxx index 929932398..fee4eeff3 100644 --- a/test/software_volume.cxx +++ b/test/software_volume.cxx @@ -24,7 +24,7 @@ */ #include "config.h" -#include "PcmVolume.hxx" +#include "pcm/PcmVolume.hxx" #include "AudioParser.hxx" #include "audio_format.h" #include "stdbin.h" diff --git a/test/test_pcm_channels.cxx b/test/test_pcm_channels.cxx index 8e013d5af..1f9d02daf 100644 --- a/test/test_pcm_channels.cxx +++ b/test/test_pcm_channels.cxx @@ -20,8 +20,8 @@ #include "config.h" #include "test_pcm_all.hxx" #include "test_pcm_util.hxx" -#include "PcmChannels.hxx" -#include "pcm_buffer.h" +#include "pcm/PcmChannels.hxx" +#include "pcm/pcm_buffer.h" #include diff --git a/test/test_pcm_dither.cxx b/test/test_pcm_dither.cxx index 2fb976db5..5694c17f8 100644 --- a/test/test_pcm_dither.cxx +++ b/test/test_pcm_dither.cxx @@ -19,7 +19,7 @@ #include "test_pcm_all.hxx" #include "test_pcm_util.hxx" -#include "PcmDither.hxx" +#include "pcm/PcmDither.hxx" #include diff --git a/test/test_pcm_format.cxx b/test/test_pcm_format.cxx index f175a850c..f9b9516c9 100644 --- a/test/test_pcm_format.cxx +++ b/test/test_pcm_format.cxx @@ -20,10 +20,10 @@ #include "config.h" #include "test_pcm_all.hxx" #include "test_pcm_util.hxx" -#include "PcmFormat.hxx" -#include "PcmDither.hxx" -#include "PcmUtils.hxx" -#include "pcm_buffer.h" +#include "pcm/PcmFormat.hxx" +#include "pcm/PcmDither.hxx" +#include "pcm/PcmUtils.hxx" +#include "pcm/pcm_buffer.h" #include "audio_format.h" #include diff --git a/test/test_pcm_mix.cxx b/test/test_pcm_mix.cxx index a6e01d20f..b4d8486bf 100644 --- a/test/test_pcm_mix.cxx +++ b/test/test_pcm_mix.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "test_pcm_all.hxx" #include "test_pcm_util.hxx" -#include "PcmMix.hxx" +#include "pcm/PcmMix.hxx" #include diff --git a/test/test_pcm_pack.cxx b/test/test_pcm_pack.cxx index e23acad58..313948838 100644 --- a/test/test_pcm_pack.cxx +++ b/test/test_pcm_pack.cxx @@ -21,7 +21,7 @@ #include "test_pcm_util.hxx" extern "C" { -#include "pcm_pack.h" +#include "pcm/pcm_pack.h" } #include diff --git a/test/test_pcm_volume.cxx b/test/test_pcm_volume.cxx index 1ab590490..ec3ac23b9 100644 --- a/test/test_pcm_volume.cxx +++ b/test/test_pcm_volume.cxx @@ -18,7 +18,7 @@ */ #include "test_pcm_all.hxx" -#include "PcmVolume.hxx" +#include "pcm/PcmVolume.hxx" #include "test_pcm_util.hxx" #include