diff --git a/src/Main.cxx b/src/Main.cxx index c61d28770..ee35ad246 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -46,7 +46,7 @@ #include "playlist/PlaylistRegistry.hxx" #include "zeroconf/ZeroconfGlue.hxx" #include "decoder/DecoderList.hxx" -#include "AudioParser.hxx" +#include "pcm/AudioParser.hxx" #include "pcm/Convert.hxx" #include "unix/SignalHandlers.hxx" #include "thread/Slack.hxx" diff --git a/src/MusicChunk.cxx b/src/MusicChunk.cxx index aee0d0e75..f19dc1f72 100644 --- a/src/MusicChunk.cxx +++ b/src/MusicChunk.cxx @@ -18,7 +18,7 @@ */ #include "MusicChunk.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "tag/Tag.hxx" #include diff --git a/src/MusicChunk.hxx b/src/MusicChunk.hxx index 822c13c86..17bd58606 100644 --- a/src/MusicChunk.hxx +++ b/src/MusicChunk.hxx @@ -26,7 +26,7 @@ #include "util/WritableBuffer.hxx" #ifndef NDEBUG -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #endif #include diff --git a/src/MusicPipe.hxx b/src/MusicPipe.hxx index 39f02077f..0cbaad0b8 100644 --- a/src/MusicPipe.hxx +++ b/src/MusicPipe.hxx @@ -25,7 +25,7 @@ #include "util/Compiler.h" #ifndef NDEBUG -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #endif /** diff --git a/src/SongSave.cxx b/src/SongSave.cxx index 8e3ba90b0..c123ffb19 100644 --- a/src/SongSave.cxx +++ b/src/SongSave.cxx @@ -18,7 +18,7 @@ */ #include "SongSave.hxx" -#include "AudioParser.hxx" +#include "pcm/AudioParser.hxx" #include "db/plugins/simple/Song.hxx" #include "song/DetachedSong.hxx" #include "TagSave.hxx" diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx index d9294abca..193621648 100644 --- a/src/command/PlayerCommands.cxx +++ b/src/command/PlayerCommands.cxx @@ -29,7 +29,6 @@ #include "Partition.hxx" #include "Instance.hxx" #include "IdleFlags.hxx" -#include "AudioFormat.hxx" #include "util/StringBuffer.hxx" #include "util/ScopeExit.hxx" #include "util/Exception.hxx" diff --git a/src/db/plugins/simple/Song.hxx b/src/db/plugins/simple/Song.hxx index 6fb6e649e..04be80845 100644 --- a/src/db/plugins/simple/Song.hxx +++ b/src/db/plugins/simple/Song.hxx @@ -23,7 +23,7 @@ #include "Ptr.hxx" #include "Chrono.hxx" #include "tag/Tag.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/Compiler.h" #include "config.h" diff --git a/src/decoder/Control.hxx b/src/decoder/Control.hxx index c2ed66066..b486f6d62 100644 --- a/src/decoder/Control.hxx +++ b/src/decoder/Control.hxx @@ -21,7 +21,7 @@ #define MPD_DECODER_CONTROL_HXX #include "Command.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "MixRampInfo.hxx" #include "input/Handler.hxx" #include "thread/Mutex.hxx" diff --git a/src/decoder/DecoderAPI.hxx b/src/decoder/DecoderAPI.hxx index fe3c47dbf..f8bd2c510 100644 --- a/src/decoder/DecoderAPI.hxx +++ b/src/decoder/DecoderAPI.hxx @@ -35,7 +35,7 @@ #include "DecoderPlugin.hxx" #include "ReplayGainInfo.hxx" #include "tag/Tag.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "MixRampInfo.hxx" #include "config/Block.hxx" #include "Chrono.hxx" diff --git a/src/decoder/plugins/AdPlugDecoderPlugin.cxx b/src/decoder/plugins/AdPlugDecoderPlugin.cxx index 37bab308b..6636cd910 100644 --- a/src/decoder/plugins/AdPlugDecoderPlugin.cxx +++ b/src/decoder/plugins/AdPlugDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "AdPlugDecoderPlugin.h" #include "tag/Handler.hxx" #include "../DecoderAPI.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "fs/Path.hxx" #include "util/Domain.hxx" #include "util/StringView.hxx" diff --git a/src/decoder/plugins/AudiofileDecoderPlugin.cxx b/src/decoder/plugins/AudiofileDecoderPlugin.cxx index fd0a99b98..cc7c7f8aa 100644 --- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx +++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "AudiofileDecoderPlugin.hxx" #include "../DecoderAPI.hxx" #include "input/InputStream.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "tag/Handler.hxx" #include "util/ScopeExit.hxx" #include "util/Domain.hxx" diff --git a/src/decoder/plugins/DsdiffDecoderPlugin.cxx b/src/decoder/plugins/DsdiffDecoderPlugin.cxx index abf34e37b..ef98f32f3 100644 --- a/src/decoder/plugins/DsdiffDecoderPlugin.cxx +++ b/src/decoder/plugins/DsdiffDecoderPlugin.cxx @@ -30,7 +30,7 @@ #include "DsdiffDecoderPlugin.hxx" #include "../DecoderAPI.hxx" #include "input/InputStream.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "util/bit_reverse.h" #include "util/ByteOrder.hxx" #include "util/StringView.hxx" diff --git a/src/decoder/plugins/DsfDecoderPlugin.cxx b/src/decoder/plugins/DsfDecoderPlugin.cxx index 606dbe476..62f168d4a 100644 --- a/src/decoder/plugins/DsfDecoderPlugin.cxx +++ b/src/decoder/plugins/DsfDecoderPlugin.cxx @@ -31,7 +31,7 @@ #include "DsfDecoderPlugin.hxx" #include "../DecoderAPI.hxx" #include "input/InputStream.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "util/bit_reverse.h" #include "util/ByteOrder.hxx" #include "DsdLib.hxx" diff --git a/src/decoder/plugins/FaadDecoderPlugin.cxx b/src/decoder/plugins/FaadDecoderPlugin.cxx index 6ce614321..407fa1c73 100644 --- a/src/decoder/plugins/FaadDecoderPlugin.cxx +++ b/src/decoder/plugins/FaadDecoderPlugin.cxx @@ -21,7 +21,7 @@ #include "../DecoderAPI.hxx" #include "../DecoderBuffer.hxx" #include "input/InputStream.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "tag/Handler.hxx" #include "util/ScopeExit.hxx" #include "util/ConstBuffer.hxx" diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index aba13d24f..6be0448b9 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -39,7 +39,7 @@ #include "tag/ReplayGain.hxx" #include "tag/MixRamp.hxx" #include "input/InputStream.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "util/ScopeExit.hxx" #include "util/ConstBuffer.hxx" #include "LogV.hxx" diff --git a/src/decoder/plugins/FlacPcm.cxx b/src/decoder/plugins/FlacPcm.cxx index de2f9bd6e..c6f853b65 100644 --- a/src/decoder/plugins/FlacPcm.cxx +++ b/src/decoder/plugins/FlacPcm.cxx @@ -18,7 +18,7 @@ */ #include "FlacPcm.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "lib/xiph/FlacAudioFormat.hxx" #include "util/RuntimeError.hxx" #include "util/ConstBuffer.hxx" diff --git a/src/decoder/plugins/FlacPcm.hxx b/src/decoder/plugins/FlacPcm.hxx index 39caf373e..d53c3b7ae 100644 --- a/src/decoder/plugins/FlacPcm.hxx +++ b/src/decoder/plugins/FlacPcm.hxx @@ -21,7 +21,7 @@ #define MPD_FLAC_PCM_HXX #include "pcm/Buffer.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include diff --git a/src/decoder/plugins/FluidsynthDecoderPlugin.cxx b/src/decoder/plugins/FluidsynthDecoderPlugin.cxx index 13fcb8918..b5de380ae 100644 --- a/src/decoder/plugins/FluidsynthDecoderPlugin.cxx +++ b/src/decoder/plugins/FluidsynthDecoderPlugin.cxx @@ -19,7 +19,7 @@ #include "FluidsynthDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "fs/Path.hxx" #include "util/Domain.hxx" #include "Log.hxx" diff --git a/src/decoder/plugins/GmeDecoderPlugin.cxx b/src/decoder/plugins/GmeDecoderPlugin.cxx index be082d962..c83069f30 100644 --- a/src/decoder/plugins/GmeDecoderPlugin.cxx +++ b/src/decoder/plugins/GmeDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "GmeDecoderPlugin.hxx" #include "../DecoderAPI.hxx" #include "config/Block.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "song/DetachedSong.hxx" #include "tag/Handler.hxx" #include "tag/Builder.hxx" diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index 31d7160ca..8f8db69c0 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -26,7 +26,7 @@ #include "tag/Handler.hxx" #include "tag/ReplayGain.hxx" #include "tag/MixRamp.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "util/Clamp.hxx" #include "util/StringCompare.hxx" #include "util/Domain.hxx" diff --git a/src/decoder/plugins/MpcdecDecoderPlugin.cxx b/src/decoder/plugins/MpcdecDecoderPlugin.cxx index e4f42cb0e..8c5fb9b74 100644 --- a/src/decoder/plugins/MpcdecDecoderPlugin.cxx +++ b/src/decoder/plugins/MpcdecDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "MpcdecDecoderPlugin.hxx" #include "../DecoderAPI.hxx" #include "input/InputStream.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "pcm/Traits.hxx" #include "tag/Handler.hxx" #include "util/Domain.hxx" diff --git a/src/decoder/plugins/Mpg123DecoderPlugin.cxx b/src/decoder/plugins/Mpg123DecoderPlugin.cxx index 5f13caa99..6e85e111b 100644 --- a/src/decoder/plugins/Mpg123DecoderPlugin.cxx +++ b/src/decoder/plugins/Mpg123DecoderPlugin.cxx @@ -19,7 +19,7 @@ #include "Mpg123DecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "tag/Handler.hxx" #include "tag/Builder.hxx" #include "tag/ReplayGain.hxx" diff --git a/src/decoder/plugins/PcmDecoderPlugin.cxx b/src/decoder/plugins/PcmDecoderPlugin.cxx index bbad1a4b4..54c3d57e6 100644 --- a/src/decoder/plugins/PcmDecoderPlugin.cxx +++ b/src/decoder/plugins/PcmDecoderPlugin.cxx @@ -21,7 +21,7 @@ #include "PcmDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "pcm/Pack.hxx" #include "input/InputStream.hxx" #include "util/ByteOrder.hxx" @@ -33,7 +33,7 @@ #include "Log.hxx" #ifdef ENABLE_ALSA -#include "AudioParser.hxx" +#include "pcm/AudioParser.hxx" #endif #include diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx index 53a9107b0..412ec2dfc 100644 --- a/src/decoder/plugins/SndfileDecoderPlugin.cxx +++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "SndfileDecoderPlugin.hxx" #include "../DecoderAPI.hxx" #include "input/InputStream.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "tag/Handler.hxx" #include "util/Domain.hxx" #include "util/ScopeExit.hxx" diff --git a/src/decoder/plugins/VorbisDecoderPlugin.cxx b/src/decoder/plugins/VorbisDecoderPlugin.cxx index 284fe8ae0..21a770bd7 100644 --- a/src/decoder/plugins/VorbisDecoderPlugin.cxx +++ b/src/decoder/plugins/VorbisDecoderPlugin.cxx @@ -28,9 +28,9 @@ #include "input/InputStream.hxx" #include "input/Reader.hxx" #include "OggCodec.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "pcm/Interleave.hxx" #include "util/ScopeExit.hxx" -#include "CheckAudioFormat.hxx" #include "tag/Handler.hxx" #include "Log.hxx" diff --git a/src/decoder/plugins/WavpackDecoderPlugin.cxx b/src/decoder/plugins/WavpackDecoderPlugin.cxx index 815784b72..2dc66b76d 100644 --- a/src/decoder/plugins/WavpackDecoderPlugin.cxx +++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx @@ -21,7 +21,7 @@ #include "WavpackDecoderPlugin.hxx" #include "../DecoderAPI.hxx" #include "input/InputStream.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "tag/Handler.hxx" #include "fs/Path.hxx" #include "util/Alloc.hxx" diff --git a/src/encoder/EncoderAPI.hxx b/src/encoder/EncoderAPI.hxx index 65060c859..c75f1300f 100644 --- a/src/encoder/EncoderAPI.hxx +++ b/src/encoder/EncoderAPI.hxx @@ -29,7 +29,7 @@ #include "EncoderInterface.hxx" #include "EncoderPlugin.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "tag/Tag.hxx" #include "config/Block.hxx" diff --git a/src/encoder/plugins/FlacEncoderPlugin.cxx b/src/encoder/plugins/FlacEncoderPlugin.cxx index e55ac03a4..6123082e1 100644 --- a/src/encoder/plugins/FlacEncoderPlugin.cxx +++ b/src/encoder/plugins/FlacEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "FlacEncoderPlugin.hxx" #include "../EncoderAPI.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "pcm/Buffer.hxx" #include "util/DynamicFifoBuffer.hxx" #include "util/RuntimeError.hxx" diff --git a/src/encoder/plugins/LameEncoderPlugin.cxx b/src/encoder/plugins/LameEncoderPlugin.cxx index 41957f55d..fef90a135 100644 --- a/src/encoder/plugins/LameEncoderPlugin.cxx +++ b/src/encoder/plugins/LameEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "LameEncoderPlugin.hxx" #include "../EncoderAPI.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/NumberParser.hxx" #include "util/ReusableArray.hxx" #include "util/RuntimeError.hxx" diff --git a/src/encoder/plugins/OpusEncoderPlugin.cxx b/src/encoder/plugins/OpusEncoderPlugin.cxx index 7c699d273..1cb345aa6 100644 --- a/src/encoder/plugins/OpusEncoderPlugin.cxx +++ b/src/encoder/plugins/OpusEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "OpusEncoderPlugin.hxx" #include "OggEncoder.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/ByteOrder.hxx" #include "util/StringUtil.hxx" diff --git a/src/encoder/plugins/ShineEncoderPlugin.cxx b/src/encoder/plugins/ShineEncoderPlugin.cxx index 94220cad4..cc427d700 100644 --- a/src/encoder/plugins/ShineEncoderPlugin.cxx +++ b/src/encoder/plugins/ShineEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "ShineEncoderPlugin.hxx" #include "../EncoderAPI.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/DynamicFifoBuffer.hxx" #include "util/RuntimeError.hxx" diff --git a/src/encoder/plugins/TwolameEncoderPlugin.cxx b/src/encoder/plugins/TwolameEncoderPlugin.cxx index e0d435bef..70bf5249c 100644 --- a/src/encoder/plugins/TwolameEncoderPlugin.cxx +++ b/src/encoder/plugins/TwolameEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "TwolameEncoderPlugin.hxx" #include "../EncoderAPI.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/NumberParser.hxx" #include "util/RuntimeError.hxx" #include "util/Domain.hxx" diff --git a/src/encoder/plugins/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx index 650892127..a213dd781 100644 --- a/src/encoder/plugins/VorbisEncoderPlugin.cxx +++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx @@ -20,7 +20,7 @@ #include "VorbisEncoderPlugin.hxx" #include "OggEncoder.hxx" #include "lib/xiph/VorbisComment.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "config/Domain.hxx" #include "util/StringUtil.hxx" #include "util/NumberParser.hxx" diff --git a/src/filter/Filter.hxx b/src/filter/Filter.hxx index 98baca446..214a22ec1 100644 --- a/src/filter/Filter.hxx +++ b/src/filter/Filter.hxx @@ -20,7 +20,7 @@ #ifndef MPD_FILTER_HXX #define MPD_FILTER_HXX -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include diff --git a/src/filter/plugins/AutoConvertFilterPlugin.cxx b/src/filter/plugins/AutoConvertFilterPlugin.cxx index 67c5eb7d6..24f267ce8 100644 --- a/src/filter/plugins/AutoConvertFilterPlugin.cxx +++ b/src/filter/plugins/AutoConvertFilterPlugin.cxx @@ -21,7 +21,7 @@ #include "ConvertFilterPlugin.hxx" #include "filter/Filter.hxx" #include "filter/Prepared.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/ConstBuffer.hxx" #include diff --git a/src/filter/plugins/ChainFilterPlugin.cxx b/src/filter/plugins/ChainFilterPlugin.cxx index 366c48865..73742b30a 100644 --- a/src/filter/plugins/ChainFilterPlugin.cxx +++ b/src/filter/plugins/ChainFilterPlugin.cxx @@ -20,7 +20,7 @@ #include "ChainFilterPlugin.hxx" #include "filter/Filter.hxx" #include "filter/Prepared.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/ConstBuffer.hxx" #include "util/StringBuffer.hxx" #include "util/RuntimeError.hxx" diff --git a/src/filter/plugins/ConvertFilterPlugin.cxx b/src/filter/plugins/ConvertFilterPlugin.cxx index 4792a9720..8e599683c 100644 --- a/src/filter/plugins/ConvertFilterPlugin.cxx +++ b/src/filter/plugins/ConvertFilterPlugin.cxx @@ -20,9 +20,9 @@ #include "ConvertFilterPlugin.hxx" #include "filter/Filter.hxx" #include "filter/Prepared.hxx" +#include "pcm/AudioFormat.hxx" #include "pcm/Convert.hxx" #include "util/ConstBuffer.hxx" -#include "AudioFormat.hxx" #include diff --git a/src/filter/plugins/HdcdFilterPlugin.cxx b/src/filter/plugins/HdcdFilterPlugin.cxx index 505089dad..5e63c651e 100644 --- a/src/filter/plugins/HdcdFilterPlugin.cxx +++ b/src/filter/plugins/HdcdFilterPlugin.cxx @@ -24,7 +24,7 @@ #include "filter/NullFilter.hxx" #include "filter/Prepared.hxx" #include "lib/ffmpeg/Filter.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" static constexpr const char *hdcd_graph = "hdcd"; diff --git a/src/filter/plugins/NormalizeFilterPlugin.cxx b/src/filter/plugins/NormalizeFilterPlugin.cxx index 318dc7c8c..729eaa9bd 100644 --- a/src/filter/plugins/NormalizeFilterPlugin.cxx +++ b/src/filter/plugins/NormalizeFilterPlugin.cxx @@ -22,7 +22,7 @@ #include "filter/Filter.hxx" #include "filter/Prepared.hxx" #include "pcm/Buffer.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "AudioCompress/compress.h" #include "util/ConstBuffer.hxx" diff --git a/src/filter/plugins/ReplayGainFilterPlugin.cxx b/src/filter/plugins/ReplayGainFilterPlugin.cxx index 4103542dd..4a667dbe7 100644 --- a/src/filter/plugins/ReplayGainFilterPlugin.cxx +++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx @@ -20,10 +20,10 @@ #include "ReplayGainFilterPlugin.hxx" #include "filter/Filter.hxx" #include "filter/Prepared.hxx" -#include "AudioFormat.hxx" #include "ReplayGainInfo.hxx" #include "ReplayGainConfig.hxx" #include "mixer/MixerControl.hxx" +#include "pcm/AudioFormat.hxx" #include "pcm/Volume.hxx" #include "util/ConstBuffer.hxx" #include "util/Domain.hxx" diff --git a/src/filter/plugins/RouteFilterPlugin.cxx b/src/filter/plugins/RouteFilterPlugin.cxx index 518530667..82c1880c9 100644 --- a/src/filter/plugins/RouteFilterPlugin.cxx +++ b/src/filter/plugins/RouteFilterPlugin.cxx @@ -41,10 +41,10 @@ #include "RouteFilterPlugin.hxx" #include "config/Block.hxx" -#include "AudioFormat.hxx" #include "filter/FilterPlugin.hxx" #include "filter/Filter.hxx" #include "filter/Prepared.hxx" +#include "pcm/AudioFormat.hxx" #include "pcm/Buffer.hxx" #include "pcm/Silence.hxx" #include "util/StringStrip.hxx" diff --git a/src/filter/plugins/VolumeFilterPlugin.cxx b/src/filter/plugins/VolumeFilterPlugin.cxx index 69b35bc1d..7d6dbd726 100644 --- a/src/filter/plugins/VolumeFilterPlugin.cxx +++ b/src/filter/plugins/VolumeFilterPlugin.cxx @@ -21,7 +21,7 @@ #include "filter/Filter.hxx" #include "filter/Prepared.hxx" #include "pcm/Volume.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/ConstBuffer.hxx" class VolumeFilter final : public Filter { diff --git a/src/input/plugins/AlsaInputPlugin.cxx b/src/input/plugins/AlsaInputPlugin.cxx index 12585ca2e..9ce539f18 100644 --- a/src/input/plugins/AlsaInputPlugin.cxx +++ b/src/input/plugins/AlsaInputPlugin.cxx @@ -35,8 +35,8 @@ #include "util/RuntimeError.hxx" #include "util/ASCII.hxx" #include "util/DivideString.hxx" -#include "AudioParser.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioParser.hxx" +#include "pcm/AudioFormat.hxx" #include "Log.hxx" #include "event/MultiSocketMonitor.hxx" #include "event/DeferEvent.hxx" diff --git a/src/lib/alsa/AllowedFormat.cxx b/src/lib/alsa/AllowedFormat.cxx index 261901f44..b346146c0 100644 --- a/src/lib/alsa/AllowedFormat.cxx +++ b/src/lib/alsa/AllowedFormat.cxx @@ -18,7 +18,7 @@ */ #include "AllowedFormat.hxx" -#include "AudioParser.hxx" +#include "pcm/AudioParser.hxx" #include "util/IterableSplitString.hxx" #include "util/StringBuffer.hxx" #include "config.h" diff --git a/src/lib/alsa/AllowedFormat.hxx b/src/lib/alsa/AllowedFormat.hxx index e540a24fe..d46ae960a 100644 --- a/src/lib/alsa/AllowedFormat.hxx +++ b/src/lib/alsa/AllowedFormat.hxx @@ -20,7 +20,7 @@ #ifndef MPD_ALSA_ALLOWED_FORMAT_HXX #define MPD_ALSA_ALLOWED_FORMAT_HXX -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "config.h" #include diff --git a/src/lib/alsa/HwSetup.cxx b/src/lib/alsa/HwSetup.cxx index ccbe2e390..a6a41dc11 100644 --- a/src/lib/alsa/HwSetup.cxx +++ b/src/lib/alsa/HwSetup.cxx @@ -22,7 +22,7 @@ #include "util/ByteOrder.hxx" #include "util/Domain.hxx" #include "util/RuntimeError.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "Log.hxx" #include "config.h" diff --git a/src/lib/ffmpeg/Filter.cxx b/src/lib/ffmpeg/Filter.cxx index 3df3d7403..9feac2840 100644 --- a/src/lib/ffmpeg/Filter.cxx +++ b/src/lib/ffmpeg/Filter.cxx @@ -19,7 +19,7 @@ #include "Filter.hxx" #include "SampleFormat.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/RuntimeError.hxx" #include diff --git a/src/lib/xiph/FlacStreamMetadata.cxx b/src/lib/xiph/FlacStreamMetadata.cxx index 79d8a0507..9c6e1af90 100644 --- a/src/lib/xiph/FlacStreamMetadata.cxx +++ b/src/lib/xiph/FlacStreamMetadata.cxx @@ -20,7 +20,7 @@ #include "FlacStreamMetadata.hxx" #include "FlacAudioFormat.hxx" #include "ScanVorbisComment.hxx" -#include "CheckAudioFormat.hxx" +#include "pcm/CheckAudioFormat.hxx" #include "MixRampInfo.hxx" #include "tag/Handler.hxx" #include "tag/Builder.hxx" diff --git a/src/output/Control.hxx b/src/output/Control.hxx index e2fda0f01..9c6d78f7e 100644 --- a/src/output/Control.hxx +++ b/src/output/Control.hxx @@ -21,7 +21,7 @@ #define MPD_OUTPUT_CONTROL_HXX #include "Source.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "thread/Thread.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" diff --git a/src/output/Filtered.hxx b/src/output/Filtered.hxx index 189d9d483..ca527e26e 100644 --- a/src/output/Filtered.hxx +++ b/src/output/Filtered.hxx @@ -20,7 +20,7 @@ #ifndef MPD_FILTERED_AUDIO_OUTPUT_HXX #define MPD_FILTERED_AUDIO_OUTPUT_HXX -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "filter/Observer.hxx" #include diff --git a/src/output/Init.cxx b/src/output/Init.cxx index 23dace9c3..96f7f3a0b 100644 --- a/src/output/Init.cxx +++ b/src/output/Init.cxx @@ -22,7 +22,7 @@ #include "Domain.hxx" #include "OutputAPI.hxx" #include "Defaults.hxx" -#include "AudioParser.hxx" +#include "pcm/AudioParser.hxx" #include "mixer/MixerList.hxx" #include "mixer/MixerType.hxx" #include "mixer/MixerControl.hxx" diff --git a/src/output/MultipleOutputs.hxx b/src/output/MultipleOutputs.hxx index 0d4a02c63..33c581617 100644 --- a/src/output/MultipleOutputs.hxx +++ b/src/output/MultipleOutputs.hxx @@ -23,7 +23,7 @@ #include "Control.hxx" #include "MusicChunkPtr.hxx" #include "player/Outputs.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "ReplayGainMode.hxx" #include "Chrono.hxx" #include "util/Compiler.h" diff --git a/src/output/OutputAPI.hxx b/src/output/OutputAPI.hxx index b2f73324c..8126a2222 100644 --- a/src/output/OutputAPI.hxx +++ b/src/output/OutputAPI.hxx @@ -24,7 +24,7 @@ #include "OutputPlugin.hxx" #include "Interface.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "tag/Tag.hxx" #include "config/Block.hxx" diff --git a/src/output/Source.hxx b/src/output/Source.hxx index a725c5121..3badfc819 100644 --- a/src/output/Source.hxx +++ b/src/output/Source.hxx @@ -21,8 +21,8 @@ #define AUDIO_OUTPUT_SOURCE_HXX #include "SharedPipeConsumer.hxx" -#include "AudioFormat.hxx" #include "ReplayGainMode.hxx" +#include "pcm/AudioFormat.hxx" #include "pcm/Buffer.hxx" #include "pcm/Dither.hxx" #include "thread/Mutex.hxx" diff --git a/src/output/Timer.cxx b/src/output/Timer.cxx index 84f8a09b7..051671f8d 100644 --- a/src/output/Timer.cxx +++ b/src/output/Timer.cxx @@ -18,7 +18,7 @@ */ #include "Timer.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include diff --git a/src/AudioFormat.cxx b/src/pcm/AudioFormat.cxx similarity index 100% rename from src/AudioFormat.cxx rename to src/pcm/AudioFormat.cxx diff --git a/src/AudioFormat.hxx b/src/pcm/AudioFormat.hxx similarity index 100% rename from src/AudioFormat.hxx rename to src/pcm/AudioFormat.hxx diff --git a/src/AudioParser.cxx b/src/pcm/AudioParser.cxx similarity index 100% rename from src/AudioParser.cxx rename to src/pcm/AudioParser.cxx diff --git a/src/AudioParser.hxx b/src/pcm/AudioParser.hxx similarity index 100% rename from src/AudioParser.hxx rename to src/pcm/AudioParser.hxx diff --git a/src/CheckAudioFormat.cxx b/src/pcm/CheckAudioFormat.cxx similarity index 100% rename from src/CheckAudioFormat.cxx rename to src/pcm/CheckAudioFormat.cxx diff --git a/src/CheckAudioFormat.hxx b/src/pcm/CheckAudioFormat.hxx similarity index 100% rename from src/CheckAudioFormat.hxx rename to src/pcm/CheckAudioFormat.hxx diff --git a/src/pcm/meson.build b/src/pcm/meson.build index 7cdb2f83a..75eb5fb19 100644 --- a/src/pcm/meson.build +++ b/src/pcm/meson.build @@ -1,7 +1,7 @@ pcm_basic_sources = [ - '../CheckAudioFormat.cxx', - '../AudioFormat.cxx', - '../AudioParser.cxx', + 'CheckAudioFormat.cxx', + 'AudioFormat.cxx', + 'AudioParser.cxx', 'SampleFormat.cxx', 'Interleave.cxx', 'Buffer.cxx', diff --git a/src/player/Control.hxx b/src/player/Control.hxx index b1bcf7048..711a26174 100644 --- a/src/player/Control.hxx +++ b/src/player/Control.hxx @@ -21,7 +21,7 @@ #define MPD_PLAYER_CONTROL_HXX #include "output/Client.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" #include "thread/Thread.hxx" diff --git a/src/player/CrossFade.cxx b/src/player/CrossFade.cxx index 8af7ad9ca..7efed3e55 100644 --- a/src/player/CrossFade.cxx +++ b/src/player/CrossFade.cxx @@ -20,7 +20,7 @@ #include "CrossFade.hxx" #include "Chrono.hxx" #include "MusicChunk.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/NumberParser.hxx" #include "util/Domain.hxx" #include "Log.hxx" diff --git a/src/song/AudioFormatSongFilter.hxx b/src/song/AudioFormatSongFilter.hxx index 4e97fd5ad..6687bb52e 100644 --- a/src/song/AudioFormatSongFilter.hxx +++ b/src/song/AudioFormatSongFilter.hxx @@ -21,7 +21,7 @@ #define MPD_AUDIO_FORMAT_SONG_FILTER_HXX #include "ISongFilter.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" class AudioFormatSongFilter final : public ISongFilter { AudioFormat value; diff --git a/src/song/Filter.cxx b/src/song/Filter.cxx index 36d7dad72..c3c566f85 100644 --- a/src/song/Filter.cxx +++ b/src/song/Filter.cxx @@ -25,7 +25,7 @@ #include "TagSongFilter.hxx" #include "ModifiedSinceSongFilter.hxx" #include "AudioFormatSongFilter.hxx" -#include "AudioParser.hxx" +#include "pcm/AudioParser.hxx" #include "tag/ParseName.hxx" #include "time/ISO8601.hxx" #include "util/CharUtil.hxx" diff --git a/src/song/LightSong.hxx b/src/song/LightSong.hxx index 2cc92400c..816eb37af 100644 --- a/src/song/LightSong.hxx +++ b/src/song/LightSong.hxx @@ -21,7 +21,7 @@ #define MPD_LIGHT_SONG_HXX #include "Chrono.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/Compiler.h" #include diff --git a/src/tag/Handler.cxx b/src/tag/Handler.cxx index 8381ec09b..467a93517 100644 --- a/src/tag/Handler.cxx +++ b/src/tag/Handler.cxx @@ -19,7 +19,7 @@ #include "Handler.hxx" #include "Builder.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/CharUtil.hxx" #include "util/StringView.hxx" diff --git a/test/RunChromaprint.cxx b/test/RunChromaprint.cxx index f7a5972bd..d3c278ac4 100644 --- a/test/RunChromaprint.cxx +++ b/test/RunChromaprint.cxx @@ -27,7 +27,7 @@ #include "input/Init.hxx" #include "input/InputStream.hxx" #include "fs/Path.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/OptionDef.hxx" #include "util/OptionParser.hxx" #include "util/PrintException.hxx" diff --git a/test/TestAudioFormat.cxx b/test/TestAudioFormat.cxx index 88cd3145d..e6b40f521 100644 --- a/test/TestAudioFormat.cxx +++ b/test/TestAudioFormat.cxx @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "AudioFormat.hxx" -#include "AudioParser.hxx" +#include "pcm/AudioFormat.hxx" +#include "pcm/AudioParser.hxx" #include "util/StringBuffer.hxx" #include diff --git a/test/read_tags.cxx b/test/read_tags.cxx index 827997856..567ad6735 100644 --- a/test/read_tags.cxx +++ b/test/read_tags.cxx @@ -27,7 +27,7 @@ #include "tag/Handler.hxx" #include "tag/Generic.hxx" #include "fs/Path.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/ScopeExit.hxx" #include "util/StringBuffer.hxx" #include "util/StringView.hxx" diff --git a/test/run_convert.cxx b/test/run_convert.cxx index 0aac86543..9bb8592c4 100644 --- a/test/run_convert.cxx +++ b/test/run_convert.cxx @@ -23,8 +23,8 @@ * */ -#include "AudioParser.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioParser.hxx" +#include "pcm/AudioFormat.hxx" #include "pcm/Convert.hxx" #include "util/ConstBuffer.hxx" #include "util/StaticFifoBuffer.hxx" diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx index 7d42d0ae1..43c8ee4b3 100644 --- a/test/run_decoder.cxx +++ b/test/run_decoder.cxx @@ -26,7 +26,7 @@ #include "input/Init.hxx" #include "input/InputStream.hxx" #include "fs/Path.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "util/OptionDef.hxx" #include "util/OptionParser.hxx" #include "util/PrintException.hxx" diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx index 61749c7a2..ca7774201 100644 --- a/test/run_encoder.cxx +++ b/test/run_encoder.cxx @@ -21,8 +21,8 @@ #include "encoder/EncoderPlugin.hxx" #include "encoder/EncoderInterface.hxx" #include "encoder/ToOutputStream.hxx" -#include "AudioFormat.hxx" -#include "AudioParser.hxx" +#include "pcm/AudioFormat.hxx" +#include "pcm/AudioParser.hxx" #include "config/Block.hxx" #include "fs/io/StdioOutputStream.hxx" #include "util/PrintException.hxx" diff --git a/test/run_filter.cxx b/test/run_filter.cxx index 73a2ff0aa..213f8f70c 100644 --- a/test/run_filter.cxx +++ b/test/run_filter.cxx @@ -19,11 +19,11 @@ #include "ConfigGlue.hxx" #include "fs/Path.hxx" -#include "AudioParser.hxx" -#include "AudioFormat.hxx" #include "filter/LoadOne.hxx" #include "filter/Filter.hxx" #include "filter/Prepared.hxx" +#include "pcm/AudioParser.hxx" +#include "pcm/AudioFormat.hxx" #include "pcm/Volume.hxx" #include "mixer/MixerControl.hxx" #include "system/Error.hxx" diff --git a/test/run_normalize.cxx b/test/run_normalize.cxx index 0c9f10d1d..e4acdc204 100644 --- a/test/run_normalize.cxx +++ b/test/run_normalize.cxx @@ -24,8 +24,8 @@ */ #include "AudioCompress/compress.h" -#include "AudioParser.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioParser.hxx" +#include "pcm/AudioFormat.hxx" #include "util/PrintException.hxx" #include diff --git a/test/run_output.cxx b/test/run_output.cxx index c5823073a..30344158c 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -23,8 +23,8 @@ #include "ConfigGlue.hxx" #include "event/Thread.hxx" #include "fs/Path.hxx" -#include "AudioParser.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioParser.hxx" +#include "pcm/AudioFormat.hxx" #include "util/StringBuffer.hxx" #include "util/RuntimeError.hxx" #include "util/ScopeExit.hxx" diff --git a/test/software_volume.cxx b/test/software_volume.cxx index 16b8405a2..e3d3ff56e 100644 --- a/test/software_volume.cxx +++ b/test/software_volume.cxx @@ -24,8 +24,8 @@ */ #include "pcm/Volume.hxx" -#include "AudioParser.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioParser.hxx" +#include "pcm/AudioFormat.hxx" #include "util/ConstBuffer.hxx" #include "util/PrintException.hxx" diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx index 8fde34ce8..caad06904 100644 --- a/test/test_vorbis_encoder.cxx +++ b/test/test_vorbis_encoder.cxx @@ -21,7 +21,7 @@ #include "encoder/EncoderPlugin.hxx" #include "encoder/EncoderInterface.hxx" #include "encoder/ToOutputStream.hxx" -#include "AudioFormat.hxx" +#include "pcm/AudioFormat.hxx" #include "config/Block.hxx" #include "fs/io/StdioOutputStream.hxx" #include "tag/Tag.hxx"