DetachedSong, db/LightSong, SongFilter: move to src/song/

2018-08-02 13:45:43 +02:00
parent a31da51fd9
commit 90201e9970
67 changed files with 89 additions and 90 deletions
--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@@ -26,9 +26,9 @@
 #include "db/DatabaseError.hxx"
 #include "db/PlaylistInfo.hxx"
 #include "db/LightDirectory.hxx"
-#include "db/LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "db/Stats.hxx"
-#include "SongFilter.hxx"
+#include "song/Filter.hxx"
 #include "Compiler.h"
 #include "config/Block.hxx"
 #include "tag/Builder.hxx"
--- a/src/db/plugins/simple/Directory.cxx
+++ b/src/db/plugins/simple/Directory.cxx
@@ -23,11 +23,11 @@
 #include "Song.hxx"
 #include "Mount.hxx"
 #include "db/LightDirectory.hxx"
-#include "db/LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "db/Uri.hxx"
 #include "db/DatabaseLock.hxx"
 #include "db/Interface.hxx"
-#include "SongFilter.hxx"
+#include "song/Filter.hxx"
 #include "lib/icu/Collate.hxx"
 #include "fs/Traits.hxx"
 #include "util/Alloc.hxx"
--- a/src/db/plugins/simple/DirectorySave.cxx
+++ b/src/db/plugins/simple/DirectorySave.cxx
@@ -22,7 +22,7 @@
 #include "Directory.hxx"
 #include "Song.hxx"
 #include "SongSave.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "PlaylistDatabase.hxx"
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
--- a/src/db/plugins/simple/Mount.cxx
+++ b/src/db/plugins/simple/Mount.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Mount.hxx"
 #include "PrefixedLightSong.hxx"
-#include "SongFilter.hxx"
+#include "song/Filter.hxx"
 #include "db/Selection.hxx"
 #include "db/LightDirectory.hxx"
 #include "db/Interface.hxx"
--- a/src/db/plugins/simple/PrefixedLightSong.hxx
+++ b/src/db/plugins/simple/PrefixedLightSong.hxx
@@ -21,7 +21,7 @@
 #define MPD_DB_SIMPLE_PREFIXED_LIGHT_SONG_HXX

 #include "check.h"
-#include "db/LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "fs/Traits.hxx"

 #include <string>
--- a/src/db/plugins/simple/SimpleDatabasePlugin.hxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
@@ -23,7 +23,7 @@
 #include "check.h"
 #include "db/Interface.hxx"
 #include "fs/AllocatedPath.hxx"
-#include "db/LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "util/Manual.hxx"
 #include "Compiler.h"

--- a/src/db/plugins/simple/Song.cxx
+++ b/src/db/plugins/simple/Song.cxx
@@ -22,8 +22,8 @@
 #include "Directory.hxx"
 #include "tag/Tag.hxx"
 #include "util/VarSize.hxx"
-#include "DetachedSong.hxx"
-#include "db/LightSong.hxx"
+#include "song/DetachedSong.hxx"
+#include "song/LightSong.hxx"

 #include <assert.h>
 #include <string.h>
--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
+++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
@@ -29,7 +29,7 @@
 #include "db/Selection.hxx"
 #include "db/DatabaseError.hxx"
 #include "db/LightDirectory.hxx"
-#include "db/LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "db/Stats.hxx"
 #include "config/Block.hxx"
 #include "tag/Builder.hxx"
@@ -37,7 +37,7 @@
 #include "tag/Mask.hxx"
 #include "fs/Traits.hxx"
 #include "Log.hxx"
-#include "SongFilter.hxx"
+#include "song/Filter.hxx"
 #include "util/SplitString.hxx"

 #include <string>