Input*: move to input/

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
 

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);
 

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"

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"

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"

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>

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"
 

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"

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"

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"

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"
 

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"

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"

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"
 

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"

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"

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"

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"

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>
 

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"

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;
 	}
 

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"

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"

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>
 

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"
 

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"

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"

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"

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"

src/InputInit.cxx → 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"

src/InputStream.cxx → 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"

src/InputRegistry.cxx → 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[] = {

src/input/AlsaInputPlugin.cxx → 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"

src/input/AlsaInputPlugin.hxx → 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;
 

src/input/ArchiveInputPlugin.cxx → 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"

src/input/CdioParanoiaInputPlugin.cxx → 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"

src/input/CurlInputPlugin.cxx → 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"

src/input/DespotifyInputPlugin.cxx → 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"

src/input/FfmpegInputPlugin.cxx → 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"

src/input/FileInputPlugin.cxx → 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"

src/input/MmsInputPlugin.cxx → 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"

src/input/RewindInputPlugin.cxx → 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>

src/input/SmbclientInputPlugin.cxx → 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"
 

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>

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"

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"

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"

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>
 

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>

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;

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"

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"

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"

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 &)
 {

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"
 

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;
 		}
 

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"

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"

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;
 		}

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"

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"