db/simple: create dedicated directory

27 files changed, 44 insertions, 41 deletions

diff --git a/Makefile.am b/Makefile.am
index aa52c68ef..698c0b632 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,8 +196,6 @@ libmpd_a_SOURCES += \
 	src/command/DatabaseCommands.cxx src/command/DatabaseCommands.hxx \
 	src/db/LightSong.cxx src/db/LightSong.hxx \
 	src/db/LightDirectory.hxx \
-	src/db/Song.cxx src/db/Song.hxx \
-	src/db/SongSort.cxx src/db/SongSort.hxx \
 	src/db/update/UpdateDomain.cxx src/db/update/UpdateDomain.hxx \
 	src/db/update/Service.cxx src/db/update/Service.hxx \
 	src/db/update/UpdateGlue.cxx \
@@ -210,7 +208,6 @@ libmpd_a_SOURCES += \
 	src/db/update/Remove.cxx src/db/update/Remove.hxx \
 	src/db/update/ExcludeList.cxx src/db/update/ExcludeList.hxx \
 	src/db/Uri.hxx \
-	src/db/Directory.cxx src/db/Directory.hxx \
 	src/db/DatabaseGlue.cxx src/db/DatabaseGlue.hxx \
 	src/db/Configured.cxx src/db/Configured.hxx \
 	src/db/DatabaseSong.cxx src/db/DatabaseSong.hxx \
@@ -572,10 +569,19 @@ libdb_plugins_a_SOURCES = \
 	src/PlaylistDatabase.cxx src/PlaylistDatabase.hxx \
 	src/db/Registry.cxx src/db/Registry.hxx \
 	src/db/Helpers.cxx src/db/Helpers.hxx \
-	src/db/DatabaseSave.cxx src/db/DatabaseSave.hxx \
-	src/db/DirectorySave.cxx src/db/DirectorySave.hxx \
+	src/db/plugins/simple/DatabaseSave.cxx \
+	src/db/plugins/simple/DatabaseSave.hxx \
+	src/db/plugins/simple/DirectorySave.cxx \
+	src/db/plugins/simple/DirectorySave.hxx \
 	src/db/plugins/LazyDatabase.cxx src/db/plugins/LazyDatabase.hxx \
-	src/db/plugins/SimpleDatabasePlugin.cxx src/db/plugins/SimpleDatabasePlugin.hxx
+	src/db/plugins/simple/Directory.cxx \
+	src/db/plugins/simple/Directory.hxx \
+	src/db/plugins/simple/Song.cxx \
+	src/db/plugins/simple/Song.hxx \
+	src/db/plugins/simple/SongSort.cxx \
+	src/db/plugins/simple/SongSort.hxx \
+	src/db/plugins/simple/SimpleDatabasePlugin.cxx \
+	src/db/plugins/simple/SimpleDatabasePlugin.hxx
 
 if HAVE_LIBMPDCLIENT
 libdb_plugins_a_SOURCES += \
@@ -1444,10 +1450,9 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
 	src/db/DatabaseError.cxx \
 	src/db/Registry.cxx \
 	src/db/Selection.cxx \
-	src/db/Directory.cxx \
 	src/db/PlaylistVector.cxx \
 	src/db/DatabaseLock.cxx \
-	src/db/Song.cxx src/SongSave.cxx src/db/SongSort.cxx \
+	src/SongSave.cxx \
 	src/DetachedSong.cxx \
 	src/TagSave.cxx \
 	src/SongFilter.cxx
diff --git a/src/Main.cxx b/src/Main.cxx
index 4c7c6d97c..4b161fd6b 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -69,7 +69,7 @@
 #include "db/update/Service.hxx"
 #include "db/Configured.hxx"
 #include "db/DatabasePlugin.hxx"
-#include "db/plugins/SimpleDatabasePlugin.hxx"
+#include "db/plugins/simple/SimpleDatabasePlugin.hxx"
 #include "storage/Configured.hxx"
 #include "storage/CompositeStorage.hxx"
 #ifdef ENABLE_INOTIFY
diff --git a/src/SongFilter.cxx b/src/SongFilter.cxx
index 03ff3991e..7bd0857c2 100644
--- a/src/SongFilter.cxx
+++ b/src/SongFilter.cxx
@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "SongFilter.hxx"
-#include "db/Song.hxx"
 #include "db/LightSong.hxx"
 #include "DetachedSong.hxx"
 #include "tag/Tag.hxx"
diff --git a/src/SongSave.cxx b/src/SongSave.cxx
index d53e5bb62..d6c1dbdd7 100644
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "SongSave.hxx"
-#include "db/Song.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "DetachedSong.hxx"
 #include "TagSave.hxx"
 #include "fs/TextFile.hxx"
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index 9c74618e5..0245b9117 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -19,8 +19,8 @@
 
 #include "config.h" /* must be first for large file support */
 #include "DetachedSong.hxx"
-#include "db/Song.hxx"
-#include "db/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
+#include "db/plugins/simple/Directory.hxx"
 #include "storage/StorageInterface.hxx"
 #include "storage/FileInfo.hxx"
 #include "util/UriUtil.hxx"
diff --git a/src/db/PlaylistVector.hxx b/src/db/PlaylistVector.hxx
index 8820ead5c..accd4fd42 100644
--- a/src/db/PlaylistVector.hxx
+++ b/src/db/PlaylistVector.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_PLAYLIST_VECTOR_HXX
 #define MPD_PLAYLIST_VECTOR_HXX
 
-#include "PlaylistInfo.hxx"
+#include "db/PlaylistInfo.hxx"
 #include "Compiler.h"
 
 #include <list>
diff --git a/src/db/Registry.cxx b/src/db/Registry.cxx
index 6b6df9cf7..5681a9b82 100644
--- a/src/db/Registry.cxx
+++ b/src/db/Registry.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Registry.hxx"
 #include "DatabasePlugin.hxx"
-#include "plugins/SimpleDatabasePlugin.hxx"
+#include "plugins/simple/SimpleDatabasePlugin.hxx"
 #include "plugins/ProxyDatabasePlugin.hxx"
 #include "plugins/upnp/UpnpDatabasePlugin.hxx"
 
diff --git a/src/db/DatabaseSave.cxx b/src/db/plugins/simple/DatabaseSave.cxx
index 7ae5dc334..62034a0b8 100644
--- a/src/db/DatabaseSave.cxx
+++ b/src/db/plugins/simple/DatabaseSave.cxx
@@ -19,8 +19,8 @@
 
 #include "config.h"
 #include "DatabaseSave.hxx"
-#include "DatabaseLock.hxx"
-#include "DatabaseError.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/DatabaseError.hxx"
 #include "Directory.hxx"
 #include "DirectorySave.hxx"
 #include "fs/TextFile.hxx"
diff --git a/src/db/DatabaseSave.hxx b/src/db/plugins/simple/DatabaseSave.hxx
index 3bd3377ae..3bd3377ae 100644
--- a/src/db/DatabaseSave.hxx
+++ b/src/db/plugins/simple/DatabaseSave.hxx
diff --git a/src/db/Directory.cxx b/src/db/plugins/simple/Directory.cxx
index 1da19be98..98262bc52 100644
--- a/src/db/Directory.cxx
+++ b/src/db/plugins/simple/Directory.cxx
@@ -19,14 +19,13 @@
 
 #include "config.h"
 #include "Directory.hxx"
-#include "LightDirectory.hxx"
-#include "Uri.hxx"
-#include "SongFilter.hxx"
-#include "PlaylistVector.hxx"
-#include "db/DatabaseLock.hxx"
 #include "SongSort.hxx"
 #include "Song.hxx"
-#include "LightSong.hxx"
+#include "db/LightDirectory.hxx"
+#include "db/LightSong.hxx"
+#include "db/Uri.hxx"
+#include "db/DatabaseLock.hxx"
+#include "SongFilter.hxx"
 #include "lib/icu/Collate.hxx"
 #include "fs/Traits.hxx"
 #include "util/Alloc.hxx"
diff --git a/src/db/Directory.hxx b/src/db/plugins/simple/Directory.hxx
index 391ca2db4..6c60b7ebf 100644
--- a/src/db/Directory.hxx
+++ b/src/db/plugins/simple/Directory.hxx
@@ -24,7 +24,7 @@
 #include "util/list.h"
 #include "Compiler.h"
 #include "db/Visitor.hxx"
-#include "PlaylistVector.hxx"
+#include "db/PlaylistVector.hxx"
 
 #include <string>
 
diff --git a/src/db/DirectorySave.cxx b/src/db/plugins/simple/DirectorySave.cxx
index 6cc5df6cb..6cc5df6cb 100644
--- a/src/db/DirectorySave.cxx
+++ b/src/db/plugins/simple/DirectorySave.cxx
diff --git a/src/db/DirectorySave.hxx b/src/db/plugins/simple/DirectorySave.hxx
index 07e9e158b..07e9e158b 100644
--- a/src/db/DirectorySave.hxx
+++ b/src/db/plugins/simple/DirectorySave.hxx
diff --git a/src/db/plugins/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
index ceb191818..9911caa66 100644
--- a/src/db/plugins/SimpleDatabasePlugin.cxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
@@ -23,10 +23,10 @@
 #include "db/Selection.hxx"
 #include "db/Helpers.hxx"
 #include "db/LightDirectory.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
+#include "Directory.hxx"
+#include "Song.hxx"
 #include "SongFilter.hxx"
-#include "db/DatabaseSave.hxx"
+#include "DatabaseSave.hxx"
 #include "db/DatabaseLock.hxx"
 #include "db/DatabaseError.hxx"
 #include "fs/TextFile.hxx"
diff --git a/src/db/plugins/SimpleDatabasePlugin.hxx b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
index 40d870460..40d870460 100644
--- a/src/db/plugins/SimpleDatabasePlugin.hxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
diff --git a/src/db/Song.cxx b/src/db/plugins/simple/Song.cxx
index 1c3fa0b64..3bd3d8316 100644
--- a/src/db/Song.cxx
+++ b/src/db/plugins/simple/Song.cxx
@@ -23,7 +23,7 @@
 #include "tag/Tag.hxx"
 #include "util/VarSize.hxx"
 #include "DetachedSong.hxx"
-#include "LightSong.hxx"
+#include "db/LightSong.hxx"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/db/Song.hxx b/src/db/plugins/simple/Song.hxx
index 75fce20e9..75fce20e9 100644
--- a/src/db/Song.hxx
+++ b/src/db/plugins/simple/Song.hxx
diff --git a/src/db/SongSort.cxx b/src/db/plugins/simple/SongSort.cxx
index c5752f568..c5752f568 100644
--- a/src/db/SongSort.cxx
+++ b/src/db/plugins/simple/SongSort.cxx
diff --git a/src/db/SongSort.hxx b/src/db/plugins/simple/SongSort.hxx
index 28b903532..28b903532 100644
--- a/src/db/SongSort.hxx
+++ b/src/db/plugins/simple/SongSort.hxx
diff --git a/src/db/update/Archive.cxx b/src/db/update/Archive.cxx
index 54f27a30e..fc8f1fcbf 100644
--- a/src/db/update/Archive.cxx
+++ b/src/db/update/Archive.cxx
@@ -21,8 +21,8 @@
 #include "Walk.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseLock.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "storage/StorageInterface.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "storage/FileInfo.hxx"
diff --git a/src/db/update/Container.cxx b/src/db/update/Container.cxx
index aedcf42ac..9f8d84839 100644
--- a/src/db/update/Container.cxx
+++ b/src/db/update/Container.cxx
@@ -21,8 +21,8 @@
 #include "Walk.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseLock.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "storage/StorageInterface.hxx"
 #include "decoder/DecoderPlugin.hxx"
 #include "decoder/DecoderList.hxx"
diff --git a/src/db/update/Editor.cxx b/src/db/update/Editor.cxx
index c8f58931f..c3c1a23d6 100644
--- a/src/db/update/Editor.cxx
+++ b/src/db/update/Editor.cxx
@@ -21,9 +21,9 @@
 #include "Editor.hxx"
 #include "Remove.hxx"
 #include "db/PlaylistVector.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
 #include "db/DatabaseLock.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
 
 #include <assert.h>
 #include <stddef.h>
diff --git a/src/db/update/Remove.cxx b/src/db/update/Remove.cxx
index 102347905..dfada05b2 100644
--- a/src/db/update/Remove.cxx
+++ b/src/db/update/Remove.cxx
@@ -20,7 +20,7 @@
 #include "config.h" /* must be first for large file support */
 #include "Remove.hxx"
 #include "UpdateDomain.hxx"
-#include "db/Song.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "db/LightSong.hxx"
 #include "db/DatabaseListener.hxx"
 #include "Log.hxx"
diff --git a/src/db/update/UpdateGlue.cxx b/src/db/update/UpdateGlue.cxx
index c1d563ffd..df0e87144 100644
--- a/src/db/update/UpdateGlue.cxx
+++ b/src/db/update/UpdateGlue.cxx
@@ -21,7 +21,7 @@
 #include "Service.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseListener.hxx"
-#include "db/plugins/SimpleDatabasePlugin.hxx"
+#include "db/plugins/simple/SimpleDatabasePlugin.hxx"
 #include "Idle.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
diff --git a/src/db/update/UpdateIO.cxx b/src/db/update/UpdateIO.cxx
index 73295cb02..fa19a8b5a 100644
--- a/src/db/update/UpdateIO.cxx
+++ b/src/db/update/UpdateIO.cxx
@@ -20,7 +20,7 @@
 #include "config.h" /* must be first for large file support */
 #include "UpdateIO.hxx"
 #include "UpdateDomain.hxx"
-#include "db/Directory.hxx"
+#include "db/plugins/simple/Directory.hxx"
 #include "storage/FileInfo.hxx"
 #include "storage/StorageInterface.hxx"
 #include "fs/Traits.hxx"
diff --git a/src/db/update/UpdateSong.cxx b/src/db/update/UpdateSong.cxx
index 804aea952..6b24276fd 100644
--- a/src/db/update/UpdateSong.cxx
+++ b/src/db/update/UpdateSong.cxx
@@ -22,8 +22,8 @@
 #include "UpdateIO.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseLock.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "decoder/DecoderList.hxx"
 #include "storage/FileInfo.hxx"
 #include "Log.hxx"
diff --git a/src/db/update/Walk.cxx b/src/db/update/Walk.cxx
index 2cb360bf6..c65480873 100644
--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -23,10 +23,10 @@
 #include "Editor.hxx"
 #include "UpdateDomain.hxx"
 #include "db/DatabaseLock.hxx"
-#include "db/Directory.hxx"
-#include "db/Song.hxx"
 #include "db/PlaylistVector.hxx"
 #include "db/Uri.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
 #include "storage/StorageInterface.hxx"
 #include "playlist/PlaylistRegistry.hxx"
 #include "ExcludeList.hxx"