Database*: move to db/

Makefile.am

@@ -102,36 +102,36 @@ src_mpd_SOURCES = \
 	src/decoder/DecoderPlugin.hxx \
 	src/decoder/DecoderInternal.cxx src/decoder/DecoderInternal.hxx \
 	src/decoder/DecoderPrint.cxx src/decoder/DecoderPrint.hxx \
-	src/Directory.cxx src/Directory.hxx \
-	src/DirectorySave.cxx src/DirectorySave.hxx \
-	src/DatabaseSimple.hxx \
-	src/DatabaseGlue.cxx src/DatabaseGlue.hxx \
-	src/DatabaseSong.cxx src/DatabaseSong.hxx \
-	src/DatabasePrint.cxx src/DatabasePrint.hxx \
-	src/DatabaseQueue.cxx src/DatabaseQueue.hxx \
-	src/DatabasePlaylist.cxx src/DatabasePlaylist.hxx \
-	src/DatabaseError.cxx src/DatabaseError.hxx \
-	src/DatabaseLock.cxx src/DatabaseLock.hxx \
-	src/DatabaseSave.cxx src/DatabaseSave.hxx \
-	src/DatabasePlugin.hxx \
-	src/DatabaseListener.hxx \
-	src/DatabaseVisitor.hxx \
-	src/DatabaseSelection.cxx src/DatabaseSelection.hxx \
+	src/db/Directory.cxx src/db/Directory.hxx \
+	src/db/DirectorySave.cxx src/db/DirectorySave.hxx \
+	src/db/DatabaseSimple.hxx \
+	src/db/DatabaseGlue.cxx src/db/DatabaseGlue.hxx \
+	src/db/DatabaseSong.cxx src/db/DatabaseSong.hxx \
+	src/db/DatabasePrint.cxx src/db/DatabasePrint.hxx \
+	src/db/DatabaseQueue.cxx src/db/DatabaseQueue.hxx \
+	src/db/DatabasePlaylist.cxx src/db/DatabasePlaylist.hxx \
+	src/db/DatabaseError.cxx src/db/DatabaseError.hxx \
+	src/db/DatabaseLock.cxx src/db/DatabaseLock.hxx \
+	src/db/DatabaseSave.cxx src/db/DatabaseSave.hxx \
+	src/db/DatabasePlugin.hxx \
+	src/db/DatabaseListener.hxx \
+	src/db/Visitor.hxx \
+	src/db/Selection.cxx src/db/Selection.hxx \
 	src/ExcludeList.cxx src/ExcludeList.hxx \
 	src/FilterConfig.cxx src/FilterConfig.hxx \
 	src/FilterPlugin.cxx src/FilterPlugin.hxx \
 	src/FilterInternal.hxx \
 	src/FilterRegistry.cxx src/FilterRegistry.hxx \
-	src/update/UpdateDomain.cxx src/update/UpdateDomain.hxx \
-	src/update/UpdateGlue.cxx src/update/UpdateGlue.hxx \
-	src/update/UpdateQueue.cxx src/update/UpdateQueue.hxx \
-	src/update/UpdateIO.cxx src/update/UpdateIO.hxx \
-	src/update/UpdateDatabase.cxx src/update/UpdateDatabase.hxx \
-	src/update/UpdateWalk.cxx src/update/UpdateWalk.hxx \
-	src/update/UpdateSong.cxx src/update/UpdateSong.hxx \
-	src/update/UpdateContainer.cxx src/update/UpdateContainer.hxx \
-	src/update/UpdateInternal.hxx \
-	src/update/UpdateRemove.cxx src/update/UpdateRemove.hxx \
+	src/db/update/UpdateDomain.cxx src/db/update/UpdateDomain.hxx \
+	src/db/update/UpdateGlue.cxx src/db/update/UpdateGlue.hxx \
+	src/db/update/UpdateQueue.cxx src/db/update/UpdateQueue.hxx \
+	src/db/update/UpdateIO.cxx src/db/update/UpdateIO.hxx \
+	src/db/update/UpdateDatabase.cxx src/db/update/UpdateDatabase.hxx \
+	src/db/update/UpdateWalk.cxx src/db/update/UpdateWalk.hxx \
+	src/db/update/UpdateSong.cxx src/db/update/UpdateSong.hxx \
+	src/db/update/UpdateContainer.cxx src/db/update/UpdateContainer.hxx \
+	src/db/update/UpdateInternal.hxx \
+	src/db/update/UpdateRemove.cxx src/db/update/UpdateRemove.hxx \
 	src/client/Client.cxx src/client/Client.hxx \
 	src/client/ClientInternal.hxx \
 	src/client/ClientEvent.cxx \
@@ -196,13 +196,13 @@ src_mpd_SOURCES = \
 	src/ReplayGainConfig.cxx src/ReplayGainConfig.hxx \
 	src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx \
 	src/DetachedSong.cxx src/DetachedSong.hxx \
-	src/LightSong.cxx src/LightSong.hxx \
-	src/LightDirectory.hxx \
-	src/Song.cxx src/Song.hxx \
+	src/db/LightSong.cxx src/db/LightSong.hxx \
+	src/db/LightDirectory.hxx \
+	src/db/Song.cxx src/db/Song.hxx \
 	src/SongUpdate.cxx \
 	src/SongPrint.cxx src/SongPrint.hxx \
 	src/SongSave.cxx src/SongSave.hxx \
-	src/SongSort.cxx src/SongSort.hxx \
+	src/db/SongSort.cxx src/db/SongSort.hxx \
 	src/StateFile.cxx src/StateFile.hxx \
 	src/Stats.cxx src/Stats.hxx \
 	src/TagPrint.cxx src/TagPrint.hxx \
@@ -235,10 +235,10 @@ endif
 
 if ENABLE_INOTIFY
 src_mpd_SOURCES += \
-	src/update/InotifyDomain.cxx src/update/InotifyDomain.hxx \
-	src/update/InotifySource.cxx src/update/InotifySource.hxx \
-	src/update/InotifyQueue.cxx src/update/InotifyQueue.hxx \
-	src/update/InotifyUpdate.cxx src/update/InotifyUpdate.hxx
+	src/db/update/InotifyDomain.cxx src/db/update/InotifyDomain.hxx \
+	src/db/update/InotifySource.cxx src/db/update/InotifySource.hxx \
+	src/db/update/InotifyQueue.cxx src/db/update/InotifyQueue.hxx \
+	src/db/update/InotifyUpdate.cxx src/db/update/InotifyUpdate.hxx
 endif
 
 if ENABLE_SQLITE
@@ -400,14 +400,14 @@ libfs_a_SOURCES = \
 # database plugins
 
 libdb_plugins_a_SOURCES = \
-	src/DatabaseRegistry.cxx src/DatabaseRegistry.hxx \
-	src/DatabaseHelpers.cxx src/DatabaseHelpers.hxx \
-	src/db/LazyDatabase.cxx src/db/LazyDatabase.hxx \
-	src/db/SimpleDatabasePlugin.cxx src/db/SimpleDatabasePlugin.hxx
+	src/db/Registry.cxx src/db/Registry.hxx \
+	src/db/Helpers.cxx src/db/Helpers.hxx \
+	src/db/plugins/LazyDatabase.cxx src/db/plugins/LazyDatabase.hxx \
+	src/db/plugins/SimpleDatabasePlugin.cxx src/db/plugins/SimpleDatabasePlugin.hxx
 
 if HAVE_LIBMPDCLIENT
 libdb_plugins_a_SOURCES += \
-	src/db/ProxyDatabasePlugin.cxx src/db/ProxyDatabasePlugin.hxx
+	src/db/plugins/ProxyDatabasePlugin.cxx src/db/plugins/ProxyDatabasePlugin.hxx
 endif
 
 DB_LIBS = \
@@ -416,19 +416,19 @@ DB_LIBS = \
 
 if HAVE_LIBUPNP
 libdb_plugins_a_SOURCES += \
-	src/db/UpnpDatabasePlugin.cxx src/db/UpnpDatabasePlugin.hxx \
-	src/db/upnp/Tags.cxx src/db/upnp/Tags.hxx \
-	src/db/upnp/ContentDirectoryService.cxx src/db/upnp/ContentDirectoryService.hxx \
-	src/db/upnp/Device.cxx src/db/upnp/Device.hxx \
-	src/db/upnp/Directory.cxx src/db/upnp/Directory.hxx \
-	src/db/upnp/Discovery.cxx src/db/upnp/Discovery.hxx \
-	src/db/upnp/Domain.cxx src/db/upnp/Domain.hxx \
-	src/db/upnp/ixmlwrap.cxx src/db/upnp/ixmlwrap.hxx \
-	src/db/upnp/upnpplib.cxx src/db/upnp/upnpplib.hxx \
-	src/db/upnp/Util.cxx src/db/upnp/Util.hxx \
-	src/db/upnp/Action.hxx \
-	src/db/upnp/WorkQueue.hxx \
-	src/db/upnp/Object.cxx src/db/upnp/Object.hxx
+	src/db/plugins/UpnpDatabasePlugin.cxx src/db/plugins/UpnpDatabasePlugin.hxx \
+	src/db/plugins/upnp/Tags.cxx src/db/plugins/upnp/Tags.hxx \
+	src/db/plugins/upnp/ContentDirectoryService.cxx src/db/plugins/upnp/ContentDirectoryService.hxx \
+	src/db/plugins/upnp/Device.cxx src/db/plugins/upnp/Device.hxx \
+	src/db/plugins/upnp/Directory.cxx src/db/plugins/upnp/Directory.hxx \
+	src/db/plugins/upnp/Discovery.cxx src/db/plugins/upnp/Discovery.hxx \
+	src/db/plugins/upnp/Domain.cxx src/db/plugins/upnp/Domain.hxx \
+	src/db/plugins/upnp/ixmlwrap.cxx src/db/plugins/upnp/ixmlwrap.hxx \
+	src/db/plugins/upnp/upnpplib.cxx src/db/plugins/upnp/upnpplib.hxx \
+	src/db/plugins/upnp/Util.cxx src/db/plugins/upnp/Util.hxx \
+	src/db/plugins/upnp/Action.hxx \
+	src/db/plugins/upnp/WorkQueue.hxx \
+	src/db/plugins/upnp/Object.cxx src/db/plugins/upnp/Object.hxx
 DB_LIBS += \
 	$(EXPAT_LIBS) \
 	$(UPNP_LIBS)
@@ -441,7 +441,7 @@ if ENABLE_ARCHIVE
 noinst_LIBRARIES += libarchive.a
 
 src_mpd_SOURCES +=  \
-	src/update/UpdateArchive.cxx src/update/UpdateArchive.hxx
+	src/db/update/UpdateArchive.cxx src/db/update/UpdateArchive.hxx
 
 libarchive_a_SOURCES = \
 	src/archive/ArchiveDomain.cxx src/archive/ArchiveDomain.hxx \
@@ -1244,13 +1244,13 @@ test_DumpDatabase_LDADD = \
 test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
 	src/protocol/Ack.cxx \
 	src/Log.cxx src/LogBackend.cxx \
-	src/DatabaseError.cxx \
-	src/DatabaseRegistry.cxx \
-	src/DatabaseSelection.cxx \
-	src/Directory.cxx src/DirectorySave.cxx \
+	src/db/DatabaseError.cxx \
+	src/db/Registry.cxx \
+	src/db/Selection.cxx \
+	src/db/Directory.cxx src/db/DirectorySave.cxx \
 	src/PlaylistVector.cxx src/PlaylistDatabase.cxx \
-	src/DatabaseLock.cxx src/DatabaseSave.cxx \
-	src/Song.cxx src/SongSave.cxx src/SongSort.cxx \
+	src/db/DatabaseLock.cxx src/db/DatabaseSave.cxx \
+	src/db/Song.cxx src/SongSave.cxx src/db/SongSort.cxx \
 	src/DetachedSong.cxx \
 	src/TagSave.cxx \
 	src/SongFilter.cxx
@@ -1581,8 +1581,8 @@ noinst_PROGRAMS += test/run_inotify
 test_run_inotify_SOURCES = test/run_inotify.cxx \
 	test/ShutdownHandler.cxx test/ShutdownHandler.hxx \
 	src/Log.cxx src/LogBackend.cxx \
-	src/update/InotifyDomain.cxx \
-	src/update/InotifySource.cxx
+	src/db/update/InotifyDomain.cxx \
+	src/db/update/InotifySource.cxx
 test_run_inotify_LDADD = \
 	libevent.a \
 	libsystem.a \

src/CommandLine.cxx

@@ -23,8 +23,8 @@
 #include "LogInit.hxx"
 #include "Log.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "DatabaseRegistry.hxx"
-#include "DatabasePlugin.hxx"
+#include "db/Registry.hxx"
+#include "db/DatabasePlugin.hxx"
 #include "decoder/DecoderList.hxx"
 #include "decoder/DecoderPlugin.hxx"
 #include "output/OutputList.hxx"
@@ -99,7 +99,7 @@ static void version(void)
 	     "This is free software; see the source for copying conditions.  There is NO\n"
 	     "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 	     "\n"
-	     "Database plugins:");
+	     "db/Database plugins:");
 
 	for (auto i = database_plugins; *i != nullptr; ++i)
 		printf(" %s", (*i)->name);

src/DetachedSong.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "DetachedSong.hxx"
-#include "LightSong.hxx"
+#include "db/LightSong.hxx"
 #include "util/UriUtil.hxx"
 #include "fs/Traits.hxx"
 

src/Instance.hxx

@@ -21,7 +21,7 @@
 #define MPD_INSTANCE_HXX
 
 #include "check.h"
-#include "DatabaseListener.hxx"
+#include "db/DatabaseListener.hxx"
 #include "Compiler.h"
 
 class ClientList;

src/Main.cxx

@@ -23,13 +23,13 @@
 #include "CommandLine.hxx"
 #include "PlaylistFile.hxx"
 #include "PlaylistGlobal.hxx"
-#include "update/UpdateGlue.hxx"
+#include "db/update/UpdateGlue.hxx"
 #include "MusicChunk.hxx"
 #include "StateFile.hxx"
 #include "PlayerThread.hxx"
 #include "Mapper.hxx"
-#include "DatabaseGlue.hxx"
-#include "DatabaseSimple.hxx"
+#include "db/DatabaseGlue.hxx"
+#include "db/DatabaseSimple.hxx"
 #include "Permission.hxx"
 #include "Listen.hxx"
 #include "client/Client.hxx"
@@ -68,7 +68,7 @@
 #include "Stats.hxx"
 
 #ifdef ENABLE_INOTIFY
-#include "update/InotifyUpdate.hxx"
+#include "db/update/InotifyUpdate.hxx"
 #endif
 
 #ifdef ENABLE_SQLITE

src/Mapper.cxx

@@ -23,10 +23,10 @@
 
 #include "config.h"
 #include "Mapper.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
 #include "DetachedSong.hxx"
-#include "LightSong.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
+#include "db/LightSong.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/Charset.hxx"

src/PlaylistEdit.cxx

@@ -32,7 +32,7 @@
 #include "DetachedSong.hxx"
 #include "Mapper.hxx"
 #include "Idle.hxx"
-#include "DatabaseSong.hxx"
+#include "db/DatabaseSong.hxx"
 #include "Log.hxx"
 
 #include <stdlib.h>

src/PlaylistFile.cxx

@@ -22,7 +22,7 @@
 #include "PlaylistSave.hxx"
 #include "PlaylistInfo.hxx"
 #include "PlaylistVector.hxx"
-#include "DatabaseSong.hxx"
+#include "db/DatabaseSong.hxx"
 #include "DetachedSong.hxx"
 #include "Mapper.hxx"
 #include "fs/TextFile.hxx"

src/PlaylistPrint.cxx

@@ -23,8 +23,8 @@
 #include "Playlist.hxx"
 #include "queue/QueuePrint.hxx"
 #include "SongPrint.hxx"
-#include "DatabaseGlue.hxx"
-#include "DatabasePlugin.hxx"
+#include "db/DatabaseGlue.hxx"
+#include "db/DatabasePlugin.hxx"
 #include "client/Client.hxx"
 #include "input/InputStream.hxx"
 #include "DetachedSong.hxx"

src/PlaylistUpdate.cxx

@@ -19,9 +19,9 @@
 
 #include "config.h"
 #include "Playlist.hxx"
-#include "DatabaseGlue.hxx"
-#include "DatabasePlugin.hxx"
-#include "LightSong.hxx"
+#include "db/DatabaseGlue.hxx"
+#include "db/DatabasePlugin.hxx"
+#include "db/LightSong.hxx"
 #include "DetachedSong.hxx"
 #include "tag/Tag.hxx"
 #include "Idle.hxx"

src/PlaylistVector.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PlaylistVector.hxx"
-#include "DatabaseLock.hxx"
+#include "db/DatabaseLock.hxx"
 
 #include <algorithm>
 

src/SongFilter.cxx

@@ -19,8 +19,8 @@
 
 #include "config.h"
 #include "SongFilter.hxx"
-#include "Song.hxx"
-#include "LightSong.hxx"
+#include "db/Song.hxx"
+#include "db/LightSong.hxx"
 #include "DetachedSong.hxx"
 #include "tag/Tag.hxx"
 #include "util/ASCII.hxx"

src/SongPrint.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "SongPrint.hxx"
-#include "LightSong.hxx"
+#include "db/LightSong.hxx"
 #include "DetachedSong.hxx"
 #include "TimePrint.hxx"
 #include "TagPrint.hxx"

src/SongSave.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "SongSave.hxx"
-#include "Song.hxx"
+#include "db/Song.hxx"
 #include "DetachedSong.hxx"
 #include "TagSave.hxx"
 #include "fs/TextFile.hxx"

src/SongUpdate.cxx

@@ -18,10 +18,10 @@
  */
 
 #include "config.h" /* must be first for large file support */
-#include "Song.hxx"
 #include "DetachedSong.hxx"
+#include "db/Song.hxx"
+#include "db/Directory.hxx"
 #include "util/UriUtil.hxx"
-#include "Directory.hxx"
 #include "Mapper.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"

src/Stats.cxx

@@ -21,10 +21,10 @@
 #include "Stats.hxx"
 #include "PlayerControl.hxx"
 #include "client/Client.hxx"
-#include "DatabaseSelection.hxx"
-#include "DatabaseGlue.hxx"
-#include "DatabasePlugin.hxx"
-#include "DatabaseSimple.hxx"
+#include "db/Selection.hxx"
+#include "db/DatabaseGlue.hxx"
+#include "db/DatabasePlugin.hxx"
+#include "db/DatabaseSimple.hxx"
 #include "util/Error.hxx"
 #include "system/Clock.hxx"
 #include "Log.hxx"

src/command/CommandError.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "CommandError.hxx"
-#include "DatabaseError.hxx"
+#include "db/DatabaseError.hxx"
 #include "protocol/Result.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"

src/command/DatabaseCommands.cxx

@@ -19,10 +19,10 @@
 
 #include "config.h"
 #include "DatabaseCommands.hxx"
-#include "DatabaseQueue.hxx"
-#include "DatabasePlaylist.hxx"
-#include "DatabasePrint.hxx"
-#include "DatabaseSelection.hxx"
+#include "db/DatabaseQueue.hxx"
+#include "db/DatabasePlaylist.hxx"
+#include "db/DatabasePrint.hxx"
+#include "db/Selection.hxx"
 #include "CommandError.hxx"
 #include "client/Client.hxx"
 #include "tag/Tag.hxx"

src/command/OtherCommands.cxx

@@ -20,9 +20,9 @@
 #include "config.h"
 #include "OtherCommands.hxx"
 #include "DatabaseCommands.hxx"
+#include "db/update/UpdateGlue.hxx"
 #include "CommandError.hxx"
-#include "update/UpdateGlue.hxx"
-#include "Directory.hxx"
+#include "db/Directory.hxx"
 #include "DetachedSong.hxx"
 #include "SongPrint.hxx"
 #include "TagPrint.hxx"

src/command/PlayerCommands.cxx

@@ -22,7 +22,7 @@
 #include "CommandError.hxx"
 #include "Playlist.hxx"
 #include "PlaylistPrint.hxx"
-#include "update/UpdateGlue.hxx"
+#include "db/update/UpdateGlue.hxx"
 #include "client/Client.hxx"
 #include "Volume.hxx"
 #include "output/OutputAll.hxx"

src/command/PlaylistCommands.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PlaylistCommands.hxx"
-#include "DatabasePlaylist.hxx"
+#include "db/DatabasePlaylist.hxx"
 #include "CommandError.hxx"
 #include "PlaylistPrint.hxx"
 #include "PlaylistSave.hxx"

src/command/QueueCommands.cxx

@@ -20,9 +20,9 @@
 #include "config.h"
 #include "QueueCommands.hxx"
 #include "CommandError.hxx"
-#include "DatabaseQueue.hxx"
+#include "db/DatabaseQueue.hxx"
 #include "SongFilter.hxx"
-#include "DatabaseSelection.hxx"
+#include "db/Selection.hxx"
 #include "Playlist.hxx"
 #include "PlaylistPrint.hxx"
 #include "client/ClientFile.hxx"

src/command/StickerCommands.cxx

@@ -20,10 +20,10 @@
 #include "config.h"
 #include "StickerCommands.hxx"
 #include "SongPrint.hxx"
-#include "DatabaseLock.hxx"
-#include "DatabasePlugin.hxx"
-#include "DatabaseGlue.hxx"
-#include "DatabaseSimple.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/DatabasePlugin.hxx"
+#include "db/DatabaseGlue.hxx"
+#include "db/DatabaseSimple.hxx"
 #include "sticker/SongSticker.hxx"
 #include "sticker/StickerPrint.hxx"
 #include "sticker/StickerDatabase.hxx"

src/DatabaseGlue.cxx → src/db/DatabaseGlue.cxx

@@ -20,14 +20,14 @@
 #include "config.h"
 #include "DatabaseGlue.hxx"
 #include "DatabaseSimple.hxx"
-#include "DatabaseRegistry.hxx"
+#include "Registry.hxx"
 #include "DatabaseError.hxx"
 #include "Directory.hxx"
 #include "util/Error.hxx"
 #include "config/ConfigData.hxx"
 #include "Stats.hxx"
 #include "DatabasePlugin.hxx"
-#include "db/SimpleDatabasePlugin.hxx"
+#include "plugins/SimpleDatabasePlugin.hxx"
 
 #include <assert.h>
 #include <string.h>

src/DatabasePlaylist.cxx → src/db/DatabasePlaylist.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "DatabasePlaylist.hxx"
-#include "DatabaseSelection.hxx"
+#include "Selection.hxx"
 #include "PlaylistFile.hxx"
 #include "DatabaseGlue.hxx"
 #include "DatabasePlugin.hxx"

src/DatabasePlugin.hxx → src/db/DatabasePlugin.hxx

@@ -26,7 +26,7 @@
 #ifndef MPD_DATABASE_PLUGIN_HXX
 #define MPD_DATABASE_PLUGIN_HXX
 
-#include "DatabaseVisitor.hxx"
+#include "Visitor.hxx"
 #include "tag/TagType.h"
 #include "Compiler.h"
 

src/DatabasePrint.cxx → src/db/DatabasePrint.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "DatabasePrint.hxx"
-#include "DatabaseSelection.hxx"
+#include "Selection.hxx"
 #include "SongFilter.hxx"
 #include "SongPrint.hxx"
 #include "TimePrint.hxx"

src/Directory.cxx → src/db/Directory.cxx

@@ -22,7 +22,7 @@
 #include "LightDirectory.hxx"
 #include "SongFilter.hxx"
 #include "PlaylistVector.hxx"
-#include "DatabaseLock.hxx"
+#include "db/DatabaseLock.hxx"
 #include "SongSort.hxx"
 #include "Song.hxx"
 #include "LightSong.hxx"

src/Directory.hxx → src/db/Directory.hxx

@@ -23,7 +23,7 @@
 #include "check.h"
 #include "util/list.h"
 #include "Compiler.h"
-#include "DatabaseVisitor.hxx"
+#include "db/Visitor.hxx"
 #include "PlaylistVector.hxx"
 
 #include <string>

src/DatabaseHelpers.cxx → src/db/Helpers.cxx

@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "DatabaseHelpers.hxx"
+#include "Helpers.hxx"
 #include "DatabasePlugin.hxx"
 #include "LightSong.hxx"
 #include "tag/Tag.hxx"

src/DatabaseHelpers.hxx → src/db/Helpers.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_MEMORY_DATABASE_PLUGIN_HXX
 #define MPD_MEMORY_DATABASE_PLUGIN_HXX
 
-#include "DatabaseVisitor.hxx"
+#include "Visitor.hxx"
 #include "tag/TagType.h"
 
 class Error;

src/DatabaseRegistry.cxx → src/db/Registry.cxx

@@ -18,10 +18,10 @@
  */
 
 #include "config.h"
-#include "DatabaseRegistry.hxx"
-#include "db/SimpleDatabasePlugin.hxx"
-#include "db/ProxyDatabasePlugin.hxx"
-#include "db/UpnpDatabasePlugin.hxx"
+#include "Registry.hxx"
+#include "plugins/SimpleDatabasePlugin.hxx"
+#include "plugins/ProxyDatabasePlugin.hxx"
+#include "plugins/UpnpDatabasePlugin.hxx"
 
 #include <string.h>
 

src/DatabaseSelection.cxx → src/db/Selection.cxx

@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "DatabaseSelection.hxx"
+#include "Selection.hxx"
 #include "SongFilter.hxx"
 
 DatabaseSelection::DatabaseSelection(const char *_uri, bool _recursive,

src/db/LazyDatabase.hxx → src/db/plugins/LazyDatabase.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_LAZY_DATABASE_PLUGIN_HXX
 #define MPD_LAZY_DATABASE_PLUGIN_HXX
 
-#include "DatabasePlugin.hxx"
+#include "db/DatabasePlugin.hxx"
 
 /**
  * A wrapper for a #Database object that gets opened on the first

src/db/ProxyDatabasePlugin.cxx → src/db/plugins/ProxyDatabasePlugin.cxx

@@ -19,13 +19,13 @@
 
 #include "config.h"
 #include "ProxyDatabasePlugin.hxx"
-#include "DatabasePlugin.hxx"
-#include "DatabaseListener.hxx"
-#include "DatabaseSelection.hxx"
-#include "DatabaseError.hxx"
+#include "db/DatabasePlugin.hxx"
+#include "db/DatabaseListener.hxx"
+#include "db/Selection.hxx"
+#include "db/DatabaseError.hxx"
 #include "PlaylistInfo.hxx"
-#include "LightDirectory.hxx"
-#include "LightSong.hxx"
+#include "db/LightDirectory.hxx"
+#include "db/LightSong.hxx"
 #include "SongFilter.hxx"
 #include "Compiler.h"
 #include "config/ConfigData.hxx"

src/db/SimpleDatabasePlugin.cxx → src/db/plugins/SimpleDatabasePlugin.cxx

@@ -19,15 +19,15 @@
 
 #include "config.h"
 #include "SimpleDatabasePlugin.hxx"
-#include "DatabaseSelection.hxx"
-#include "DatabaseHelpers.hxx"
-#include "LightDirectory.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
+#include "db/Selection.hxx"
+#include "db/Helpers.hxx"
+#include "db/LightDirectory.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
 #include "SongFilter.hxx"
-#include "DatabaseSave.hxx"
-#include "DatabaseLock.hxx"
-#include "DatabaseError.hxx"
+#include "db/DatabaseSave.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/DatabaseError.hxx"
 #include "fs/TextFile.hxx"
 #include "config/ConfigData.hxx"
 #include "fs/FileSystem.hxx"

src/db/SimpleDatabasePlugin.hxx → src/db/plugins/SimpleDatabasePlugin.hxx

@@ -20,9 +20,9 @@
 #ifndef MPD_SIMPLE_DATABASE_PLUGIN_HXX
 #define MPD_SIMPLE_DATABASE_PLUGIN_HXX
 
-#include "DatabasePlugin.hxx"
+#include "db/DatabasePlugin.hxx"
 #include "fs/AllocatedPath.hxx"
-#include "LightSong.hxx"
+#include "db/LightSong.hxx"
 #include "Compiler.h"
 
 #include <cassert>

src/db/UpnpDatabasePlugin.cxx → src/db/plugins/UpnpDatabasePlugin.cxx

@@ -26,11 +26,11 @@
 #include "upnp/Directory.hxx"
 #include "upnp/Tags.hxx"
 #include "upnp/Util.hxx"
-#include "DatabasePlugin.hxx"
-#include "DatabaseSelection.hxx"
-#include "DatabaseError.hxx"
-#include "LightDirectory.hxx"
-#include "LightSong.hxx"
+#include "db/DatabasePlugin.hxx"
+#include "db/Selection.hxx"
+#include "db/DatabaseError.hxx"
+#include "db/LightDirectory.hxx"
+#include "db/LightSong.hxx"
 #include "config/ConfigData.hxx"
 #include "tag/TagBuilder.hxx"
 #include "tag/TagTable.hxx"

src/update/UpdateArchive.cxx → src/db/update/UpdateArchive.cxx

@@ -21,9 +21,9 @@
 #include "UpdateArchive.hxx"
 #include "UpdateInternal.hxx"
 #include "UpdateDomain.hxx"
-#include "DatabaseLock.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
 #include "Mapper.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "archive/ArchiveList.hxx"

src/update/UpdateContainer.cxx → src/db/update/UpdateContainer.cxx

@@ -22,9 +22,9 @@
 #include "UpdateInternal.hxx"
 #include "UpdateDatabase.hxx"
 #include "UpdateDomain.hxx"
-#include "DatabaseLock.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
 #include "decoder/DecoderPlugin.hxx"
 #include "decoder/DecoderList.hxx"
 #include "Mapper.hxx"

src/update/UpdateDatabase.cxx → src/db/update/UpdateDatabase.cxx

@@ -21,9 +21,9 @@
 #include "UpdateDatabase.hxx"
 #include "UpdateRemove.hxx"
 #include "PlaylistVector.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
-#include "DatabaseLock.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
+#include "db/DatabaseLock.hxx"
 
 #include <assert.h>
 #include <stddef.h>

src/update/UpdateGlue.cxx → src/db/update/UpdateGlue.cxx

@@ -24,7 +24,7 @@
 #include "UpdateRemove.hxx"
 #include "UpdateDomain.hxx"
 #include "Mapper.hxx"
-#include "DatabaseSimple.hxx"
+#include "db/DatabaseSimple.hxx"
 #include "Idle.hxx"
 #include "GlobalEvents.hxx"
 #include "util/Error.hxx"

src/update/UpdateIO.cxx → 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 "Directory.hxx"
+#include "db/Directory.hxx"
 #include "Mapper.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"

src/update/UpdateRemove.cxx → src/db/update/UpdateRemove.cxx

@@ -23,8 +23,8 @@
 #include "GlobalEvents.hxx"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
-#include "Song.hxx"
-#include "LightSong.hxx"
+#include "db/Song.hxx"
+#include "db/LightSong.hxx"
 #include "Main.hxx"
 #include "Instance.hxx"
 #include "Log.hxx"

src/update/UpdateSong.cxx → src/db/update/UpdateSong.cxx

@@ -24,9 +24,9 @@
 #include "UpdateDatabase.hxx"
 #include "UpdateContainer.hxx"
 #include "UpdateDomain.hxx"
-#include "DatabaseLock.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
 #include "decoder/DecoderList.hxx"
 #include "Log.hxx"
 

src/update/UpdateWalk.cxx → src/db/update/UpdateWalk.cxx

@@ -24,10 +24,10 @@
 #include "UpdateSong.hxx"
 #include "UpdateArchive.hxx"
 #include "UpdateDomain.hxx"
-#include "DatabaseLock.hxx"
-#include "DatabaseSimple.hxx"
-#include "Directory.hxx"
-#include "Song.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/DatabaseSimple.hxx"
+#include "db/Directory.hxx"
+#include "db/Song.hxx"
 #include "PlaylistVector.hxx"
 #include "playlist/PlaylistRegistry.hxx"
 #include "Mapper.hxx"

src/playlist/PlaylistSong.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "PlaylistSong.hxx"
 #include "Mapper.hxx"
-#include "DatabaseSong.hxx"
+#include "db/DatabaseSong.hxx"
 #include "ls.hxx"
 #include "tag/Tag.hxx"
 #include "tag/TagBuilder.hxx"

src/queue/QueueSave.cxx

@@ -23,7 +23,7 @@
 #include "PlaylistError.hxx"
 #include "DetachedSong.hxx"
 #include "SongSave.hxx"
-#include "DatabaseSong.hxx"
+#include "db/DatabaseSong.hxx"
 #include "fs/TextFile.hxx"
 #include "util/StringUtil.hxx"
 #include "util/UriUtil.hxx"

src/sticker/SongSticker.cxx

@@ -20,9 +20,9 @@
 #include "config.h"
 #include "SongSticker.hxx"
 #include "StickerDatabase.hxx"
-#include "LightSong.hxx"
-#include "Song.hxx"
-#include "Directory.hxx"
+#include "db/LightSong.hxx"
+#include "db/Song.hxx"
+#include "db/Directory.hxx"
 
 #include <glib.h>
 

test/DumpDatabase.cxx

@@ -18,12 +18,12 @@
  */
 
 #include "config.h"
-#include "DatabaseRegistry.hxx"
-#include "DatabasePlugin.hxx"
-#include "DatabaseSelection.hxx"
-#include "DatabaseListener.hxx"
-#include "LightDirectory.hxx"
-#include "LightSong.hxx"
+#include "db/Registry.hxx"
+#include "db/DatabasePlugin.hxx"
+#include "db/Selection.hxx"
+#include "db/DatabaseListener.hxx"
+#include "db/LightDirectory.hxx"
+#include "db/LightSong.hxx"
 #include "PlaylistVector.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigData.hxx"

test/run_inotify.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "ShutdownHandler.hxx"
-#include "update/InotifySource.hxx"
+#include "db/update/InotifySource.hxx"
 #include "event/Loop.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"

test/test_translate_song.cxx

@@ -11,7 +11,7 @@
 #include "fs/AllocatedPath.hxx"
 #include "ls.hxx"
 #include "Log.hxx"
-#include "DatabaseSong.hxx"
+#include "db/DatabaseSong.hxx"
 #include "Mapper.hxx"
 
 #include <cppunit/TestFixture.h>