oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Input*: move to input/

Browse Source
This commit is contained in:
Max Kellermann 2014-01-24 16:18:21 +01:00
parent e199c33c6e
commit f8bfea8bae
76 changed files with 114 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Makefile.am
View File

@ -55,7 +55,6 @@ src_mpd_LDADD = \
mpd_headers = \ mpd_headers = \
src/check.h \ src/check.h \
src/gerror.h \ src/gerror.h \
src/TextInputStream.hxx \
src/AudioCompress/config.h \ src/AudioCompress/config.h \
src/AudioCompress/compress.h \ src/AudioCompress/compress.h \
src/open.h \ src/open.h \
@ -210,7 +209,6 @@ src_mpd_SOURCES = \
src/TagSave.cxx src/TagSave.hxx \ src/TagSave.cxx src/TagSave.hxx \
src/TagFile.cxx src/TagFile.hxx \ src/TagFile.cxx src/TagFile.hxx \
src/TagStream.cxx src/TagStream.hxx \ src/TagStream.cxx src/TagStream.hxx \
src/TextInputStream.cxx \
src/Volume.cxx src/Volume.hxx \ src/Volume.cxx src/Volume.hxx \
src/SongFilter.cxx src/SongFilter.hxx \ src/SongFilter.cxx src/SongFilter.hxx \
src/PlaylistFile.cxx src/PlaylistFile.hxx \ src/PlaylistFile.cxx src/PlaylistFile.hxx \
@ -452,7 +450,7 @@ libarchive_a_SOURCES = \
src/archive/ArchivePlugin.cxx src/archive/ArchivePlugin.hxx \ src/archive/ArchivePlugin.cxx src/archive/ArchivePlugin.hxx \
src/archive/ArchiveVisitor.hxx \ src/archive/ArchiveVisitor.hxx \
src/archive/ArchiveFile.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) \ libarchive_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(BZ2_CFLAGS) \ $(BZ2_CFLAGS) \
$(ISO9660_CFLAGS) \ $(ISO9660_CFLAGS) \
@ -826,12 +824,13 @@ endif
# #
libinput_a_SOURCES = \ libinput_a_SOURCES = \
src/InputInit.cxx src/InputInit.hxx \ src/input/Init.cxx src/input/Init.hxx \
src/InputRegistry.cxx src/InputRegistry.hxx \ src/input/Registry.cxx src/input/Registry.hxx \
src/InputStream.cxx src/InputStream.hxx \ src/input/InputStream.cxx src/input/InputStream.hxx \
src/InputPlugin.hxx \ src/input/InputPlugin.hxx \
src/input/RewindInputPlugin.cxx src/input/RewindInputPlugin.hxx \ src/input/TextInputStream.cxx src/input/TextInputStream.hxx \
src/input/FileInputPlugin.cxx src/input/FileInputPlugin.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) \ libinput_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(CURL_CFLAGS) \ $(CURL_CFLAGS) \
@ -852,43 +851,43 @@ INPUT_LIBS = \
if HAVE_ALSA if HAVE_ALSA
libinput_a_SOURCES += \ libinput_a_SOURCES += \
src/input/AlsaInputPlugin.cxx \ src/input/plugins/AlsaInputPlugin.cxx \
src/input/AlsaInputPlugin.hxx src/input/plugins/AlsaInputPlugin.hxx
INPUT_LIBS += $(ALSA_LIBS) INPUT_LIBS += $(ALSA_LIBS)
endif endif
if ENABLE_CURL if ENABLE_CURL
libinput_a_SOURCES += \ 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 src/IcyMetaDataParser.cxx src/IcyMetaDataParser.hxx
endif endif
if ENABLE_SMBCLIENT if ENABLE_SMBCLIENT
libinput_a_SOURCES += \ libinput_a_SOURCES += \
src/input/SmbclientInputPlugin.cxx src/input/SmbclientInputPlugin.hxx src/input/plugins/SmbclientInputPlugin.cxx src/input/plugins/SmbclientInputPlugin.hxx
endif endif
if ENABLE_CDIO_PARANOIA if ENABLE_CDIO_PARANOIA
libinput_a_SOURCES += \ libinput_a_SOURCES += \
src/input/CdioParanoiaInputPlugin.cxx \ src/input/plugins/CdioParanoiaInputPlugin.cxx \
src/input/CdioParanoiaInputPlugin.hxx src/input/plugins/CdioParanoiaInputPlugin.hxx
endif endif
if HAVE_FFMPEG if HAVE_FFMPEG
libinput_a_SOURCES += \ libinput_a_SOURCES += \
src/input/FfmpegInputPlugin.cxx src/input/FfmpegInputPlugin.hxx src/input/plugins/FfmpegInputPlugin.cxx src/input/plugins/FfmpegInputPlugin.hxx
endif endif
if ENABLE_MMS if ENABLE_MMS
libinput_a_SOURCES += \ libinput_a_SOURCES += \
src/input/MmsInputPlugin.cxx src/input/MmsInputPlugin.hxx src/input/plugins/MmsInputPlugin.cxx src/input/plugins/MmsInputPlugin.hxx
endif endif
if ENABLE_DESPOTIFY if ENABLE_DESPOTIFY
libinput_a_SOURCES += \ libinput_a_SOURCES += \
src/input/DespotifyInputPlugin.cxx \ src/input/plugins/DespotifyInputPlugin.cxx \
src/input/DespotifyInputPlugin.hxx src/input/plugins/DespotifyInputPlugin.hxx
endif endif
@ -1293,7 +1292,7 @@ test_visit_archive_LDADD = \
test_visit_archive_SOURCES = test/visit_archive.cxx \ test_visit_archive_SOURCES = test/visit_archive.cxx \
src/Log.cxx src/LogBackend.cxx \ src/Log.cxx src/LogBackend.cxx \
src/IOThread.cxx \ src/IOThread.cxx \
src/InputStream.cxx src/input/InputStream.cxx
if ENABLE_DESPOTIFY if ENABLE_DESPOTIFY
test_visit_archive_SOURCES += src/DespotifyUtils.cxx 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_dump_text_file_SOURCES = test/dump_text_file.cxx \
test/stdbin.h \ test/stdbin.h \
src/Log.cxx src/LogBackend.cxx \ src/Log.cxx src/LogBackend.cxx \
src/IOThread.cxx \ src/IOThread.cxx
src/TextInputStream.cxx
test_dump_playlist_LDADD = \ test_dump_playlist_LDADD = \
$(PLAYLIST_LIBS) \ $(PLAYLIST_LIBS) \
@ -1341,7 +1339,6 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \
src/TagSave.cxx \ src/TagSave.cxx \
src/TagFile.cxx \ src/TagFile.cxx \
src/CheckAudioFormat.cxx \ src/CheckAudioFormat.cxx \
src/TextInputStream.cxx \
src/DetachedSong.cxx \ src/DetachedSong.cxx \
src/cue/CueParser.cxx src/cue/CueParser.hxx src/cue/CueParser.cxx src/cue/CueParser.hxx

6
src/CommandLine.cxx
View File

@ -29,8 +29,8 @@
#include "decoder/DecoderPlugin.hxx" #include "decoder/DecoderPlugin.hxx"
#include "output/OutputList.hxx" #include "output/OutputList.hxx"
#include "output/OutputPlugin.hxx" #include "output/OutputPlugin.hxx"
#include "InputRegistry.hxx" #include "input/Registry.hxx"
#include "InputPlugin.hxx" #include "input/InputPlugin.hxx"
#include "playlist/PlaylistRegistry.hxx" #include "playlist/PlaylistRegistry.hxx"
#include "playlist/PlaylistPlugin.hxx" #include "playlist/PlaylistPlugin.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
@ -148,7 +148,7 @@ static void version(void)
#endif #endif
puts("\n" puts("\n"
"Input plugins:"); "input/Input plugins:");
input_plugins_for_each(plugin) input_plugins_for_each(plugin)
printf(" %s", plugin->name); printf(" %s", plugin->name);

2
src/Expat.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "Expat.hxx" #include "Expat.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

2
src/Main.cxx
View File

@ -45,7 +45,7 @@
#include "Log.hxx" #include "Log.hxx"
#include "LogInit.hxx" #include "LogInit.hxx"
#include "GlobalEvents.hxx" #include "GlobalEvents.hxx"
#include "InputInit.hxx" #include "input/Init.hxx"
#include "event/Loop.hxx" #include "event/Loop.hxx"
#include "IOThread.hxx" #include "IOThread.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"

2
src/PlaylistPrint.cxx
View File

@ -26,7 +26,7 @@
#include "DatabaseGlue.hxx" #include "DatabaseGlue.hxx"
#include "DatabasePlugin.hxx" #include "DatabasePlugin.hxx"
#include "client/Client.hxx" #include "client/Client.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/TagFile.cxx
View File

@ -24,7 +24,7 @@
#include "util/Error.hxx" #include "util/Error.hxx"
#include "decoder/DecoderList.hxx" #include "decoder/DecoderList.hxx"
#include "decoder/DecoderPlugin.hxx" #include "decoder/DecoderPlugin.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include <assert.h> #include <assert.h>

2
src/TagStream.cxx
View File

@ -23,7 +23,7 @@
#include "util/Error.hxx" #include "util/Error.hxx"
#include "decoder/DecoderList.hxx" #include "decoder/DecoderList.hxx"
#include "decoder/DecoderPlugin.hxx" #include "decoder/DecoderPlugin.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"

4
src/archive/plugins/Bzip2ArchivePlugin.cxx
View File

@ -26,8 +26,8 @@
#include "../ArchivePlugin.hxx" #include "../ArchivePlugin.hxx"
#include "../ArchiveFile.hxx" #include "../ArchiveFile.hxx"
#include "../ArchiveVisitor.hxx" #include "../ArchiveVisitor.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "InputPlugin.hxx" #include "input/InputPlugin.hxx"
#include "util/RefCount.hxx" #include "util/RefCount.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

4
src/archive/plugins/Iso9660ArchivePlugin.cxx
View File

@ -26,8 +26,8 @@
#include "../ArchivePlugin.hxx" #include "../ArchivePlugin.hxx"
#include "../ArchiveFile.hxx" #include "../ArchiveFile.hxx"
#include "../ArchiveVisitor.hxx" #include "../ArchiveVisitor.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "InputPlugin.hxx" #include "input/InputPlugin.hxx"
#include "util/RefCount.hxx" #include "util/RefCount.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

4
src/archive/plugins/ZzipArchivePlugin.cxx
View File

@ -26,8 +26,8 @@
#include "../ArchivePlugin.hxx" #include "../ArchivePlugin.hxx"
#include "../ArchiveFile.hxx" #include "../ArchiveFile.hxx"
#include "../ArchiveVisitor.hxx" #include "../ArchiveVisitor.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "InputPlugin.hxx" #include "input/InputPlugin.hxx"
#include "util/RefCount.hxx" #include "util/RefCount.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

2
src/decoder/DecoderAPI.cxx
View File

@ -29,7 +29,7 @@
#include "DecoderControl.hxx" #include "DecoderControl.hxx"
#include "DecoderInternal.hxx" #include "DecoderInternal.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"

2
src/decoder/DecoderThread.cxx
View File

@ -29,7 +29,7 @@
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "DecoderList.hxx" #include "DecoderList.hxx"
#include "util/UriUtil.hxx" #include "util/UriUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/decoder/plugins/AudiofileDecoderPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "AudiofileDecoderPlugin.hxx" #include "AudiofileDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "CheckAudioFormat.hxx"
#include "tag/TagHandler.hxx" #include "tag/TagHandler.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/decoder/plugins/DsdLib.cxx
View File

@ -26,7 +26,7 @@
#include "config.h" #include "config.h"
#include "DsdLib.hxx" #include "DsdLib.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "tag/TagId3.hxx" #include "tag/TagId3.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/decoder/plugins/DsdiffDecoderPlugin.cxx
View File

@ -29,7 +29,7 @@
#include "config.h" #include "config.h"
#include "DsdiffDecoderPlugin.hxx" #include "DsdiffDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "CheckAudioFormat.hxx"
#include "util/bit_reverse.h" #include "util/bit_reverse.h"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/decoder/plugins/DsfDecoderPlugin.cxx
View File

@ -30,7 +30,7 @@
#include "config.h" #include "config.h"
#include "DsfDecoderPlugin.hxx" #include "DsfDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "CheckAudioFormat.hxx"
#include "util/bit_reverse.h" #include "util/bit_reverse.h"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/decoder/plugins/FaadDecoderPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "FaadDecoderPlugin.hxx" #include "FaadDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "../DecoderBuffer.hxx" #include "../DecoderBuffer.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "CheckAudioFormat.hxx"
#include "tag/TagHandler.hxx" #include "tag/TagHandler.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"

2
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -25,7 +25,7 @@
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "FfmpegMetaData.hxx" #include "FfmpegMetaData.hxx"
#include "tag/TagHandler.hxx" #include "tag/TagHandler.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "CheckAudioFormat.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

2
src/decoder/plugins/FlacIOHandle.hxx
View File

@ -21,7 +21,7 @@
#define MPD_FLAC_IO_HANDLE_HXX #define MPD_FLAC_IO_HANDLE_HXX
#include "Compiler.h" #include "Compiler.h"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include <FLAC/callback.h> #include <FLAC/callback.h>

2
src/decoder/plugins/FlacInput.cxx
View File

@ -21,7 +21,7 @@
#include "FlacInput.hxx" #include "FlacInput.hxx"
#include "FlacDomain.hxx" #include "FlacDomain.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "Compiler.h" #include "Compiler.h"

4
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "MadDecoderPlugin.hxx" #include "MadDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "tag/TagId3.hxx" #include "tag/TagId3.hxx"
#include "tag/TagRva2.hxx" #include "tag/TagRva2.hxx"
@ -1096,7 +1096,7 @@ mp3_decode(Decoder &decoder, InputStream &input_stream)
if (decoder_get_command(decoder) == DecoderCommand::NONE) if (decoder_get_command(decoder) == DecoderCommand::NONE)
LogError(mad_domain, 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; return;
} }

2
src/decoder/plugins/ModplugDecoderPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "ModplugDecoderPlugin.hxx" #include "ModplugDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "tag/TagHandler.hxx" #include "tag/TagHandler.hxx"
#include "system/FatalError.hxx" #include "system/FatalError.hxx"
#include "util/WritableBuffer.hxx" #include "util/WritableBuffer.hxx"

2
src/decoder/plugins/MpcdecDecoderPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "MpcdecDecoderPlugin.hxx" #include "MpcdecDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "CheckAudioFormat.hxx"
#include "tag/TagHandler.hxx" #include "tag/TagHandler.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/decoder/plugins/OggFind.hxx
View File

@ -21,7 +21,7 @@
#define MPD_OGG_FIND_HXX #define MPD_OGG_FIND_HXX
#include "check.h" #include "check.h"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include <ogg/ogg.h> #include <ogg/ogg.h>

2
src/decoder/plugins/OpusDecoderPlugin.cxx
View File

@ -28,7 +28,7 @@
#include "OggCodec.hxx" #include "OggCodec.hxx"
#include "tag/TagHandler.hxx" #include "tag/TagHandler.hxx"
#include "tag/TagBuilder.hxx" #include "tag/TagBuilder.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"

2
src/decoder/plugins/PcmDecoderPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "PcmDecoderPlugin.hxx" #include "PcmDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/ByteReverse.hxx" #include "util/ByteReverse.hxx"
#include "Log.hxx" #include "Log.hxx"

2
src/decoder/plugins/SndfileDecoderPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "SndfileDecoderPlugin.hxx" #include "SndfileDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "CheckAudioFormat.hxx"
#include "tag/TagHandler.hxx" #include "tag/TagHandler.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/decoder/plugins/VorbisDecoderPlugin.cxx
View File

@ -22,7 +22,7 @@
#include "VorbisComments.hxx" #include "VorbisComments.hxx"
#include "VorbisDomain.hxx" #include "VorbisDomain.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "OggCodec.hxx" #include "OggCodec.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Macros.hxx" #include "util/Macros.hxx"

2
src/decoder/plugins/WavpackDecoderPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "WavpackDecoderPlugin.hxx" #include "WavpackDecoderPlugin.hxx"
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx" #include "CheckAudioFormat.hxx"
#include "tag/TagHandler.hxx" #include "tag/TagHandler.hxx"
#include "tag/ApeTag.hxx" #include "tag/ApeTag.hxx"

4
src/InputInit.cxx → src/input/Init.cxx
View File

@ -18,8 +18,8 @@
*/ */
#include "config.h" #include "config.h"
#include "InputInit.hxx" #include "Init.hxx"
#include "InputRegistry.hxx" #include "Registry.hxx"
#include "InputPlugin.hxx" #include "InputPlugin.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

0
src/InputInit.hxx → src/input/Init.hxx
View File

0
src/InputPlugin.hxx → src/input/InputPlugin.hxx
View File

4
src/InputStream.cxx → src/input/InputStream.cxx
View File

@ -19,9 +19,9 @@
#include "config.h" #include "config.h"
#include "InputStream.hxx" #include "InputStream.hxx"
#include "InputRegistry.hxx" #include "Registry.hxx"
#include "InputPlugin.hxx" #include "InputPlugin.hxx"
#include "input/RewindInputPlugin.hxx" #include "plugins/RewindInputPlugin.hxx"
#include "util/UriUtil.hxx" #include "util/UriUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

0
src/InputStream.hxx → src/input/InputStream.hxx
View File

20
src/InputRegistry.cxx → src/input/Registry.cxx
View File

@ -18,40 +18,40 @@
*/ */
#include "config.h" #include "config.h"
#include "InputRegistry.hxx" #include "Registry.hxx"
#include "util/Macros.hxx" #include "util/Macros.hxx"
#include "input/FileInputPlugin.hxx" #include "plugins/FileInputPlugin.hxx"
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
#include "input/AlsaInputPlugin.hxx" #include "plugins/AlsaInputPlugin.hxx"
#endif #endif
#ifdef ENABLE_ARCHIVE #ifdef ENABLE_ARCHIVE
#include "input/ArchiveInputPlugin.hxx" #include "plugins/ArchiveInputPlugin.hxx"
#endif #endif
#ifdef ENABLE_CURL #ifdef ENABLE_CURL
#include "input/CurlInputPlugin.hxx" #include "plugins/CurlInputPlugin.hxx"
#endif #endif
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
#include "input/FfmpegInputPlugin.hxx" #include "plugins/FfmpegInputPlugin.hxx"
#endif #endif
#ifdef ENABLE_SMBCLIENT #ifdef ENABLE_SMBCLIENT
#include "input/SmbclientInputPlugin.hxx" #include "plugins/SmbclientInputPlugin.hxx"
#endif #endif
#ifdef ENABLE_MMS #ifdef ENABLE_MMS
#include "input/MmsInputPlugin.hxx" #include "plugins/MmsInputPlugin.hxx"
#endif #endif
#ifdef ENABLE_CDIO_PARANOIA #ifdef ENABLE_CDIO_PARANOIA
#include "input/CdioParanoiaInputPlugin.hxx" #include "plugins/CdioParanoiaInputPlugin.hxx"
#endif #endif
#ifdef ENABLE_DESPOTIFY #ifdef ENABLE_DESPOTIFY
#include "input/DespotifyInputPlugin.hxx" #include "plugins/DespotifyInputPlugin.hxx"
#endif #endif
const InputPlugin *const input_plugins[] = { const InputPlugin *const input_plugins[] = {

0
src/InputRegistry.hxx → src/input/Registry.hxx
View File

0
src/TextInputStream.cxx → src/input/TextInputStream.cxx
View File

0
src/TextInputStream.hxx → src/input/TextInputStream.hxx
View File

4
src/input/AlsaInputPlugin.cxx → src/input/plugins/AlsaInputPlugin.cxx
View File

@ -26,8 +26,8 @@
#include "config.h" #include "config.h"
#include "AlsaInputPlugin.hxx" #include "AlsaInputPlugin.hxx"
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
#include "InputStream.hxx" #include "../InputStream.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"

2
src/input/AlsaInputPlugin.hxx → src/input/plugins/AlsaInputPlugin.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_ALSA_INPUT_PLUGIN_HXX #ifndef MPD_ALSA_INPUT_PLUGIN_HXX
#define MPD_ALSA_INPUT_PLUGIN_HXX #define MPD_ALSA_INPUT_PLUGIN_HXX
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
extern const struct InputPlugin input_plugin_alsa; extern const struct InputPlugin input_plugin_alsa;

2
src/input/ArchiveInputPlugin.cxx → src/input/plugins/ArchiveInputPlugin.cxx
View File

@ -24,7 +24,7 @@
#include "archive/ArchiveList.hxx" #include "archive/ArchiveList.hxx"
#include "archive/ArchivePlugin.hxx" #include "archive/ArchivePlugin.hxx"
#include "archive/ArchiveFile.hxx" #include "archive/ArchiveFile.hxx"
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "util/Alloc.hxx" #include "util/Alloc.hxx"
#include "Log.hxx" #include "Log.hxx"

0
src/input/ArchiveInputPlugin.hxx → src/input/plugins/ArchiveInputPlugin.hxx
View File

4
src/input/CdioParanoiaInputPlugin.cxx → src/input/plugins/CdioParanoiaInputPlugin.cxx
View File

@ -23,8 +23,8 @@
#include "config.h" #include "config.h"
#include "CdioParanoiaInputPlugin.hxx" #include "CdioParanoiaInputPlugin.hxx"
#include "InputStream.hxx" #include "../InputStream.hxx"
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

0
src/input/CdioParanoiaInputPlugin.hxx → src/input/plugins/CdioParanoiaInputPlugin.hxx
View File

4
src/input/CurlInputPlugin.cxx → src/input/plugins/CurlInputPlugin.cxx
View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "CurlInputPlugin.hxx" #include "CurlInputPlugin.hxx"
#include "InputStream.hxx" #include "../InputStream.hxx"
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx" #include "config/ConfigData.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"

0
src/input/CurlInputPlugin.hxx → src/input/plugins/CurlInputPlugin.hxx
View File

4
src/input/DespotifyInputPlugin.cxx → src/input/plugins/DespotifyInputPlugin.cxx
View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "DespotifyInputPlugin.hxx" #include "DespotifyInputPlugin.hxx"
#include "DespotifyUtils.hxx" #include "DespotifyUtils.hxx"
#include "InputStream.hxx" #include "../InputStream.hxx"
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "Log.hxx" #include "Log.hxx"

0
src/input/DespotifyInputPlugin.hxx → src/input/plugins/DespotifyInputPlugin.hxx
View File

4
src/input/FfmpegInputPlugin.cxx → src/input/plugins/FfmpegInputPlugin.cxx
View File

@ -22,8 +22,8 @@
#include "config.h" #include "config.h"
#include "FfmpegInputPlugin.hxx" #include "FfmpegInputPlugin.hxx"
#include "InputStream.hxx" #include "../InputStream.hxx"
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

0
src/input/FfmpegInputPlugin.hxx → src/input/plugins/FfmpegInputPlugin.hxx
View File

4
src/input/FileInputPlugin.cxx → src/input/plugins/FileInputPlugin.cxx
View File

@ -19,8 +19,8 @@
#include "config.h" /* must be first for large file support */ #include "config.h" /* must be first for large file support */
#include "FileInputPlugin.hxx" #include "FileInputPlugin.hxx"
#include "InputStream.hxx" #include "../InputStream.hxx"
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"

0
src/input/FileInputPlugin.hxx → src/input/plugins/FileInputPlugin.hxx
View File

4
src/input/MmsInputPlugin.cxx → src/input/plugins/MmsInputPlugin.cxx
View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "MmsInputPlugin.hxx" #include "MmsInputPlugin.hxx"
#include "InputStream.hxx" #include "../InputStream.hxx"
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

0
src/input/MmsInputPlugin.hxx → src/input/plugins/MmsInputPlugin.hxx
View File

4
src/input/RewindInputPlugin.cxx → src/input/plugins/RewindInputPlugin.cxx
View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "RewindInputPlugin.hxx" #include "RewindInputPlugin.hxx"
#include "InputStream.hxx" #include "../InputStream.hxx"
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>

0
src/input/RewindInputPlugin.hxx → src/input/plugins/RewindInputPlugin.hxx
View File

4
src/input/SmbclientInputPlugin.cxx → src/input/plugins/SmbclientInputPlugin.cxx
View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "SmbclientInputPlugin.hxx" #include "SmbclientInputPlugin.hxx"
#include "InputStream.hxx" #include "../InputStream.hxx"
#include "InputPlugin.hxx" #include "../InputPlugin.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

0
src/input/SmbclientInputPlugin.hxx → src/input/plugins/SmbclientInputPlugin.hxx
View File

2
src/playlist/PlaylistAny.cxx
View File

@ -23,7 +23,7 @@
#include "PlaylistRegistry.hxx" #include "PlaylistRegistry.hxx"
#include "util/UriUtil.hxx" #include "util/UriUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <assert.h>

2
src/playlist/PlaylistQueue.cxx
View File

@ -22,7 +22,7 @@
#include "PlaylistAny.hxx" #include "PlaylistAny.hxx"
#include "PlaylistSong.hxx" #include "PlaylistSong.hxx"
#include "Playlist.hxx" #include "Playlist.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "SongEnumerator.hxx" #include "SongEnumerator.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"

2
src/playlist/PlaylistRegistry.cxx
View File

@ -30,7 +30,7 @@
#include "plugins/RssPlaylistPlugin.hxx" #include "plugins/RssPlaylistPlugin.hxx"
#include "plugins/CuePlaylistPlugin.hxx" #include "plugins/CuePlaylistPlugin.hxx"
#include "plugins/EmbeddedCuePlaylistPlugin.hxx" #include "plugins/EmbeddedCuePlaylistPlugin.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "util/UriUtil.hxx" #include "util/UriUtil.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/playlist/Print.cxx
View File

@ -23,7 +23,7 @@
#include "PlaylistSong.hxx" #include "PlaylistSong.hxx"
#include "SongEnumerator.hxx" #include "SongEnumerator.hxx"
#include "SongPrint.hxx" #include "SongPrint.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"

2
src/playlist/plugins/CuePlaylistPlugin.cxx
View File

@ -22,7 +22,7 @@
#include "../PlaylistPlugin.hxx" #include "../PlaylistPlugin.hxx"
#include "../SongEnumerator.hxx" #include "../SongEnumerator.hxx"
#include "cue/CueParser.hxx" #include "cue/CueParser.hxx"
#include "TextInputStream.hxx" #include "input/TextInputStream.hxx"
#include <string> #include <string>

2
src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
View File

@ -25,7 +25,7 @@
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "tag/TagBuilder.hxx" #include "tag/TagBuilder.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "TextInputStream.hxx" #include "input/TextInputStream.hxx"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

2
src/playlist/plugins/M3uPlaylistPlugin.cxx
View File

@ -23,7 +23,7 @@
#include "../SongEnumerator.hxx" #include "../SongEnumerator.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "TextInputStream.hxx" #include "input/TextInputStream.hxx"
class M3uPlaylist final : public SongEnumerator { class M3uPlaylist final : public SongEnumerator {
TextInputStream tis; TextInputStream tis;

2
src/playlist/plugins/PlsPlaylistPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "PlsPlaylistPlugin.hxx" #include "PlsPlaylistPlugin.hxx"
#include "../PlaylistPlugin.hxx" #include "../PlaylistPlugin.hxx"
#include "../MemorySongEnumerator.hxx" #include "../MemorySongEnumerator.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "tag/TagBuilder.hxx" #include "tag/TagBuilder.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
View File

@ -22,7 +22,7 @@
#include "../PlaylistPlugin.hxx" #include "../PlaylistPlugin.hxx"
#include "../MemorySongEnumerator.hxx" #include "../MemorySongEnumerator.hxx"
#include "config/ConfigData.hxx" #include "config/ConfigData.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "tag/TagBuilder.hxx" #include "tag/TagBuilder.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/playlist/plugins/XspfPlaylistPlugin.cxx
View File

@ -22,7 +22,7 @@
#include "../PlaylistPlugin.hxx" #include "../PlaylistPlugin.hxx"
#include "../MemorySongEnumerator.hxx" #include "../MemorySongEnumerator.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "tag/TagBuilder.hxx" #include "tag/TagBuilder.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

2
test/DumpDatabase.cxx
View File

@ -42,7 +42,7 @@ using std::endl;
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_LIBUPNP #ifdef HAVE_LIBUPNP
#include "InputStream.hxx" #include "input/InputStream.hxx"
size_t size_t
InputStream::LockRead(void *, size_t, Error &) InputStream::LockRead(void *, size_t, Error &)
{ {

2
test/FakeDecoderAPI.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "decoder/DecoderAPI.hxx" #include "decoder/DecoderAPI.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Compiler.h" #include "Compiler.h"

6
test/dump_playlist.cxx
View File

@ -21,10 +21,10 @@
#include "TagSave.hxx" #include "TagSave.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "playlist/SongEnumerator.hxx" #include "playlist/SongEnumerator.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "decoder/DecoderList.hxx" #include "decoder/DecoderList.hxx"
#include "InputInit.hxx" #include "input/Init.hxx"
#include "IOThread.hxx" #include "IOThread.hxx"
#include "playlist/PlaylistRegistry.hxx" #include "playlist/PlaylistRegistry.hxx"
#include "playlist/PlaylistPlugin.hxx" #include "playlist/PlaylistPlugin.hxx"
@ -93,7 +93,7 @@ int main(int argc, char **argv)
LogError(error); LogError(error);
else else
fprintf(stderr, fprintf(stderr,
"InputStream::Open() failed\n"); "input/InputStream::Open() failed\n");
return 2; return 2;
} }

6
test/dump_text_file.cxx
View File

@ -19,11 +19,11 @@
#include "config.h" #include "config.h"
#include "IOThread.hxx" #include "IOThread.hxx"
#include "InputInit.hxx" #include "input/Init.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "input/TextInputStream.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "stdbin.h" #include "stdbin.h"
#include "TextInputStream.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include "Log.hxx" #include "Log.hxx"

4
test/read_tags.cxx
View File

@ -21,8 +21,8 @@
#include "IOThread.hxx" #include "IOThread.hxx"
#include "decoder/DecoderList.hxx" #include "decoder/DecoderList.hxx"
#include "decoder/DecoderPlugin.hxx" #include "decoder/DecoderPlugin.hxx"
#include "InputInit.hxx" #include "input/Init.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "tag/TagHandler.hxx" #include "tag/TagHandler.hxx"
#include "tag/TagId3.hxx" #include "tag/TagId3.hxx"

6
test/run_decoder.cxx
View File

@ -21,8 +21,8 @@
#include "IOThread.hxx" #include "IOThread.hxx"
#include "decoder/DecoderList.hxx" #include "decoder/DecoderList.hxx"
#include "decoder/DecoderAPI.hxx" #include "decoder/DecoderAPI.hxx"
#include "InputInit.hxx" #include "input/Init.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
@ -222,7 +222,7 @@ int main(int argc, char **argv)
if (error.IsDefined()) if (error.IsDefined())
LogError(error); LogError(error);
else else
fprintf(stderr, "InputStream::Open() failed\n"); fprintf(stderr, "input/InputStream::Open() failed\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }

4
test/run_input.cxx
View File

@ -22,8 +22,8 @@
#include "stdbin.h" #include "stdbin.h"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "InputStream.hxx" #include "input/InputStream.hxx"
#include "InputInit.hxx" #include "input/Init.hxx"
#include "IOThread.hxx" #include "IOThread.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"

2
test/visit_archive.cxx
View File

@ -22,7 +22,7 @@
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "IOThread.hxx" #include "IOThread.hxx"
#include "InputInit.hxx" #include "input/Init.hxx"
#include "archive/ArchiveList.hxx" #include "archive/ArchiveList.hxx"
#include "archive/ArchivePlugin.hxx" #include "archive/ArchivePlugin.hxx"
#include "archive/ArchiveFile.hxx" #include "archive/ArchiveFile.hxx"