Skip to content

M
mpd
Commit cd612c4e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

AudioFormat: move to pcm/

parent 914ad261
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 84 deletions
src/Main.cxx
View file @ cd612c4e
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "playlist/PlaylistRegistry.hxx" #include "playlist/PlaylistRegistry.hxx"
#include "zeroconf/ZeroconfGlue.hxx" #include "zeroconf/ZeroconfGlue.hxx"
#include "decoder/DecoderList.hxx" #include "decoder/DecoderList.hxx"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "pcm/Convert.hxx" #include "pcm/Convert.hxx"
#include "unix/SignalHandlers.hxx" #include "unix/SignalHandlers.hxx"
#include "thread/Slack.hxx" #include "thread/Slack.hxx"
......
src/MusicChunk.cxx
View file @ cd612c4e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "MusicChunk.hxx" #include "MusicChunk.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include <assert.h> #include <assert.h>
......
src/MusicChunk.hxx
View file @ cd612c4e
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "util/WritableBuffer.hxx" #include "util/WritableBuffer.hxx"
#ifndef NDEBUG #ifndef NDEBUG
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#endif #endif
#include <memory> #include <memory>
......
src/MusicPipe.hxx
View file @ cd612c4e
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "util/Compiler.h" #include "util/Compiler.h"
#ifndef NDEBUG #ifndef NDEBUG
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#endif #endif
/** /**
......
src/SongSave.cxx
View file @ cd612c4e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "SongSave.hxx" #include "SongSave.hxx"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "db/plugins/simple/Song.hxx" #include "db/plugins/simple/Song.hxx"
#include "song/DetachedSong.hxx" #include "song/DetachedSong.hxx"
#include "TagSave.hxx" #include "TagSave.hxx"
......
src/command/PlayerCommands.cxx
View file @ cd612c4e
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "Partition.hxx" #include "Partition.hxx"
#include "Instance.hxx" #include "Instance.hxx"
#include "IdleFlags.hxx" #include "IdleFlags.hxx"
#include "AudioFormat.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include "util/Exception.hxx" #include "util/Exception.hxx"
......
src/db/plugins/simple/Song.hxx
View file @ cd612c4e
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "Ptr.hxx" #include "Ptr.hxx"
#include "Chrono.hxx" #include "Chrono.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include "config.h" #include "config.h"
......
src/decoder/Control.hxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define MPD_DECODER_CONTROL_HXX #define MPD_DECODER_CONTROL_HXX
#include "Command.hxx" #include "Command.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "MixRampInfo.hxx" #include "MixRampInfo.hxx"
#include "input/Handler.hxx" #include "input/Handler.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
......
src/decoder/DecoderAPI.hxx
View file @ cd612c4e
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "DecoderPlugin.hxx" #include "DecoderPlugin.hxx"
#include "ReplayGainInfo.hxx" #include "ReplayGainInfo.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "MixRampInfo.hxx" #include "MixRampInfo.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "Chrono.hxx" #include "Chrono.hxx"
......
src/decoder/plugins/AdPlugDecoderPlugin.cxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "AdPlugDecoderPlugin.h" #include "AdPlugDecoderPlugin.h"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
......
src/decoder/plugins/AudiofileDecoderPlugin.cxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "AudiofileDecoderPlugin.hxx" #include "AudiofileDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
......
src/decoder/plugins/DsdiffDecoderPlugin.cxx
View file @ cd612c4e
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "DsdiffDecoderPlugin.hxx" #include "DsdiffDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "util/bit_reverse.h" #include "util/bit_reverse.h"
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
......
src/decoder/plugins/DsfDecoderPlugin.cxx
View file @ cd612c4e
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "DsfDecoderPlugin.hxx" #include "DsfDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "util/bit_reverse.h" #include "util/bit_reverse.h"
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
#include "DsdLib.hxx" #include "DsdLib.hxx"
......
src/decoder/plugins/FaadDecoderPlugin.cxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "../DecoderBuffer.hxx" #include "../DecoderBuffer.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
......
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @ cd612c4e
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "tag/ReplayGain.hxx" #include "tag/ReplayGain.hxx"
#include "tag/MixRamp.hxx" #include "tag/MixRamp.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "LogV.hxx" #include "LogV.hxx"
......
src/decoder/plugins/FlacPcm.cxx
View file @ cd612c4e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "FlacPcm.hxx" #include "FlacPcm.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "lib/xiph/FlacAudioFormat.hxx" #include "lib/xiph/FlacAudioFormat.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
......
src/decoder/plugins/FlacPcm.hxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define MPD_FLAC_PCM_HXX #define MPD_FLAC_PCM_HXX
#include "pcm/Buffer.hxx" #include "pcm/Buffer.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include <FLAC/ordinals.h> #include <FLAC/ordinals.h>
......
src/decoder/plugins/FluidsynthDecoderPlugin.cxx
View file @ cd612c4e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "FluidsynthDecoderPlugin.hxx" #include "FluidsynthDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
......
src/decoder/plugins/GmeDecoderPlugin.cxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "GmeDecoderPlugin.hxx" #include "GmeDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "song/DetachedSong.hxx" #include "song/DetachedSong.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "tag/Builder.hxx" #include "tag/Builder.hxx"
......
src/decoder/plugins/MadDecoderPlugin.cxx
View file @ cd612c4e
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "tag/ReplayGain.hxx" #include "tag/ReplayGain.hxx"
#include "tag/MixRamp.hxx" #include "tag/MixRamp.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "util/Clamp.hxx" #include "util/Clamp.hxx"
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
......
src/decoder/plugins/MpcdecDecoderPlugin.cxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "MpcdecDecoderPlugin.hxx" #include "MpcdecDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "pcm/Traits.hxx" #include "pcm/Traits.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
......
src/decoder/plugins/Mpg123DecoderPlugin.cxx
View file @ cd612c4e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "Mpg123DecoderPlugin.hxx" #include "Mpg123DecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "tag/Builder.hxx" #include "tag/Builder.hxx"
#include "tag/ReplayGain.hxx" #include "tag/ReplayGain.hxx"
......
src/decoder/plugins/PcmDecoderPlugin.cxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "PcmDecoderPlugin.hxx" #include "PcmDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "pcm/Pack.hxx" #include "pcm/Pack.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "Log.hxx" #include "Log.hxx"
#ifdef ENABLE_ALSA #ifdef ENABLE_ALSA
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#endif #endif
#include <exception> #include <exception>
......
src/decoder/plugins/SndfileDecoderPlugin.cxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "SndfileDecoderPlugin.hxx" #include "SndfileDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
......
src/decoder/plugins/VorbisDecoderPlugin.cxx
View file @ cd612c4e
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "input/Reader.hxx" #include "input/Reader.hxx"
#include "OggCodec.hxx" #include "OggCodec.hxx"
#include "pcm/CheckAudioFormat.hxx"
#include "pcm/Interleave.hxx" #include "pcm/Interleave.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include "CheckAudioFormat.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "Log.hxx" #include "Log.hxx"
......
src/decoder/plugins/WavpackDecoderPlugin.cxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "WavpackDecoderPlugin.hxx" #include "WavpackDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "util/Alloc.hxx" #include "util/Alloc.hxx"
......
src/encoder/EncoderAPI.hxx
View file @ cd612c4e
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "EncoderInterface.hxx" #include "EncoderInterface.hxx"
#include "EncoderPlugin.hxx" #include "EncoderPlugin.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
......
src/encoder/plugins/FlacEncoderPlugin.cxx
View file @ cd612c4e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "FlacEncoderPlugin.hxx" #include "FlacEncoderPlugin.hxx"
#include "../EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "pcm/Buffer.hxx" #include "pcm/Buffer.hxx"
#include "util/DynamicFifoBuffer.hxx" #include "util/DynamicFifoBuffer.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
......
src/encoder/plugins/LameEncoderPlugin.cxx
View file @ cd612c4e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "LameEncoderPlugin.hxx" #include "LameEncoderPlugin.hxx"
#include "../EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/NumberParser.hxx" #include "util/NumberParser.hxx"
#include "util/ReusableArray.hxx" #include "util/ReusableArray.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
......
src/encoder/plugins/OpusEncoderPlugin.cxx
View file @ cd612c4e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "OpusEncoderPlugin.hxx" #include "OpusEncoderPlugin.hxx"
#include "OggEncoder.hxx" #include "OggEncoder.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
......
src/encoder/plugins/ShineEncoderPlugin.cxx
View file @ cd612c4e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "ShineEncoderPlugin.hxx" #include "ShineEncoderPlugin.hxx"
#include "../EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/DynamicFifoBuffer.hxx" #include "util/DynamicFifoBuffer.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
......
src/encoder/plugins/TwolameEncoderPlugin.cxx
View file @ cd612c4e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "TwolameEncoderPlugin.hxx" #include "TwolameEncoderPlugin.hxx"
#include "../EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/NumberParser.hxx" #include "util/NumberParser.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
......
src/encoder/plugins/VorbisEncoderPlugin.cxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "VorbisEncoderPlugin.hxx" #include "VorbisEncoderPlugin.hxx"
#include "OggEncoder.hxx" #include "OggEncoder.hxx"
#include "lib/xiph/VorbisComment.hxx" #include "lib/xiph/VorbisComment.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "config/Domain.hxx" #include "config/Domain.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/NumberParser.hxx" #include "util/NumberParser.hxx"
......
src/filter/Filter.hxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef MPD_FILTER_HXX #ifndef MPD_FILTER_HXX
#define MPD_FILTER_HXX #define MPD_FILTER_HXX
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include <assert.h> #include <assert.h>
......
src/filter/plugins/AutoConvertFilterPlugin.cxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "ConvertFilterPlugin.hxx" #include "ConvertFilterPlugin.hxx"
#include "filter/Filter.hxx" #include "filter/Filter.hxx"
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include <memory> #include <memory>
......
src/filter/plugins/ChainFilterPlugin.cxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "ChainFilterPlugin.hxx" #include "ChainFilterPlugin.hxx"
#include "filter/Filter.hxx" #include "filter/Filter.hxx"
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
......
src/filter/plugins/ConvertFilterPlugin.cxx
View file @ cd612c4e
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
#include "ConvertFilterPlugin.hxx" #include "ConvertFilterPlugin.hxx"
#include "filter/Filter.hxx" #include "filter/Filter.hxx"
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "pcm/AudioFormat.hxx"
#include "pcm/Convert.hxx" #include "pcm/Convert.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "AudioFormat.hxx"
#include <memory> #include <memory>
......
src/filter/plugins/HdcdFilterPlugin.cxx
View file @ cd612c4e
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "filter/NullFilter.hxx" #include "filter/NullFilter.hxx"
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "lib/ffmpeg/Filter.hxx" #include "lib/ffmpeg/Filter.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
static constexpr const char *hdcd_graph = "hdcd"; static constexpr const char *hdcd_graph = "hdcd";
......
src/filter/plugins/NormalizeFilterPlugin.cxx
View file @ cd612c4e
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "filter/Filter.hxx" #include "filter/Filter.hxx"
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "pcm/Buffer.hxx" #include "pcm/Buffer.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "AudioCompress/compress.h" #include "AudioCompress/compress.h"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
......
src/filter/plugins/ReplayGainFilterPlugin.cxx
View file @ cd612c4e
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
#include "ReplayGainFilterPlugin.hxx" #include "ReplayGainFilterPlugin.hxx"
#include "filter/Filter.hxx" #include "filter/Filter.hxx"
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "AudioFormat.hxx"
#include "ReplayGainInfo.hxx" #include "ReplayGainInfo.hxx"
#include "ReplayGainConfig.hxx" #include "ReplayGainConfig.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/MixerControl.hxx"
#include "pcm/AudioFormat.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
......
src/filter/plugins/RouteFilterPlugin.cxx
View file @ cd612c4e
...@@ -41,10 +41,10 @@ ...@@ -41,10 +41,10 @@
#include "RouteFilterPlugin.hxx" #include "RouteFilterPlugin.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "AudioFormat.hxx"
#include "filter/FilterPlugin.hxx" #include "filter/FilterPlugin.hxx"
#include "filter/Filter.hxx" #include "filter/Filter.hxx"
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "pcm/AudioFormat.hxx"
#include "pcm/Buffer.hxx" #include "pcm/Buffer.hxx"
#include "pcm/Silence.hxx" #include "pcm/Silence.hxx"
#include "util/StringStrip.hxx" #include "util/StringStrip.hxx"
......
src/filter/plugins/VolumeFilterPlugin.cxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "filter/Filter.hxx" #include "filter/Filter.hxx"
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
class VolumeFilter final : public Filter { class VolumeFilter final : public Filter {
......
src/input/plugins/AlsaInputPlugin.cxx
View file @ cd612c4e
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/DivideString.hxx" #include "util/DivideString.hxx"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "event/MultiSocketMonitor.hxx" #include "event/MultiSocketMonitor.hxx"
#include "event/DeferEvent.hxx" #include "event/DeferEvent.hxx"
......
src/lib/alsa/AllowedFormat.cxx
View file @ cd612c4e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "AllowedFormat.hxx" #include "AllowedFormat.hxx"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "util/IterableSplitString.hxx" #include "util/IterableSplitString.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include "config.h" #include "config.h"
......
src/lib/alsa/AllowedFormat.hxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef MPD_ALSA_ALLOWED_FORMAT_HXX #ifndef MPD_ALSA_ALLOWED_FORMAT_HXX
#define MPD_ALSA_ALLOWED_FORMAT_HXX #define MPD_ALSA_ALLOWED_FORMAT_HXX
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "config.h" #include "config.h"
#include <forward_list> #include <forward_list>
......
src/lib/alsa/HwSetup.cxx
View file @ cd612c4e
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "config.h" #include "config.h"
......
src/lib/ffmpeg/Filter.cxx
View file @ cd612c4e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "Filter.hxx" #include "Filter.hxx"
#include "SampleFormat.hxx" #include "SampleFormat.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <stdio.h> #include <stdio.h>
......
src/lib/xiph/FlacStreamMetadata.cxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "FlacStreamMetadata.hxx" #include "FlacStreamMetadata.hxx"
#include "FlacAudioFormat.hxx" #include "FlacAudioFormat.hxx"
#include "ScanVorbisComment.hxx" #include "ScanVorbisComment.hxx"
#include "CheckAudioFormat.hxx" #include "pcm/CheckAudioFormat.hxx"
#include "MixRampInfo.hxx" #include "MixRampInfo.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "tag/Builder.hxx" #include "tag/Builder.hxx"
......
src/output/Control.hxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define MPD_OUTPUT_CONTROL_HXX #define MPD_OUTPUT_CONTROL_HXX
#include "Source.hxx" #include "Source.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "thread/Thread.hxx" #include "thread/Thread.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
......
src/output/Filtered.hxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef MPD_FILTERED_AUDIO_OUTPUT_HXX #ifndef MPD_FILTERED_AUDIO_OUTPUT_HXX
#define MPD_FILTERED_AUDIO_OUTPUT_HXX #define MPD_FILTERED_AUDIO_OUTPUT_HXX
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "filter/Observer.hxx" #include "filter/Observer.hxx"
#include <memory> #include <memory>
......
src/output/Init.cxx
View file @ cd612c4e
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "Domain.hxx" #include "Domain.hxx"
#include "OutputAPI.hxx" #include "OutputAPI.hxx"
#include "Defaults.hxx" #include "Defaults.hxx"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "mixer/MixerList.hxx" #include "mixer/MixerList.hxx"
#include "mixer/MixerType.hxx" #include "mixer/MixerType.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/MixerControl.hxx"
......
src/output/MultipleOutputs.hxx
View file @ cd612c4e
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "Control.hxx" #include "Control.hxx"
#include "MusicChunkPtr.hxx" #include "MusicChunkPtr.hxx"
#include "player/Outputs.hxx" #include "player/Outputs.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "ReplayGainMode.hxx" #include "ReplayGainMode.hxx"
#include "Chrono.hxx" #include "Chrono.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
......
src/output/OutputAPI.hxx
View file @ cd612c4e
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "OutputPlugin.hxx" #include "OutputPlugin.hxx"
#include "Interface.hxx" #include "Interface.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
......
src/output/Source.hxx
View file @ cd612c4e
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#define AUDIO_OUTPUT_SOURCE_HXX #define AUDIO_OUTPUT_SOURCE_HXX
#include "SharedPipeConsumer.hxx" #include "SharedPipeConsumer.hxx"
#include "AudioFormat.hxx"
#include "ReplayGainMode.hxx" #include "ReplayGainMode.hxx"
#include "pcm/AudioFormat.hxx"
#include "pcm/Buffer.hxx" #include "pcm/Buffer.hxx"
#include "pcm/Dither.hxx" #include "pcm/Dither.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
......
src/output/Timer.cxx
View file @ cd612c4e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "Timer.hxx" #include "Timer.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include <assert.h> #include <assert.h>
......
src/pcm/meson.build
View file @ cd612c4e
pcm_basic_sources = [ pcm_basic_sources = [
'../CheckAudioFormat.cxx', 'CheckAudioFormat.cxx',
'../AudioFormat.cxx', 'AudioFormat.cxx',
'../AudioParser.cxx', 'AudioParser.cxx',
'SampleFormat.cxx', 'SampleFormat.cxx',
'Interleave.cxx', 'Interleave.cxx',
'Buffer.cxx', 'Buffer.cxx',
......
src/player/Control.hxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define MPD_PLAYER_CONTROL_HXX #define MPD_PLAYER_CONTROL_HXX
#include "output/Client.hxx" #include "output/Client.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include "thread/Thread.hxx" #include "thread/Thread.hxx"
......
src/player/CrossFade.cxx
View file @ cd612c4e
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "CrossFade.hxx" #include "CrossFade.hxx"
#include "Chrono.hxx" #include "Chrono.hxx"
#include "MusicChunk.hxx" #include "MusicChunk.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/NumberParser.hxx" #include "util/NumberParser.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
......
src/song/AudioFormatSongFilter.hxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define MPD_AUDIO_FORMAT_SONG_FILTER_HXX #define MPD_AUDIO_FORMAT_SONG_FILTER_HXX
#include "ISongFilter.hxx" #include "ISongFilter.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
class AudioFormatSongFilter final : public ISongFilter { class AudioFormatSongFilter final : public ISongFilter {
AudioFormat value; AudioFormat value;
......
src/song/Filter.cxx
View file @ cd612c4e
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "TagSongFilter.hxx" #include "TagSongFilter.hxx"
#include "ModifiedSinceSongFilter.hxx" #include "ModifiedSinceSongFilter.hxx"
#include "AudioFormatSongFilter.hxx" #include "AudioFormatSongFilter.hxx"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "tag/ParseName.hxx" #include "tag/ParseName.hxx"
#include "time/ISO8601.hxx" #include "time/ISO8601.hxx"
#include "util/CharUtil.hxx" #include "util/CharUtil.hxx"
......
src/song/LightSong.hxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define MPD_LIGHT_SONG_HXX #define MPD_LIGHT_SONG_HXX
#include "Chrono.hxx" #include "Chrono.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <string> #include <string>
......
src/tag/Handler.cxx
View file @ cd612c4e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "Handler.hxx" #include "Handler.hxx"
#include "Builder.hxx" #include "Builder.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/CharUtil.hxx" #include "util/CharUtil.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
......
test/RunChromaprint.cxx
View file @ cd612c4e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "input/Init.hxx" #include "input/Init.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/OptionDef.hxx" #include "util/OptionDef.hxx"
#include "util/OptionParser.hxx" #include "util/OptionParser.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
......
test/TestAudioFormat.cxx
View file @ cd612c4e
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
test/read_tags.cxx
View file @ cd612c4e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "tag/Generic.hxx" #include "tag/Generic.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
......
test/run_convert.cxx
View file @ cd612c4e
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* *
*/ */
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "pcm/Convert.hxx" #include "pcm/Convert.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/StaticFifoBuffer.hxx" #include "util/StaticFifoBuffer.hxx"
......
test/run_decoder.cxx
View file @ cd612c4e
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "input/Init.hxx" #include "input/Init.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/OptionDef.hxx" #include "util/OptionDef.hxx"
#include "util/OptionParser.hxx" #include "util/OptionParser.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
......
test/run_encoder.cxx
View file @ cd612c4e
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#include "encoder/EncoderPlugin.hxx" #include "encoder/EncoderPlugin.hxx"
#include "encoder/EncoderInterface.hxx" #include "encoder/EncoderInterface.hxx"
#include "encoder/ToOutputStream.hxx" #include "encoder/ToOutputStream.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "fs/io/StdioOutputStream.hxx" #include "fs/io/StdioOutputStream.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
......
test/run_filter.cxx
View file @ cd612c4e
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
#include "ConfigGlue.hxx" #include "ConfigGlue.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "AudioParser.hxx"
#include "AudioFormat.hxx"
#include "filter/LoadOne.hxx" #include "filter/LoadOne.hxx"
#include "filter/Filter.hxx" #include "filter/Filter.hxx"
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "pcm/AudioParser.hxx"
#include "pcm/AudioFormat.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/MixerControl.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
......
test/run_normalize.cxx
View file @ cd612c4e
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
*/ */
#include "AudioCompress/compress.h" #include "AudioCompress/compress.h"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
#include <stdexcept> #include <stdexcept>
......
test/run_output.cxx
View file @ cd612c4e
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include "ConfigGlue.hxx" #include "ConfigGlue.hxx"
#include "event/Thread.hxx" #include "event/Thread.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
......
test/software_volume.cxx
View file @ cd612c4e
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
*/ */
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/PrintException.hxx" #include "util/PrintException.hxx"
......
test/test_vorbis_encoder.cxx
View file @ cd612c4e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "encoder/EncoderPlugin.hxx" #include "encoder/EncoderPlugin.hxx"
#include "encoder/EncoderInterface.hxx" #include "encoder/EncoderInterface.hxx"
#include "encoder/ToOutputStream.hxx" #include "encoder/ToOutputStream.hxx"
#include "AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "fs/io/StdioOutputStream.hxx" #include "fs/io/StdioOutputStream.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment