From f8bfea8bae44134e8002db869fd4ec137d1c0d6e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 24 Jan 2014 16:18:21 +0100 Subject: Input*: move to input/ --- test/DumpDatabase.cxx | 2 +- test/FakeDecoderAPI.cxx | 2 +- test/dump_playlist.cxx | 6 +++--- test/dump_text_file.cxx | 6 +++--- test/read_tags.cxx | 4 ++-- test/run_decoder.cxx | 6 +++--- test/run_input.cxx | 4 ++-- test/visit_archive.cxx | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'test') 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 #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" -- cgit v1.2.3