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/queue/Playlist.cxx
+++ b/src/queue/Playlist.cxx
@@ -22,7 +22,7 @@
 #include "Listener.hxx"
 #include "PlaylistError.hxx"
 #include "player/Control.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "SingleMode.hxx"
 #include "Log.hxx"

--- a/src/queue/PlaylistControl.cxx
+++ b/src/queue/PlaylistControl.cxx
@@ -26,7 +26,7 @@
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
 #include "player/Control.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "Log.hxx"

 void
--- a/src/queue/PlaylistEdit.cxx
+++ b/src/queue/PlaylistEdit.cxx
@@ -28,7 +28,7 @@
 #include "Listener.hxx"
 #include "PlaylistError.hxx"
 #include "player/Control.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "SongLoader.hxx"

 #include <memory>
--- a/src/queue/PlaylistTag.cxx
+++ b/src/queue/PlaylistTag.cxx
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "Playlist.hxx"
 #include "PlaylistError.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Builder.hxx"

--- a/src/queue/PlaylistUpdate.cxx
+++ b/src/queue/PlaylistUpdate.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "Playlist.hxx"
 #include "db/Interface.hxx"
-#include "db/LightSong.hxx"
-#include "DetachedSong.hxx"
+#include "song/LightSong.hxx"
+#include "song/DetachedSong.hxx"

 static bool
 UpdatePlaylistSong(const Database &db, DetachedSong &song)
--- a/src/queue/Queue.cxx
+++ b/src/queue/Queue.cxx
@@ -19,7 +19,7 @@

 #include "config.h"
 #include "Queue.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"

 Queue::Queue(unsigned _max_length) noexcept
 	:max_length(_max_length),
--- a/src/queue/QueuePrint.cxx
+++ b/src/queue/QueuePrint.cxx
@@ -20,10 +20,10 @@
 #include "config.h"
 #include "QueuePrint.hxx"
 #include "Queue.hxx"
-#include "SongFilter.hxx"
+#include "song/Filter.hxx"
 #include "SongPrint.hxx"
-#include "DetachedSong.hxx"
-#include "db/LightSong.hxx"
+#include "song/DetachedSong.hxx"
+#include "song/LightSong.hxx"
 #include "client/Response.hxx"

 /**
--- a/src/queue/QueueSave.cxx
+++ b/src/queue/QueueSave.cxx
@@ -21,7 +21,7 @@
 #include "QueueSave.hxx"
 #include "Queue.hxx"
 #include "PlaylistError.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "SongSave.hxx"
 #include "playlist/PlaylistSong.hxx"
 #include "fs/io/TextFile.hxx"