diff options
76 files changed, 114 insertions, 117 deletions
diff --git a/Makefile.am b/Makefile.am index 8fe82a909..cd2c4c555 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,7 +55,6 @@ src_mpd_LDADD = \ mpd_headers = \ src/check.h \ src/gerror.h \ - src/TextInputStream.hxx \ src/AudioCompress/config.h \ src/AudioCompress/compress.h \ src/open.h \ @@ -210,7 +209,6 @@ src_mpd_SOURCES = \ src/TagSave.cxx src/TagSave.hxx \ src/TagFile.cxx src/TagFile.hxx \ src/TagStream.cxx src/TagStream.hxx \ - src/TextInputStream.cxx \ src/Volume.cxx src/Volume.hxx \ src/SongFilter.cxx src/SongFilter.hxx \ src/PlaylistFile.cxx src/PlaylistFile.hxx \ @@ -452,7 +450,7 @@ libarchive_a_SOURCES = \ src/archive/ArchivePlugin.cxx src/archive/ArchivePlugin.hxx \ src/archive/ArchiveVisitor.hxx \ src/archive/ArchiveFile.hxx \ - src/input/ArchiveInputPlugin.cxx src/input/ArchiveInputPlugin.hxx + src/input/plugins/ArchiveInputPlugin.cxx src/input/plugins/ArchiveInputPlugin.hxx libarchive_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(BZ2_CFLAGS) \ $(ISO9660_CFLAGS) \ @@ -826,12 +824,13 @@ endif # libinput_a_SOURCES = \ - src/InputInit.cxx src/InputInit.hxx \ - src/InputRegistry.cxx src/InputRegistry.hxx \ - src/InputStream.cxx src/InputStream.hxx \ - src/InputPlugin.hxx \ - src/input/RewindInputPlugin.cxx src/input/RewindInputPlugin.hxx \ - src/input/FileInputPlugin.cxx src/input/FileInputPlugin.hxx + src/input/Init.cxx src/input/Init.hxx \ + src/input/Registry.cxx src/input/Registry.hxx \ + src/input/InputStream.cxx src/input/InputStream.hxx \ + src/input/InputPlugin.hxx \ + src/input/TextInputStream.cxx src/input/TextInputStream.hxx \ + src/input/plugins/RewindInputPlugin.cxx src/input/plugins/RewindInputPlugin.hxx \ + src/input/plugins/FileInputPlugin.cxx src/input/plugins/FileInputPlugin.hxx libinput_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(CURL_CFLAGS) \ @@ -852,43 +851,43 @@ INPUT_LIBS = \ if HAVE_ALSA libinput_a_SOURCES += \ - src/input/AlsaInputPlugin.cxx \ - src/input/AlsaInputPlugin.hxx + src/input/plugins/AlsaInputPlugin.cxx \ + src/input/plugins/AlsaInputPlugin.hxx INPUT_LIBS += $(ALSA_LIBS) endif if ENABLE_CURL libinput_a_SOURCES += \ - src/input/CurlInputPlugin.cxx src/input/CurlInputPlugin.hxx \ + src/input/plugins/CurlInputPlugin.cxx src/input/plugins/CurlInputPlugin.hxx \ src/IcyMetaDataParser.cxx src/IcyMetaDataParser.hxx endif if ENABLE_SMBCLIENT libinput_a_SOURCES += \ - src/input/SmbclientInputPlugin.cxx src/input/SmbclientInputPlugin.hxx + src/input/plugins/SmbclientInputPlugin.cxx src/input/plugins/SmbclientInputPlugin.hxx endif if ENABLE_CDIO_PARANOIA libinput_a_SOURCES += \ - src/input/CdioParanoiaInputPlugin.cxx \ - src/input/CdioParanoiaInputPlugin.hxx + src/input/plugins/CdioParanoiaInputPlugin.cxx \ + src/input/plugins/CdioParanoiaInputPlugin.hxx endif if HAVE_FFMPEG libinput_a_SOURCES += \ - src/input/FfmpegInputPlugin.cxx src/input/FfmpegInputPlugin.hxx + src/input/plugins/FfmpegInputPlugin.cxx src/input/plugins/FfmpegInputPlugin.hxx endif if ENABLE_MMS libinput_a_SOURCES += \ - src/input/MmsInputPlugin.cxx src/input/MmsInputPlugin.hxx + src/input/plugins/MmsInputPlugin.cxx src/input/plugins/MmsInputPlugin.hxx endif if ENABLE_DESPOTIFY libinput_a_SOURCES += \ - src/input/DespotifyInputPlugin.cxx \ - src/input/DespotifyInputPlugin.hxx + src/input/plugins/DespotifyInputPlugin.cxx \ + src/input/plugins/DespotifyInputPlugin.hxx endif @@ -1293,7 +1292,7 @@ test_visit_archive_LDADD = \ test_visit_archive_SOURCES = test/visit_archive.cxx \ src/Log.cxx src/LogBackend.cxx \ src/IOThread.cxx \ - src/InputStream.cxx + src/input/InputStream.cxx if ENABLE_DESPOTIFY test_visit_archive_SOURCES += src/DespotifyUtils.cxx @@ -1315,8 +1314,7 @@ test_dump_text_file_LDADD = \ test_dump_text_file_SOURCES = test/dump_text_file.cxx \ test/stdbin.h \ src/Log.cxx src/LogBackend.cxx \ - src/IOThread.cxx \ - src/TextInputStream.cxx + src/IOThread.cxx test_dump_playlist_LDADD = \ $(PLAYLIST_LIBS) \ @@ -1341,7 +1339,6 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \ src/TagSave.cxx \ src/TagFile.cxx \ src/CheckAudioFormat.cxx \ - src/TextInputStream.cxx \ src/DetachedSong.cxx \ src/cue/CueParser.cxx src/cue/CueParser.hxx diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 3659dfcda..2b386f5de 100644 --- a/src/CommandLine.cxx +++ b/src/CommandLine.cxx @@ -29,8 +29,8 @@ #include "decoder/DecoderPlugin.hxx" #include "output/OutputList.hxx" #include "output/OutputPlugin.hxx" -#include "InputRegistry.hxx" -#include "InputPlugin.hxx" +#include "input/Registry.hxx" +#include "input/InputPlugin.hxx" #include "playlist/PlaylistRegistry.hxx" #include "playlist/PlaylistPlugin.hxx" #include "fs/AllocatedPath.hxx" @@ -148,7 +148,7 @@ static void version(void) #endif puts("\n" - "Input plugins:"); + "input/Input plugins:"); input_plugins_for_each(plugin) printf(" %s", plugin->name); diff --git a/src/Expat.cxx b/src/Expat.cxx index 5cee45912..b6e3a5f8f 100644 --- a/src/Expat.cxx +++ b/src/Expat.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "Expat.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "util/ASCII.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/Main.cxx b/src/Main.cxx index a07f02389..94b510de3 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -45,7 +45,7 @@ #include "Log.hxx" #include "LogInit.hxx" #include "GlobalEvents.hxx" -#include "InputInit.hxx" +#include "input/Init.hxx" #include "event/Loop.hxx" #include "IOThread.hxx" #include "fs/AllocatedPath.hxx" diff --git a/src/PlaylistPrint.cxx b/src/PlaylistPrint.cxx index 2555acc2a..a0697f8cf 100644 --- a/src/PlaylistPrint.cxx +++ b/src/PlaylistPrint.cxx @@ -26,7 +26,7 @@ #include "DatabaseGlue.hxx" #include "DatabasePlugin.hxx" #include "client/Client.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "DetachedSong.hxx" #include "fs/Traits.hxx" #include "util/Error.hxx" diff --git a/src/TagFile.cxx b/src/TagFile.cxx index 86a2443c6..a602c0b9b 100644 --- a/src/TagFile.cxx +++ b/src/TagFile.cxx @@ -24,7 +24,7 @@ #include "util/Error.hxx" #include "decoder/DecoderList.hxx" #include "decoder/DecoderPlugin.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "thread/Cond.hxx" #include <assert.h> diff --git a/src/TagStream.cxx b/src/TagStream.cxx index fc115c659..b84166825 100644 --- a/src/TagStream.cxx +++ b/src/TagStream.cxx @@ -23,7 +23,7 @@ #include "util/Error.hxx" #include "decoder/DecoderList.hxx" #include "decoder/DecoderPlugin.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" diff --git a/src/archive/plugins/Bzip2ArchivePlugin.cxx b/src/archive/plugins/Bzip2ArchivePlugin.cxx index 0e75dd77f..c9648050b 100644 --- a/src/archive/plugins/Bzip2ArchivePlugin.cxx +++ b/src/archive/plugins/Bzip2ArchivePlugin.cxx @@ -26,8 +26,8 @@ #include "../ArchivePlugin.hxx" #include "../ArchiveFile.hxx" #include "../ArchiveVisitor.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "input/InputStream.hxx" +#include "input/InputPlugin.hxx" #include "util/RefCount.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx index 8f3300b3e..1a126d0f2 100644 --- a/src/archive/plugins/Iso9660ArchivePlugin.cxx +++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx @@ -26,8 +26,8 @@ #include "../ArchivePlugin.hxx" #include "../ArchiveFile.hxx" #include "../ArchiveVisitor.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "input/InputStream.hxx" +#include "input/InputPlugin.hxx" #include "util/RefCount.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/archive/plugins/ZzipArchivePlugin.cxx b/src/archive/plugins/ZzipArchivePlugin.cxx index c1446da74..61b3c2b45 100644 --- a/src/archive/plugins/ZzipArchivePlugin.cxx +++ b/src/archive/plugins/ZzipArchivePlugin.cxx @@ -26,8 +26,8 @@ #include "../ArchivePlugin.hxx" #include "../ArchiveFile.hxx" #include "../ArchiveVisitor.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "input/InputStream.hxx" +#include "input/InputPlugin.hxx" #include "util/RefCount.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" 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 <FLAC/callback.h> 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 <ogg/ogg.h> 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" diff --git a/src/InputInit.cxx b/src/input/Init.cxx index d1d844830..14a7feef3 100644 --- a/src/InputInit.cxx +++ b/src/input/Init.cxx @@ -18,8 +18,8 @@ */ #include "config.h" -#include "InputInit.hxx" -#include "InputRegistry.hxx" +#include "Init.hxx" +#include "Registry.hxx" #include "InputPlugin.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/InputInit.hxx b/src/input/Init.hxx index 875fdce7c..875fdce7c 100644 --- a/src/InputInit.hxx +++ b/src/input/Init.hxx diff --git a/src/InputPlugin.hxx b/src/input/InputPlugin.hxx index 83e0ab26e..83e0ab26e 100644 --- a/src/InputPlugin.hxx +++ b/src/input/InputPlugin.hxx diff --git a/src/InputStream.cxx b/src/input/InputStream.cxx index 2321011ef..0621437c4 100644 --- a/src/InputStream.cxx +++ b/src/input/InputStream.cxx @@ -19,9 +19,9 @@ #include "config.h" #include "InputStream.hxx" -#include "InputRegistry.hxx" +#include "Registry.hxx" #include "InputPlugin.hxx" -#include "input/RewindInputPlugin.hxx" +#include "plugins/RewindInputPlugin.hxx" #include "util/UriUtil.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/InputStream.hxx b/src/input/InputStream.hxx index c66091687..c66091687 100644 --- a/src/InputStream.hxx +++ b/src/input/InputStream.hxx diff --git a/src/InputRegistry.cxx b/src/input/Registry.cxx index 7be8b87da..30c6a67e0 100644 --- a/src/InputRegistry.cxx +++ b/src/input/Registry.cxx @@ -18,40 +18,40 @@ */ #include "config.h" -#include "InputRegistry.hxx" +#include "Registry.hxx" #include "util/Macros.hxx" -#include "input/FileInputPlugin.hxx" +#include "plugins/FileInputPlugin.hxx" #ifdef HAVE_ALSA -#include "input/AlsaInputPlugin.hxx" +#include "plugins/AlsaInputPlugin.hxx" #endif #ifdef ENABLE_ARCHIVE -#include "input/ArchiveInputPlugin.hxx" +#include "plugins/ArchiveInputPlugin.hxx" #endif #ifdef ENABLE_CURL -#include "input/CurlInputPlugin.hxx" +#include "plugins/CurlInputPlugin.hxx" #endif #ifdef HAVE_FFMPEG -#include "input/FfmpegInputPlugin.hxx" +#include "plugins/FfmpegInputPlugin.hxx" #endif #ifdef ENABLE_SMBCLIENT -#include "input/SmbclientInputPlugin.hxx" +#include "plugins/SmbclientInputPlugin.hxx" #endif #ifdef ENABLE_MMS -#include "input/MmsInputPlugin.hxx" +#include "plugins/MmsInputPlugin.hxx" #endif #ifdef ENABLE_CDIO_PARANOIA -#include "input/CdioParanoiaInputPlugin.hxx" +#include "plugins/CdioParanoiaInputPlugin.hxx" #endif #ifdef ENABLE_DESPOTIFY -#include "input/DespotifyInputPlugin.hxx" +#include "plugins/DespotifyInputPlugin.hxx" #endif const InputPlugin *const input_plugins[] = { diff --git a/src/InputRegistry.hxx b/src/input/Registry.hxx index 1b81f8f06..1b81f8f06 100644 --- a/src/InputRegistry.hxx +++ b/src/input/Registry.hxx diff --git a/src/TextInputStream.cxx b/src/input/TextInputStream.cxx index 25b9b42fe..25b9b42fe 100644 --- a/src/TextInputStream.cxx +++ b/src/input/TextInputStream.cxx diff --git a/src/TextInputStream.hxx b/src/input/TextInputStream.hxx index 86ae16e41..86ae16e41 100644 --- a/src/TextInputStream.hxx +++ b/src/input/TextInputStream.hxx diff --git a/src/input/AlsaInputPlugin.cxx b/src/input/plugins/AlsaInputPlugin.cxx index 29c6b2504..da2d9a926 100644 --- a/src/input/AlsaInputPlugin.cxx +++ b/src/input/plugins/AlsaInputPlugin.cxx @@ -26,8 +26,8 @@ #include "config.h" #include "AlsaInputPlugin.hxx" -#include "InputPlugin.hxx" -#include "InputStream.hxx" +#include "../InputPlugin.hxx" +#include "../InputStream.hxx" #include "util/Domain.hxx" #include "util/Error.hxx" #include "util/StringUtil.hxx" diff --git a/src/input/AlsaInputPlugin.hxx b/src/input/plugins/AlsaInputPlugin.hxx index dda1e5176..dddf7dfd7 100644 --- a/src/input/AlsaInputPlugin.hxx +++ b/src/input/plugins/AlsaInputPlugin.hxx @@ -20,7 +20,7 @@ #ifndef MPD_ALSA_INPUT_PLUGIN_HXX #define MPD_ALSA_INPUT_PLUGIN_HXX -#include "InputPlugin.hxx" +#include "../InputPlugin.hxx" extern const struct InputPlugin input_plugin_alsa; diff --git a/src/input/ArchiveInputPlugin.cxx b/src/input/plugins/ArchiveInputPlugin.cxx index e5591a95e..df1a72585 100644 --- a/src/input/ArchiveInputPlugin.cxx +++ b/src/input/plugins/ArchiveInputPlugin.cxx @@ -24,7 +24,7 @@ #include "archive/ArchiveList.hxx" #include "archive/ArchivePlugin.hxx" #include "archive/ArchiveFile.hxx" -#include "InputPlugin.hxx" +#include "../InputPlugin.hxx" #include "fs/Traits.hxx" #include "util/Alloc.hxx" #include "Log.hxx" diff --git a/src/input/ArchiveInputPlugin.hxx b/src/input/plugins/ArchiveInputPlugin.hxx index 024723726..024723726 100644 --- a/src/input/ArchiveInputPlugin.hxx +++ b/src/input/plugins/ArchiveInputPlugin.hxx diff --git a/src/input/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx index 297ee84dc..9267b50e1 100644 --- a/src/input/CdioParanoiaInputPlugin.cxx +++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx @@ -23,8 +23,8 @@ #include "config.h" #include "CdioParanoiaInputPlugin.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "../InputStream.hxx" +#include "../InputPlugin.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/input/CdioParanoiaInputPlugin.hxx b/src/input/plugins/CdioParanoiaInputPlugin.hxx index e2804e8c7..e2804e8c7 100644 --- a/src/input/CdioParanoiaInputPlugin.hxx +++ b/src/input/plugins/CdioParanoiaInputPlugin.hxx diff --git a/src/input/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index 64321b38d..a3c6c1d1a 100644 --- a/src/input/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -19,8 +19,8 @@ #include "config.h" #include "CurlInputPlugin.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "../InputStream.hxx" +#include "../InputPlugin.hxx" #include "config/ConfigGlobal.hxx" #include "config/ConfigData.hxx" #include "tag/Tag.hxx" diff --git a/src/input/CurlInputPlugin.hxx b/src/input/plugins/CurlInputPlugin.hxx index 4acb18bfc..4acb18bfc 100644 --- a/src/input/CurlInputPlugin.hxx +++ b/src/input/plugins/CurlInputPlugin.hxx diff --git a/src/input/DespotifyInputPlugin.cxx b/src/input/plugins/DespotifyInputPlugin.cxx index 29a80e585..a01ba3759 100644 --- a/src/input/DespotifyInputPlugin.cxx +++ b/src/input/plugins/DespotifyInputPlugin.cxx @@ -20,8 +20,8 @@ #include "config.h" #include "DespotifyInputPlugin.hxx" #include "DespotifyUtils.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "../InputStream.hxx" +#include "../InputPlugin.hxx" #include "tag/Tag.hxx" #include "util/StringUtil.hxx" #include "Log.hxx" diff --git a/src/input/DespotifyInputPlugin.hxx b/src/input/plugins/DespotifyInputPlugin.hxx index 83f963520..83f963520 100644 --- a/src/input/DespotifyInputPlugin.hxx +++ b/src/input/plugins/DespotifyInputPlugin.hxx diff --git a/src/input/FfmpegInputPlugin.cxx b/src/input/plugins/FfmpegInputPlugin.cxx index 50fec8aec..0d0a4375e 100644 --- a/src/input/FfmpegInputPlugin.cxx +++ b/src/input/plugins/FfmpegInputPlugin.cxx @@ -22,8 +22,8 @@ #include "config.h" #include "FfmpegInputPlugin.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "../InputStream.hxx" +#include "../InputPlugin.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/input/FfmpegInputPlugin.hxx b/src/input/plugins/FfmpegInputPlugin.hxx index 43f829e89..43f829e89 100644 --- a/src/input/FfmpegInputPlugin.hxx +++ b/src/input/plugins/FfmpegInputPlugin.hxx diff --git a/src/input/FileInputPlugin.cxx b/src/input/plugins/FileInputPlugin.cxx index d9f5a217f..780e93263 100644 --- a/src/input/FileInputPlugin.cxx +++ b/src/input/plugins/FileInputPlugin.cxx @@ -19,8 +19,8 @@ #include "config.h" /* must be first for large file support */ #include "FileInputPlugin.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "../InputStream.hxx" +#include "../InputPlugin.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" #include "fs/Traits.hxx" diff --git a/src/input/FileInputPlugin.hxx b/src/input/plugins/FileInputPlugin.hxx index 4aef94637..4aef94637 100644 --- a/src/input/FileInputPlugin.hxx +++ b/src/input/plugins/FileInputPlugin.hxx diff --git a/src/input/MmsInputPlugin.cxx b/src/input/plugins/MmsInputPlugin.cxx index 8f946ae5e..a7068cb2b 100644 --- a/src/input/MmsInputPlugin.cxx +++ b/src/input/plugins/MmsInputPlugin.cxx @@ -19,8 +19,8 @@ #include "config.h" #include "MmsInputPlugin.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "../InputStream.hxx" +#include "../InputPlugin.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/input/MmsInputPlugin.hxx b/src/input/plugins/MmsInputPlugin.hxx index b4017ffd6..b4017ffd6 100644 --- a/src/input/MmsInputPlugin.hxx +++ b/src/input/plugins/MmsInputPlugin.hxx diff --git a/src/input/RewindInputPlugin.cxx b/src/input/plugins/RewindInputPlugin.cxx index 685ca1e6e..1a930ac53 100644 --- a/src/input/RewindInputPlugin.cxx +++ b/src/input/plugins/RewindInputPlugin.cxx @@ -19,8 +19,8 @@ #include "config.h" #include "RewindInputPlugin.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "../InputStream.hxx" +#include "../InputPlugin.hxx" #include <assert.h> #include <string.h> diff --git a/src/input/RewindInputPlugin.hxx b/src/input/plugins/RewindInputPlugin.hxx index f19705154..f19705154 100644 --- a/src/input/RewindInputPlugin.hxx +++ b/src/input/plugins/RewindInputPlugin.hxx diff --git a/src/input/SmbclientInputPlugin.cxx b/src/input/plugins/SmbclientInputPlugin.cxx index ed94d581a..9fbe72b59 100644 --- a/src/input/SmbclientInputPlugin.cxx +++ b/src/input/plugins/SmbclientInputPlugin.cxx @@ -19,8 +19,8 @@ #include "config.h" #include "SmbclientInputPlugin.hxx" -#include "InputStream.hxx" -#include "InputPlugin.hxx" +#include "../InputStream.hxx" +#include "../InputPlugin.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" diff --git a/src/input/SmbclientInputPlugin.hxx b/src/input/plugins/SmbclientInputPlugin.hxx index a0539d020..a0539d020 100644 --- a/src/input/SmbclientInputPlugin.hxx +++ b/src/input/plugins/SmbclientInputPlugin.hxx diff --git a/src/playlist/PlaylistAny.cxx b/src/playlist/PlaylistAny.cxx index 8d748cada..04efbb569 100644 --- a/src/playlist/PlaylistAny.cxx +++ b/src/playlist/PlaylistAny.cxx @@ -23,7 +23,7 @@ #include "PlaylistRegistry.hxx" #include "util/UriUtil.hxx" #include "util/Error.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "Log.hxx" #include <assert.h> diff --git a/src/playlist/PlaylistQueue.cxx b/src/playlist/PlaylistQueue.cxx index 0a45920e3..564c94d0a 100644 --- a/src/playlist/PlaylistQueue.cxx +++ b/src/playlist/PlaylistQueue.cxx @@ -22,7 +22,7 @@ #include "PlaylistAny.hxx" #include "PlaylistSong.hxx" #include "Playlist.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "SongEnumerator.hxx" #include "DetachedSong.hxx" #include "thread/Cond.hxx" diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx index 7e80d8d8e..5e6db15f4 100644 --- a/src/playlist/PlaylistRegistry.cxx +++ b/src/playlist/PlaylistRegistry.cxx @@ -30,7 +30,7 @@ #include "plugins/RssPlaylistPlugin.hxx" #include "plugins/CuePlaylistPlugin.hxx" #include "plugins/EmbeddedCuePlaylistPlugin.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "util/UriUtil.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" diff --git a/src/playlist/Print.cxx b/src/playlist/Print.cxx index 7f13d5544..dc5aa252c 100644 --- a/src/playlist/Print.cxx +++ b/src/playlist/Print.cxx @@ -23,7 +23,7 @@ #include "PlaylistSong.hxx" #include "SongEnumerator.hxx" #include "SongPrint.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "DetachedSong.hxx" #include "fs/Traits.hxx" #include "thread/Cond.hxx" diff --git a/src/playlist/plugins/CuePlaylistPlugin.cxx b/src/playlist/plugins/CuePlaylistPlugin.cxx index d52d41c07..d6be4eb83 100644 --- a/src/playlist/plugins/CuePlaylistPlugin.cxx +++ b/src/playlist/plugins/CuePlaylistPlugin.cxx @@ -22,7 +22,7 @@ #include "../PlaylistPlugin.hxx" #include "../SongEnumerator.hxx" #include "cue/CueParser.hxx" -#include "TextInputStream.hxx" +#include "input/TextInputStream.hxx" #include <string> diff --git a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx index ac27fb136..a337bce4c 100644 --- a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx +++ b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx @@ -25,7 +25,7 @@ #include "tag/Tag.hxx" #include "tag/TagBuilder.hxx" #include "util/StringUtil.hxx" -#include "TextInputStream.hxx" +#include "input/TextInputStream.hxx" #include <string.h> #include <stdlib.h> diff --git a/src/playlist/plugins/M3uPlaylistPlugin.cxx b/src/playlist/plugins/M3uPlaylistPlugin.cxx index a87e3edc7..f892f2010 100644 --- a/src/playlist/plugins/M3uPlaylistPlugin.cxx +++ b/src/playlist/plugins/M3uPlaylistPlugin.cxx @@ -23,7 +23,7 @@ #include "../SongEnumerator.hxx" #include "DetachedSong.hxx" #include "util/StringUtil.hxx" -#include "TextInputStream.hxx" +#include "input/TextInputStream.hxx" class M3uPlaylist final : public SongEnumerator { TextInputStream tis; diff --git a/src/playlist/plugins/PlsPlaylistPlugin.cxx b/src/playlist/plugins/PlsPlaylistPlugin.cxx index 0abd7172b..979f59a96 100644 --- a/src/playlist/plugins/PlsPlaylistPlugin.cxx +++ b/src/playlist/plugins/PlsPlaylistPlugin.cxx @@ -21,7 +21,7 @@ #include "PlsPlaylistPlugin.hxx" #include "../PlaylistPlugin.hxx" #include "../MemorySongEnumerator.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "DetachedSong.hxx" #include "tag/TagBuilder.hxx" #include "util/Error.hxx" diff --git a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx index 62936ced5..8f378ac9d 100644 --- a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx +++ b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx @@ -22,7 +22,7 @@ #include "../PlaylistPlugin.hxx" #include "../MemorySongEnumerator.hxx" #include "config/ConfigData.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "tag/TagBuilder.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" diff --git a/src/playlist/plugins/XspfPlaylistPlugin.cxx b/src/playlist/plugins/XspfPlaylistPlugin.cxx index 12888b3bc..f9c1f21b1 100644 --- a/src/playlist/plugins/XspfPlaylistPlugin.cxx +++ b/src/playlist/plugins/XspfPlaylistPlugin.cxx @@ -22,7 +22,7 @@ #include "../PlaylistPlugin.hxx" #include "../MemorySongEnumerator.hxx" #include "DetachedSong.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "tag/TagBuilder.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx index caf433ac1..034bad72b 100644 --- a/test/DumpDatabase.cxx +++ b/test/DumpDatabase.cxx @@ -42,7 +42,7 @@ using std::endl; #include <stdlib.h> #ifdef HAVE_LIBUPNP -#include "InputStream.hxx" +#include "input/InputStream.hxx" size_t InputStream::LockRead(void *, size_t, Error &) { diff --git a/test/FakeDecoderAPI.cxx b/test/FakeDecoderAPI.cxx index dc66c5717..88db4a268 100644 --- a/test/FakeDecoderAPI.cxx +++ b/test/FakeDecoderAPI.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "decoder/DecoderAPI.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "util/Error.hxx" #include "Compiler.h" diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx index 292f3987e..d8a7c4bfa 100644 --- a/test/dump_playlist.cxx +++ b/test/dump_playlist.cxx @@ -21,10 +21,10 @@ #include "TagSave.hxx" #include "DetachedSong.hxx" #include "playlist/SongEnumerator.hxx" -#include "InputStream.hxx" +#include "input/InputStream.hxx" #include "config/ConfigGlobal.hxx" #include "decoder/DecoderList.hxx" -#include "InputInit.hxx" +#include "input/Init.hxx" #include "IOThread.hxx" #include "playlist/PlaylistRegistry.hxx" #include "playlist/PlaylistPlugin.hxx" @@ -93,7 +93,7 @@ int main(int argc, char **argv) LogError(error); else fprintf(stderr, - "InputStream::Open() failed\n"); + "input/InputStream::Open() failed\n"); return 2; } diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx index 5ce5e9da4..e664c5a1b 100644 --- a/test/dump_text_file.cxx +++ b/test/dump_text_file.cxx @@ -19,11 +19,11 @@ #include "config.h" #include "IOThread.hxx" -#include "InputInit.hxx" -#include "InputStream.hxx" +#include "input/Init.hxx" +#include "input/InputStream.hxx" +#include "input/TextInputStream.hxx" #include "config/ConfigGlobal.hxx" #include "stdbin.h" -#include "TextInputStream.hxx" #include "util/Error.hxx" #include "thread/Cond.hxx" #include "Log.hxx" diff --git a/test/read_tags.cxx b/test/read_tags.cxx index 68bf88fe3..b12aff11a 100644 --- a/test/read_tags.cxx +++ b/test/read_tags.cxx @@ -21,8 +21,8 @@ #include "IOThread.hxx" #include "decoder/DecoderList.hxx" #include "decoder/DecoderPlugin.hxx" -#include "InputInit.hxx" -#include "InputStream.hxx" +#include "input/Init.hxx" +#include "input/InputStream.hxx" #include "AudioFormat.hxx" #include "tag/TagHandler.hxx" #include "tag/TagId3.hxx" diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx index e2373f708..3e5f61778 100644 --- a/test/run_decoder.cxx +++ b/test/run_decoder.cxx @@ -21,8 +21,8 @@ #include "IOThread.hxx" #include "decoder/DecoderList.hxx" #include "decoder/DecoderAPI.hxx" -#include "InputInit.hxx" -#include "InputStream.hxx" +#include "input/Init.hxx" +#include "input/InputStream.hxx" #include "AudioFormat.hxx" #include "util/Error.hxx" #include "thread/Cond.hxx" @@ -222,7 +222,7 @@ int main(int argc, char **argv) if (error.IsDefined()) LogError(error); else - fprintf(stderr, "InputStream::Open() failed\n"); + fprintf(stderr, "input/InputStream::Open() failed\n"); return EXIT_FAILURE; } diff --git a/test/run_input.cxx b/test/run_input.cxx index 48892dc28..539171ad8 100644 --- a/test/run_input.cxx +++ b/test/run_input.cxx @@ -22,8 +22,8 @@ #include "stdbin.h" #include "tag/Tag.hxx" #include "config/ConfigGlobal.hxx" -#include "InputStream.hxx" -#include "InputInit.hxx" +#include "input/InputStream.hxx" +#include "input/Init.hxx" #include "IOThread.hxx" #include "util/Error.hxx" #include "thread/Cond.hxx" diff --git a/test/visit_archive.cxx b/test/visit_archive.cxx index ee9fd1a4e..0ff5706f2 100644 --- a/test/visit_archive.cxx +++ b/test/visit_archive.cxx @@ -22,7 +22,7 @@ #include "tag/Tag.hxx" #include "config/ConfigGlobal.hxx" #include "IOThread.hxx" -#include "InputInit.hxx" +#include "input/Init.hxx" #include "archive/ArchiveList.hxx" #include "archive/ArchivePlugin.hxx" #include "archive/ArchiveFile.hxx" |