From f548a966f5cb09ba8a5e99939fe5235e5ad59005 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 27 Jan 2014 11:05:21 +0100 Subject: [PATCH] Playlist{Info,Vector}: move to db/ --- Makefile.am | 6 +++--- src/PlaylistDatabase.cxx | 2 +- src/PlaylistFile.cxx | 4 ++-- src/command/OtherCommands.cxx | 2 +- src/command/PlaylistCommands.cxx | 2 +- src/{ => db}/PlaylistInfo.hxx | 0 src/{ => db}/PlaylistVector.cxx | 0 src/{ => db}/PlaylistVector.hxx | 0 src/db/plugins/ProxyDatabasePlugin.cxx | 2 +- src/db/update/UpdateDatabase.cxx | 2 +- src/db/update/UpdateWalk.cxx | 2 +- test/DumpDatabase.cxx | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename src/{ => db}/PlaylistInfo.hxx (100%) rename src/{ => db}/PlaylistVector.cxx (100%) rename src/{ => db}/PlaylistVector.hxx (100%) diff --git a/Makefile.am b/Makefile.am index ffa92e851..034fad69b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -187,8 +187,8 @@ src_mpd_SOURCES = \ src/PlaylistState.cxx src/PlaylistState.hxx \ src/playlist/PlaylistQueue.cxx src/playlist/PlaylistQueue.hxx \ src/playlist/Print.cxx src/playlist/Print.hxx \ - src/PlaylistVector.cxx src/PlaylistVector.hxx \ - src/PlaylistInfo.hxx \ + src/db/PlaylistVector.cxx src/db/PlaylistVector.hxx \ + src/db/PlaylistInfo.hxx \ src/PlaylistDatabase.cxx src/PlaylistDatabase.hxx \ src/PlaylistUpdate.cxx \ src/queue/IdTable.hxx \ @@ -1281,7 +1281,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \ src/db/Registry.cxx \ src/db/Selection.cxx \ src/db/Directory.cxx src/db/DirectorySave.cxx \ - src/PlaylistVector.cxx src/PlaylistDatabase.cxx \ + src/db/PlaylistVector.cxx src/PlaylistDatabase.cxx \ src/db/DatabaseLock.cxx src/db/DatabaseSave.cxx \ src/db/Song.cxx src/SongSave.cxx src/db/SongSort.cxx \ src/DetachedSong.cxx \ diff --git a/src/PlaylistDatabase.cxx b/src/PlaylistDatabase.cxx index 065aea320..81aeae2cd 100644 --- a/src/PlaylistDatabase.cxx +++ b/src/PlaylistDatabase.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "PlaylistDatabase.hxx" -#include "PlaylistVector.hxx" +#include "db/PlaylistVector.hxx" #include "fs/TextFile.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx index 0b0f8d32d..71dbcba9c 100644 --- a/src/PlaylistFile.cxx +++ b/src/PlaylistFile.cxx @@ -20,8 +20,8 @@ #include "config.h" #include "PlaylistFile.hxx" #include "PlaylistSave.hxx" -#include "PlaylistInfo.hxx" -#include "PlaylistVector.hxx" +#include "db/PlaylistInfo.hxx" +#include "db/PlaylistVector.hxx" #include "db/DatabaseSong.hxx" #include "DetachedSong.hxx" #include "Mapper.hxx" diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx index 6432ce4e7..328683d3d 100644 --- a/src/command/OtherCommands.cxx +++ b/src/command/OtherCommands.cxx @@ -42,7 +42,7 @@ #include "Stats.hxx" #include "Permission.hxx" #include "PlaylistFile.hxx" -#include "PlaylistVector.hxx" +#include "db/PlaylistVector.hxx" #include "client/ClientFile.hxx" #include "client/Client.hxx" #include "Idle.hxx" diff --git a/src/command/PlaylistCommands.cxx b/src/command/PlaylistCommands.cxx index fbbb66757..bd2e24a17 100644 --- a/src/command/PlaylistCommands.cxx +++ b/src/command/PlaylistCommands.cxx @@ -24,7 +24,7 @@ #include "PlaylistPrint.hxx" #include "PlaylistSave.hxx" #include "PlaylistFile.hxx" -#include "PlaylistVector.hxx" +#include "db/PlaylistVector.hxx" #include "playlist/PlaylistQueue.hxx" #include "playlist/Print.hxx" #include "TimePrint.hxx" diff --git a/src/PlaylistInfo.hxx b/src/db/PlaylistInfo.hxx similarity index 100% rename from src/PlaylistInfo.hxx rename to src/db/PlaylistInfo.hxx diff --git a/src/PlaylistVector.cxx b/src/db/PlaylistVector.cxx similarity index 100% rename from src/PlaylistVector.cxx rename to src/db/PlaylistVector.cxx diff --git a/src/PlaylistVector.hxx b/src/db/PlaylistVector.hxx similarity index 100% rename from src/PlaylistVector.hxx rename to src/db/PlaylistVector.hxx diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx index daa963c7d..291b1bc1f 100644 --- a/src/db/plugins/ProxyDatabasePlugin.cxx +++ b/src/db/plugins/ProxyDatabasePlugin.cxx @@ -23,7 +23,7 @@ #include "db/DatabaseListener.hxx" #include "db/Selection.hxx" #include "db/DatabaseError.hxx" -#include "PlaylistInfo.hxx" +#include "db/PlaylistInfo.hxx" #include "db/LightDirectory.hxx" #include "db/LightSong.hxx" #include "SongFilter.hxx" diff --git a/src/db/update/UpdateDatabase.cxx b/src/db/update/UpdateDatabase.cxx index 8ef0b6d82..72a68de14 100644 --- a/src/db/update/UpdateDatabase.cxx +++ b/src/db/update/UpdateDatabase.cxx @@ -20,7 +20,7 @@ #include "config.h" /* must be first for large file support */ #include "UpdateDatabase.hxx" #include "UpdateRemove.hxx" -#include "PlaylistVector.hxx" +#include "db/PlaylistVector.hxx" #include "db/Directory.hxx" #include "db/Song.hxx" #include "db/DatabaseLock.hxx" diff --git a/src/db/update/UpdateWalk.cxx b/src/db/update/UpdateWalk.cxx index c5a9936e9..75924a7f7 100644 --- a/src/db/update/UpdateWalk.cxx +++ b/src/db/update/UpdateWalk.cxx @@ -28,7 +28,7 @@ #include "db/DatabaseSimple.hxx" #include "db/Directory.hxx" #include "db/Song.hxx" -#include "PlaylistVector.hxx" +#include "db/PlaylistVector.hxx" #include "playlist/PlaylistRegistry.hxx" #include "Mapper.hxx" #include "ExcludeList.hxx" diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx index 0be1191d2..af1139407 100644 --- a/test/DumpDatabase.cxx +++ b/test/DumpDatabase.cxx @@ -24,7 +24,7 @@ #include "db/DatabaseListener.hxx" #include "db/LightDirectory.hxx" #include "db/LightSong.hxx" -#include "PlaylistVector.hxx" +#include "db/PlaylistVector.hxx" #include "config/ConfigGlobal.hxx" #include "config/ConfigData.hxx" #include "tag/TagConfig.hxx"