aboutsummaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-01-24 16:18:21 +0100
committerMax Kellermann <max@duempel.org>2014-01-24 16:33:33 +0100
commitf8bfea8bae44134e8002db869fd4ec137d1c0d6e (patch)
treed370391baccbbc4c23306656aec3751a7ffc95ae /src/input
parente199c33c6e9eb2f1aa588073f49f44de274985d5 (diff)
downloadmpd-f8bfea8bae44134e8002db869fd4ec137d1c0d6e.tar.gz
mpd-f8bfea8bae44134e8002db869fd4ec137d1c0d6e.tar.xz
mpd-f8bfea8bae44134e8002db869fd4ec137d1c0d6e.zip
Input*: move to input/
Diffstat (limited to '')
-rw-r--r--src/input/Init.cxx (renamed from src/InputInit.cxx)4
-rw-r--r--src/input/Init.hxx (renamed from src/InputInit.hxx)0
-rw-r--r--src/input/InputPlugin.hxx (renamed from src/InputPlugin.hxx)0
-rw-r--r--src/input/InputStream.cxx (renamed from src/InputStream.cxx)4
-rw-r--r--src/input/InputStream.hxx (renamed from src/InputStream.hxx)0
-rw-r--r--src/input/Registry.cxx (renamed from src/InputRegistry.cxx)20
-rw-r--r--src/input/Registry.hxx (renamed from src/InputRegistry.hxx)0
-rw-r--r--src/input/TextInputStream.cxx (renamed from src/TextInputStream.cxx)0
-rw-r--r--src/input/TextInputStream.hxx (renamed from src/TextInputStream.hxx)0
-rw-r--r--src/input/plugins/AlsaInputPlugin.cxx (renamed from src/input/AlsaInputPlugin.cxx)4
-rw-r--r--src/input/plugins/AlsaInputPlugin.hxx (renamed from src/input/AlsaInputPlugin.hxx)2
-rw-r--r--src/input/plugins/ArchiveInputPlugin.cxx (renamed from src/input/ArchiveInputPlugin.cxx)2
-rw-r--r--src/input/plugins/ArchiveInputPlugin.hxx (renamed from src/input/ArchiveInputPlugin.hxx)0
-rw-r--r--src/input/plugins/CdioParanoiaInputPlugin.cxx (renamed from src/input/CdioParanoiaInputPlugin.cxx)4
-rw-r--r--src/input/plugins/CdioParanoiaInputPlugin.hxx (renamed from src/input/CdioParanoiaInputPlugin.hxx)0
-rw-r--r--src/input/plugins/CurlInputPlugin.cxx (renamed from src/input/CurlInputPlugin.cxx)4
-rw-r--r--src/input/plugins/CurlInputPlugin.hxx (renamed from src/input/CurlInputPlugin.hxx)0
-rw-r--r--src/input/plugins/DespotifyInputPlugin.cxx (renamed from src/input/DespotifyInputPlugin.cxx)4
-rw-r--r--src/input/plugins/DespotifyInputPlugin.hxx (renamed from src/input/DespotifyInputPlugin.hxx)0
-rw-r--r--src/input/plugins/FfmpegInputPlugin.cxx (renamed from src/input/FfmpegInputPlugin.cxx)4
-rw-r--r--src/input/plugins/FfmpegInputPlugin.hxx (renamed from src/input/FfmpegInputPlugin.hxx)0
-rw-r--r--src/input/plugins/FileInputPlugin.cxx (renamed from src/input/FileInputPlugin.cxx)4
-rw-r--r--src/input/plugins/FileInputPlugin.hxx (renamed from src/input/FileInputPlugin.hxx)0
-rw-r--r--src/input/plugins/MmsInputPlugin.cxx (renamed from src/input/MmsInputPlugin.cxx)4
-rw-r--r--src/input/plugins/MmsInputPlugin.hxx (renamed from src/input/MmsInputPlugin.hxx)0
-rw-r--r--src/input/plugins/RewindInputPlugin.cxx (renamed from src/input/RewindInputPlugin.cxx)4
-rw-r--r--src/input/plugins/RewindInputPlugin.hxx (renamed from src/input/RewindInputPlugin.hxx)0
-rw-r--r--src/input/plugins/SmbclientInputPlugin.cxx (renamed from src/input/SmbclientInputPlugin.cxx)4
-rw-r--r--src/input/plugins/SmbclientInputPlugin.hxx (renamed from src/input/SmbclientInputPlugin.hxx)0
29 files changed, 34 insertions, 34 deletions
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