From f8bfea8bae44134e8002db869fd4ec137d1c0d6e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 24 Jan 2014 16:18:21 +0100 Subject: Input*: move to input/ --- src/decoder/DecoderAPI.cxx | 2 +- src/decoder/DecoderThread.cxx | 2 +- src/decoder/plugins/AudiofileDecoderPlugin.cxx | 2 +- src/decoder/plugins/DsdLib.cxx | 2 +- src/decoder/plugins/DsdiffDecoderPlugin.cxx | 2 +- src/decoder/plugins/DsfDecoderPlugin.cxx | 2 +- src/decoder/plugins/FaadDecoderPlugin.cxx | 2 +- src/decoder/plugins/FfmpegDecoderPlugin.cxx | 2 +- src/decoder/plugins/FlacIOHandle.hxx | 2 +- src/decoder/plugins/FlacInput.cxx | 2 +- src/decoder/plugins/MadDecoderPlugin.cxx | 4 ++-- src/decoder/plugins/ModplugDecoderPlugin.cxx | 2 +- src/decoder/plugins/MpcdecDecoderPlugin.cxx | 2 +- src/decoder/plugins/OggFind.hxx | 2 +- src/decoder/plugins/OpusDecoderPlugin.cxx | 2 +- src/decoder/plugins/PcmDecoderPlugin.cxx | 2 +- src/decoder/plugins/SndfileDecoderPlugin.cxx | 2 +- src/decoder/plugins/VorbisDecoderPlugin.cxx | 2 +- src/decoder/plugins/WavpackDecoderPlugin.cxx | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/decoder') diff --git a/src/decoder/DecoderAPI.cxx b/src/decoder/DecoderAPI.cxx index ccb98a230..555e5c89b 100644 --- a/src/decoder/DecoderAPI.cxx +++ b/src/decoder/DecoderAPI.cxx @@ -29,7 +29,7 @@ #include "DecoderControl.hxx" #include "DecoderInternal.hxx" #include "DetachedSong.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "util/Error.hxx" #include "Log.hxx" diff --git a/src/decoder/DecoderThread.cxx b/src/decoder/DecoderThread.cxx index 5c0e31034..3301a2564 100644 --- a/src/decoder/DecoderThread.cxx +++ b/src/decoder/DecoderThread.cxx @@ -29,7 +29,7 @@ #include "fs/Traits.hxx" #include "fs/AllocatedPath.hxx" #include "DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "DecoderList.hxx" #include "util/UriUtil.hxx" #include "util/Error.hxx" diff --git a/src/decoder/plugins/AudiofileDecoderPlugin.cxx b/src/decoder/plugins/AudiofileDecoderPlugin.cxx index cad908cfd..8a7f34dfe 100644 --- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx +++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "AudiofileDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "tag/TagHandler.hxx" #include "util/Error.hxx" diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx index 43af7dee1..f77d8f59a 100644 --- a/src/decoder/plugins/DsdLib.cxx +++ b/src/decoder/plugins/DsdLib.cxx @@ -26,7 +26,7 @@ #include "config.h" #include "DsdLib.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "tag/TagId3.hxx" #include "util/Error.hxx" diff --git a/src/decoder/plugins/DsdiffDecoderPlugin.cxx b/src/decoder/plugins/DsdiffDecoderPlugin.cxx index 89ad2ecd0..92f7ecdaa 100644 --- a/src/decoder/plugins/DsdiffDecoderPlugin.cxx +++ b/src/decoder/plugins/DsdiffDecoderPlugin.cxx @@ -29,7 +29,7 @@ #include "config.h" #include "DsdiffDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "util/bit_reverse.h" #include "util/Error.hxx" diff --git a/src/decoder/plugins/DsfDecoderPlugin.cxx b/src/decoder/plugins/DsfDecoderPlugin.cxx index bb056bbec..6fbaf6bf6 100644 --- a/src/decoder/plugins/DsfDecoderPlugin.cxx +++ b/src/decoder/plugins/DsfDecoderPlugin.cxx @@ -30,7 +30,7 @@ #include "config.h" #include "DsfDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "util/bit_reverse.h" #include "util/Error.hxx" diff --git a/src/decoder/plugins/FaadDecoderPlugin.cxx b/src/decoder/plugins/FaadDecoderPlugin.cxx index 79d6db9f7..e80665d24 100644 --- a/src/decoder/plugins/FaadDecoderPlugin.cxx +++ b/src/decoder/plugins/FaadDecoderPlugin.cxx @@ -21,7 +21,7 @@ #include "FaadDecoderPlugin.hxx" #include "../DecoderAPI.hxx" #include "../DecoderBuffer.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "tag/TagHandler.hxx" #include "util/ConstBuffer.hxx" diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index 461ecb5e4..66b3ec0c1 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -25,7 +25,7 @@ #include "../DecoderAPI.hxx" #include "FfmpegMetaData.hxx" #include "tag/TagHandler.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/decoder/plugins/FlacIOHandle.hxx b/src/decoder/plugins/FlacIOHandle.hxx index 1f95b83d1..a4c3ab86d 100644 --- a/src/decoder/plugins/FlacIOHandle.hxx +++ b/src/decoder/plugins/FlacIOHandle.hxx @@ -21,7 +21,7 @@ #define MPD_FLAC_IO_HANDLE_HXX #include "Compiler.h" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include diff --git a/src/decoder/plugins/FlacInput.cxx b/src/decoder/plugins/FlacInput.cxx index 43350c3cf..720b115f7 100644 --- a/src/decoder/plugins/FlacInput.cxx +++ b/src/decoder/plugins/FlacInput.cxx @@ -21,7 +21,7 @@ #include "FlacInput.hxx" #include "FlacDomain.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "util/Error.hxx" #include "Log.hxx" #include "Compiler.h" diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index 8c32018f3..ffd63a2ac 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "MadDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "config/ConfigGlobal.hxx" #include "tag/TagId3.hxx" #include "tag/TagRva2.hxx" @@ -1096,7 +1096,7 @@ mp3_decode(Decoder &decoder, InputStream &input_stream) if (decoder_get_command(decoder) == DecoderCommand::NONE) LogError(mad_domain, - "Input does not appear to be a mp3 bit stream"); + "input/Input does not appear to be a mp3 bit stream"); return; } diff --git a/src/decoder/plugins/ModplugDecoderPlugin.cxx b/src/decoder/plugins/ModplugDecoderPlugin.cxx index 29c452f73..336870817 100644 --- a/src/decoder/plugins/ModplugDecoderPlugin.cxx +++ b/src/decoder/plugins/ModplugDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "ModplugDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "tag/TagHandler.hxx" #include "system/FatalError.hxx" #include "util/WritableBuffer.hxx" diff --git a/src/decoder/plugins/MpcdecDecoderPlugin.cxx b/src/decoder/plugins/MpcdecDecoderPlugin.cxx index 21596ddf7..18f6e7673 100644 --- a/src/decoder/plugins/MpcdecDecoderPlugin.cxx +++ b/src/decoder/plugins/MpcdecDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "MpcdecDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "tag/TagHandler.hxx" #include "util/Error.hxx" diff --git a/src/decoder/plugins/OggFind.hxx b/src/decoder/plugins/OggFind.hxx index 71b53323b..d93b87505 100644 --- a/src/decoder/plugins/OggFind.hxx +++ b/src/decoder/plugins/OggFind.hxx @@ -21,7 +21,7 @@ #define MPD_OGG_FIND_HXX #include "check.h" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include diff --git a/src/decoder/plugins/OpusDecoderPlugin.cxx b/src/decoder/plugins/OpusDecoderPlugin.cxx index 15a17eb01..d480d1261 100644 --- a/src/decoder/plugins/OpusDecoderPlugin.cxx +++ b/src/decoder/plugins/OpusDecoderPlugin.cxx @@ -28,7 +28,7 @@ #include "OggCodec.hxx" #include "tag/TagHandler.hxx" #include "tag/TagBuilder.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "util/Error.hxx" #include "Log.hxx" diff --git a/src/decoder/plugins/PcmDecoderPlugin.cxx b/src/decoder/plugins/PcmDecoderPlugin.cxx index d92aecd51..e7e593550 100644 --- a/src/decoder/plugins/PcmDecoderPlugin.cxx +++ b/src/decoder/plugins/PcmDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "PcmDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "util/Error.hxx" #include "util/ByteReverse.hxx" #include "Log.hxx" diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx index 8db078504..886c56748 100644 --- a/src/decoder/plugins/SndfileDecoderPlugin.cxx +++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "SndfileDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "tag/TagHandler.hxx" #include "util/Error.hxx" diff --git a/src/decoder/plugins/VorbisDecoderPlugin.cxx b/src/decoder/plugins/VorbisDecoderPlugin.cxx index 35551604e..fd110f457 100644 --- a/src/decoder/plugins/VorbisDecoderPlugin.cxx +++ b/src/decoder/plugins/VorbisDecoderPlugin.cxx @@ -22,7 +22,7 @@ #include "VorbisComments.hxx" #include "VorbisDomain.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "OggCodec.hxx" #include "util/Error.hxx" #include "util/Macros.hxx" diff --git a/src/decoder/plugins/WavpackDecoderPlugin.cxx b/src/decoder/plugins/WavpackDecoderPlugin.cxx index c217e513e..e65d374d2 100644 --- a/src/decoder/plugins/WavpackDecoderPlugin.cxx +++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "WavpackDecoderPlugin.hxx" #include "../DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "CheckAudioFormat.hxx" #include "tag/TagHandler.hxx" #include "tag/ApeTag.hxx" -- cgit v1.2.3