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

2018-08-02 13:45:43 +02:00 · 2018-08-02 13:45:43 +02:00 · 90201e9970
commit 90201e9970
parent a31da51fd9
67 changed files with 89 additions and 90 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -22,6 +22,7 @@ noinst_LIBRARIES = \
 	libpcm.a \
 	libbasic.a \
 	libconf.a \
+	libsong.a \
 	libtag.a \
 	libinput.a \
 	libfs.a \
@ -53,6 +54,7 @@ src_mpd_LDADD = \
 	$(INPUT_LIBS) \
 	$(ARCHIVE_LIBS) \
 	$(OUTPUT_LIBS) \
+	libsong.a \
 	$(TAG_LIBS) \
 	$(FILTER_LIBS) \
 	$(ENCODER_LIBS) \
@ -168,7 +170,6 @@ libmpd_a_SOURCES = \
 	src/queue/Listener.hxx \
 	src/PluginUnavailable.hxx \
 	src/ReplayGainGlobal.cxx src/ReplayGainGlobal.hxx \
-	src/DetachedSong.cxx src/DetachedSong.hxx \
 	src/LocateUri.cxx src/LocateUri.hxx \
 	src/SongUpdate.cxx \
 	src/SongLoader.cxx src/SongLoader.hxx \
@ -184,7 +185,6 @@ libmpd_a_SOURCES = \
 	src/TimePrint.cxx src/TimePrint.hxx \
 	src/mixer/Volume.cxx src/mixer/Volume.hxx \
 	src/Chrono.hxx \
-	src/SongFilter.cxx src/SongFilter.hxx \
 	src/PlaylistFile.cxx src/PlaylistFile.hxx

 if ENABLE_CURL
@ -218,7 +218,6 @@ libmpd_a_SOURCES += \
 	src/command/StorageCommands.cxx src/command/StorageCommands.hxx \
 	src/command/DatabaseCommands.cxx src/command/DatabaseCommands.hxx \
 	src/db/Count.cxx src/db/Count.hxx \
-	src/db/LightSong.cxx src/db/LightSong.hxx \
 	src/db/LightDirectory.hxx \
 	src/db/update/UpdateDomain.cxx src/db/update/UpdateDomain.hxx \
 	src/db/update/Config.cxx src/db/update/Config.hxx \
@ -1026,6 +1025,13 @@ libconf_a_SOURCES = \
 	src/config/Domain.cxx src/config/Domain.hxx \
 	src/config/Option.hxx

+# the Song library
+
+libsong_a_SOURCES = \
+	src/song/DetachedSong.cxx src/song/DetachedSong.hxx \
+	src/song/Filter.cxx src/song/Filter.hxx \
+	src/song/LightSong.cxx src/song/LightSong.hxx
+
 # tag plugins

 libtag_a_CPPFLAGS = $(AM_CPPFLAGS) \
@ -1917,11 +1923,11 @@ noinst_PROGRAMS += test/read_mixer
 endif

 test_ParseSongFilter_LDADD = \
+	libsong.a \
 	$(TAG_LIBS) \
 	$(ICU_LDADD) \
 	libutil.a
 test_ParseSongFilter_SOURCES = \
-	src/SongFilter.cxx \
 	test/ParseSongFilter.cxx

 test_read_conf_LDADD = \
@ -1945,6 +1951,7 @@ if ENABLE_DATABASE

 test_DumpDatabase_LDADD = \
 	$(DB_LIBS) \
+	libsong.a \
 	$(TAG_LIBS) \
 	libconf.a \
 	libevent.a \
@ -1964,9 +1971,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
 	src/AudioParser.cxx \
 	src/pcm/SampleFormat.cxx \
 	src/SongSave.cxx \
-	src/DetachedSong.cxx \
-	src/TagSave.cxx \
-	src/SongFilter.cxx
+	src/TagSave.cxx
 test_DumpDatabase_CPPFLAGS = $(AM_CPPFLAGS)

 if ENABLE_UPNP
@ -2117,8 +2122,7 @@ test_dump_playlist_LDADD = \
 test_dump_playlist_SOURCES = test/dump_playlist.cxx \
 	src/Log.cxx src/LogBackend.cxx \
 	src/TagSave.cxx \
-	src/TagFile.cxx \
-	src/DetachedSong.cxx
+	src/TagFile.cxx

 if ENABLE_FLAC
 test_dump_playlist_SOURCES += \
@ -2141,7 +2145,6 @@ test_run_decoder_LDADD = \
 	libutil.a
 test_run_decoder_SOURCES = test/run_decoder.cxx \
 	test/DumpDecoderClient.cxx test/DumpDecoderClient.hxx \
-	src/DetachedSong.cxx \
 	src/Log.cxx src/LogBackend.cxx \
 	src/ReplayGainInfo.cxx

@ -2160,7 +2163,6 @@ test_read_tags_LDADD = \
 	libsystem.a \
 	libutil.a
 test_read_tags_SOURCES = test/read_tags.cxx \
-	src/DetachedSong.cxx \
 	src/Log.cxx src/LogBackend.cxx \
 	src/ReplayGainInfo.cxx

@ -2191,7 +2193,6 @@ test_ContainerScan_LDADD = \
 	libsystem.a \
 	libutil.a
 test_ContainerScan_SOURCES = test/ContainerScan.cxx \
-	src/DetachedSong.cxx \
 	src/SongSave.cxx src/TagSave.cxx \
 	src/Log.cxx src/LogBackend.cxx \
 	src/ReplayGainInfo.cxx \
@ -2453,7 +2454,6 @@ if ENABLE_DATABASE
 test_test_translate_song_SOURCES = \
 	src/playlist/PlaylistSong.cxx \
 	src/PlaylistError.cxx \
-	src/DetachedSong.cxx \
 	src/SongLoader.cxx \
 	src/LocateUri.cxx \
 	src/Log.cxx \
@ -2483,7 +2483,6 @@ test_test_protocol_LDADD = \

 test_test_queue_priority_SOURCES = \
 	src/queue/Queue.cxx \
-	src/DetachedSong.cxx \
 	test/test_queue_priority.cxx
 test_test_queue_priority_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS)
 test_test_queue_priority_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declarations
--- a/src/Partition.cxx
+++ b/src/Partition.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "Partition.hxx"
 #include "Instance.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "mixer/Volume.hxx"
 #include "IdleFlags.hxx"
 #include "client/Listener.hxx"
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@ -23,7 +23,7 @@
 #include "PlaylistError.hxx"
 #include "db/PlaylistInfo.hxx"
 #include "db/PlaylistVector.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "SongLoader.hxx"
 #include "Mapper.hxx"
 #include "fs/io/TextFile.hxx"
--- a/src/PlaylistSave.cxx
+++ b/src/PlaylistSave.cxx
@ -22,7 +22,7 @@
 #include "PlaylistFile.hxx"
 #include "PlaylistError.hxx"
 #include "queue/Playlist.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "Mapper.hxx"
 #include "Idle.hxx"
 #include "fs/AllocatedPath.hxx"
--- a/src/SongLoader.cxx
+++ b/src/SongLoader.cxx
@ -23,7 +23,7 @@
 #include "client/Client.hxx"
 #include "db/DatabaseSong.hxx"
 #include "storage/StorageInterface.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "PlaylistError.hxx"

 #include <assert.h>
--- a/src/SongPrint.cxx
+++ b/src/SongPrint.cxx
@ -19,11 +19,11 @@

 #include "config.h"
 #include "SongPrint.hxx"
-#include "db/LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
 #include "storage/StorageInterface.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "TimePrint.hxx"
 #include "TagPrint.hxx"
 #include "client/Response.hxx"
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@ -21,7 +21,7 @@
 #include "SongSave.hxx"
 #include "AudioParser.hxx"
 #include "db/plugins/simple/Song.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "TagSave.hxx"
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h" /* must be first for large file support */
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "db/plugins/simple/Song.hxx"
 #include "db/plugins/simple/Directory.hxx"
 #include "storage/StorageInterface.hxx"
--- a/src/command/DatabaseCommands.cxx
+++ b/src/command/DatabaseCommands.cxx
@ -34,7 +34,7 @@
 #include "util/Exception.hxx"
 #include "util/StringAPI.hxx"
 #include "util/ASCII.hxx"
-#include "SongFilter.hxx"
+#include "song/Filter.hxx"
 #include "BulkEdit.hxx"

 #include <memory>
--- a/src/command/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
@ -26,7 +26,7 @@
 #include "db/Uri.hxx"
 #include "storage/StorageInterface.hxx"
 #include "LocateUri.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "SongPrint.hxx"
 #include "TagPrint.hxx"
 #include "TagStream.hxx"
--- a/src/command/QueueCommands.cxx
+++ b/src/command/QueueCommands.cxx
@ -23,9 +23,9 @@
 #include "CommandError.hxx"
 #include "db/DatabaseQueue.hxx"
 #include "db/Selection.hxx"
-#include "SongFilter.hxx"
+#include "song/Filter.hxx"
 #include "SongLoader.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "LocateUri.hxx"
 #include "queue/Playlist.hxx"
 #include "PlaylistPrint.hxx"
--- a/src/db/Count.cxx
+++ b/src/db/Count.cxx
@ -23,7 +23,7 @@
 #include "Interface.hxx"
 #include "Partition.hxx"
 #include "client/Response.hxx"
-#include "LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "tag/Tag.hxx"
 #include "TagPrint.hxx"

--- a/src/db/DatabasePlaylist.cxx
+++ b/src/db/DatabasePlaylist.cxx
@ -23,7 +23,7 @@
 #include "Selection.hxx"
 #include "PlaylistFile.hxx"
 #include "Interface.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"

 #include <functional>

--- a/src/db/DatabasePrint.cxx
+++ b/src/db/DatabasePrint.cxx
@ -20,16 +20,16 @@
 #include "config.h"
 #include "DatabasePrint.hxx"
 #include "Selection.hxx"
-#include "SongFilter.hxx"
 #include "SongPrint.hxx"
-#include "DetachedSong.hxx"
 #include "TimePrint.hxx"
 #include "TagPrint.hxx"
 #include "client/Response.hxx"
 #include "Partition.hxx"
+#include "song/DetachedSong.hxx"
+#include "song/Filter.hxx"
+#include "song/LightSong.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Mask.hxx"
-#include "LightSong.hxx"
 #include "LightDirectory.hxx"
 #include "PlaylistInfo.hxx"
 #include "Interface.hxx"
--- a/src/db/DatabaseQueue.cxx
+++ b/src/db/DatabaseQueue.cxx
@ -23,7 +23,7 @@
 #include "Interface.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"

 #include <functional>

--- a/src/db/DatabaseSong.cxx
+++ b/src/db/DatabaseSong.cxx
@ -19,9 +19,9 @@

 #include "config.h"
 #include "DatabaseSong.hxx"
-#include "LightSong.hxx"
 #include "Interface.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
+#include "song/LightSong.hxx"
 #include "storage/StorageInterface.hxx"
 #include "util/ScopeExit.hxx"

--- a/src/db/Helpers.cxx
+++ b/src/db/Helpers.cxx
@ -20,7 +20,7 @@
 #include "Helpers.hxx"
 #include "Stats.hxx"
 #include "Interface.hxx"
-#include "LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "tag/Tag.hxx"

 #include <set>
--- a/src/db/Selection.cxx
+++ b/src/db/Selection.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "Selection.hxx"
-#include "SongFilter.hxx"
+#include "song/Filter.hxx"

 DatabaseSelection::DatabaseSelection(const char *_uri, bool _recursive,
 				     const SongFilter *_filter)
--- a/src/db/UniqueTags.cxx
+++ b/src/db/UniqueTags.cxx
@ -19,7 +19,7 @@

 #include "UniqueTags.hxx"
 #include "Interface.hxx"
-#include "LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "tag/Set.hxx"
 #include "tag/Mask.hxx"

--- 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>
--- a/src/db/update/Container.cxx
+++ b/src/db/update/Container.cxx
@ -20,7 +20,7 @@
 #include "config.h" /* must be first for large file support */
 #include "Walk.hxx"
 #include "UpdateDomain.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "db/DatabaseLock.hxx"
 #include "db/plugins/simple/Directory.hxx"
 #include "db/plugins/simple/Song.hxx"
--- a/src/decoder/Bridge.cxx
+++ b/src/decoder/Bridge.cxx
@ -22,7 +22,7 @@
 #include "DecoderAPI.hxx"
 #include "DecoderError.hxx"
 #include "DecoderControl.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "pcm/PcmConvert.hxx"
 #include "MusicPipe.hxx"
 #include "MusicBuffer.hxx"
--- a/src/decoder/DecoderControl.cxx
+++ b/src/decoder/DecoderControl.cxx
@ -21,7 +21,7 @@
 #include "DecoderControl.hxx"
 #include "DecoderError.hxx"
 #include "MusicPipe.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"

 #include <stdexcept>

--- a/src/decoder/DecoderThread.cxx
+++ b/src/decoder/DecoderThread.cxx
@ -23,7 +23,7 @@
 #include "Bridge.hxx"
 #include "DecoderError.hxx"
 #include "DecoderPlugin.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "MusicPipe.hxx"
 #include "fs/Traits.hxx"
 #include "fs/AllocatedPath.hxx"
--- a/src/decoder/plugins/GmeDecoderPlugin.cxx
+++ b/src/decoder/plugins/GmeDecoderPlugin.cxx
@ -22,7 +22,7 @@
 #include "../DecoderAPI.hxx"
 #include "config/Block.cxx"
 #include "CheckAudioFormat.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "tag/Handler.hxx"
 #include "tag/Builder.hxx"
 #include "fs/Path.hxx"
--- a/src/decoder/plugins/SidplayDecoderPlugin.cxx
+++ b/src/decoder/plugins/SidplayDecoderPlugin.cxx
@ -22,7 +22,7 @@
 #include "../DecoderAPI.hxx"
 #include "tag/Handler.hxx"
 #include "tag/Builder.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "fs/Path.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/Macros.hxx"
--- a/src/player/Control.cxx
+++ b/src/player/Control.cxx
@ -21,7 +21,7 @@
 #include "Control.hxx"
 #include "Outputs.hxx"
 #include "Idle.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"

 #include <algorithm>

--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@ -26,7 +26,7 @@
 #include "MusicPipe.hxx"
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "CrossFade.hxx"
 #include "Control.hxx"
 #include "tag/Tag.hxx"
--- a/src/playlist/MemorySongEnumerator.hxx
+++ b/src/playlist/MemorySongEnumerator.hxx
@ -21,7 +21,7 @@
 #define MPD_MEMORY_PLAYLIST_PROVIDER_HXX

 #include "SongEnumerator.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "Compiler.h"

 #include <forward_list>
--- a/src/playlist/PlaylistQueue.cxx
+++ b/src/playlist/PlaylistQueue.cxx
@ -24,7 +24,7 @@
 #include "PlaylistError.hxx"
 #include "queue/Playlist.hxx"
 #include "SongEnumerator.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "thread/Mutex.hxx"
 #include "fs/Traits.hxx"

--- a/src/playlist/PlaylistSong.cxx
+++ b/src/playlist/PlaylistSong.cxx
@ -24,7 +24,7 @@
 #include "tag/Builder.hxx"
 #include "fs/Traits.hxx"
 #include "util/UriUtil.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"

 #include <string.h>

--- a/src/playlist/Print.cxx
+++ b/src/playlist/Print.cxx
@ -23,7 +23,7 @@
 #include "PlaylistSong.hxx"
 #include "SongEnumerator.hxx"
 #include "SongPrint.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "fs/Traits.hxx"
 #include "thread/Mutex.hxx"
 #include "Partition.hxx"
--- a/src/playlist/cue/CueParser.hxx
+++ b/src/playlist/cue/CueParser.hxx
@ -21,7 +21,7 @@
 #define MPD_CUE_PARSER_HXX

 #include "check.h"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "tag/Builder.hxx"
 #include "Compiler.h"

--- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
@ -30,7 +30,7 @@
 #include "../cue/CueParser.hxx"
 #include "tag/Handler.hxx"
 #include "tag/Generic.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "TagFile.hxx"
 #include "fs/Traits.hxx"
 #include "fs/AllocatedPath.hxx"
--- a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
+++ b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
@ -21,7 +21,7 @@
 #include "ExtM3uPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../SongEnumerator.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "tag/Tag.hxx"
 #include "tag/Builder.hxx"
 #include "util/StringStrip.hxx"
--- a/src/playlist/plugins/FlacPlaylistPlugin.cxx
+++ b/src/playlist/plugins/FlacPlaylistPlugin.cxx
@ -27,7 +27,7 @@
 #include "FlacPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../SongEnumerator.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "fs/Traits.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/NarrowPath.hxx"
--- a/src/playlist/plugins/M3uPlaylistPlugin.cxx
+++ b/src/playlist/plugins/M3uPlaylistPlugin.cxx
@ -21,7 +21,7 @@
 #include "M3uPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../SongEnumerator.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "input/TextInputStream.hxx"
 #include "util/StringStrip.hxx"

--- a/src/playlist/plugins/PlsPlaylistPlugin.cxx
+++ b/src/playlist/plugins/PlsPlaylistPlugin.cxx
@ -23,7 +23,7 @@
 #include "../MemorySongEnumerator.hxx"
 #include "input/TextInputStream.hxx"
 #include "input/InputStream.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "tag/Builder.hxx"
 #include "util/ASCII.hxx"
 #include "util/StringStrip.hxx"
--- a/src/playlist/plugins/XspfPlaylistPlugin.cxx
+++ b/src/playlist/plugins/XspfPlaylistPlugin.cxx
@ -21,7 +21,7 @@
 #include "XspfPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "input/InputStream.hxx"
 #include "tag/Builder.hxx"
 #include "util/StringView.hxx"
--- 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"
--- a/src/song/DetachedSong.cxx
+++ b/src/song/DetachedSong.cxx
@ -18,8 +18,8 @@
 */

 #include "config.h"
-#include "DetachedSong.hxx"
-#include "db/LightSong.hxx"
+#include "song/DetachedSong.hxx"
+#include "song/LightSong.hxx"
 #include "util/UriUtil.hxx"
 #include "fs/Traits.hxx"

--- a/src/song/DetachedSong.hxx
+++ b/src/song/DetachedSong.hxx
--- a/src/song/Filter.cxx
+++ b/src/song/Filter.cxx
@ -18,8 +18,8 @@
 */

 #include "config.h"
-#include "SongFilter.hxx"
-#include "db/LightSong.hxx"
+#include "Filter.hxx"
+#include "LightSong.hxx"
 #include "tag/ParseName.hxx"
 #include "tag/Tag.hxx"
 #include "util/CharUtil.hxx"
--- a/src/song/Filter.hxx
+++ b/src/song/Filter.hxx
--- a/src/song/LightSong.cxx
+++ b/src/song/LightSong.cxx
--- a/src/song/LightSong.hxx
+++ b/src/song/LightSong.hxx
--- a/src/sticker/SongSticker.cxx
+++ b/src/sticker/SongSticker.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "SongSticker.hxx"
 #include "StickerDatabase.hxx"
-#include "db/LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "db/Interface.hxx"
 #include "util/Alloc.hxx"
 #include "util/ScopeExit.hxx"
--- a/test/ContainerScan.cxx
+++ b/test/ContainerScan.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "SongSave.hxx"
 #include "config/Data.hxx"
 #include "decoder/DecoderList.hxx"
--- a/test/DumpDatabase.cxx
+++ b/test/DumpDatabase.cxx
@ -24,7 +24,7 @@
 #include "db/Selection.hxx"
 #include "db/DatabaseListener.hxx"
 #include "db/LightDirectory.hxx"
-#include "db/LightSong.hxx"
+#include "song/LightSong.hxx"
 #include "db/PlaylistVector.hxx"
 #include "config/Global.hxx"
 #include "config/Data.hxx"
--- a/test/ParseSongFilter.cxx
+++ b/test/ParseSongFilter.cxx
@ -23,7 +23,7 @@
 */

 #include "config.h"
-#include "SongFilter.hxx"
+#include "song/Filter.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/PrintException.hxx"

--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "TagSave.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "playlist/SongEnumerator.hxx"
 #include "input/InputStream.hxx"
 #include "config/Global.hxx"
--- a/test/test_queue_priority.cxx
+++ b/test/test_queue_priority.cxx
@ -1,6 +1,6 @@
 #include "config.h"
 #include "queue/Queue.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "util/Macros.hxx"

 #include <cppunit/TestFixture.h>
--- a/test/test_translate_song.cxx
+++ b/test/test_translate_song.cxx
@ -4,7 +4,7 @@

 #include "config.h"
 #include "playlist/PlaylistSong.hxx"
-#include "DetachedSong.hxx"
+#include "song/DetachedSong.hxx"
 #include "SongLoader.hxx"
 #include "client/Client.hxx"
 #include "tag/Builder.hxx"