Playlist*: move to queue/

Makefile.am

@@ -141,19 +141,14 @@ libmpd_a_SOURCES = \
 	src/PlayerThread.cxx src/PlayerThread.hxx \
 	src/PlayerControl.cxx src/PlayerControl.hxx \
 	src/PlayerListener.hxx \
-	src/Playlist.cxx src/Playlist.hxx \
 	src/PlaylistError.cxx src/PlaylistError.hxx \
 	src/PlaylistGlobal.cxx src/PlaylistGlobal.hxx \
-	src/PlaylistControl.cxx \
-	src/PlaylistEdit.cxx \
-	src/PlaylistTag.cxx \
 	src/PlaylistPrint.cxx src/PlaylistPrint.hxx \
 	src/PlaylistSave.cxx src/PlaylistSave.hxx \
 	src/playlist/PlaylistStream.cxx src/playlist/PlaylistStream.hxx \
 	src/playlist/PlaylistMapper.cxx src/playlist/PlaylistMapper.hxx \
 	src/playlist/PlaylistAny.cxx src/playlist/PlaylistAny.hxx \
 	src/playlist/PlaylistSong.cxx src/playlist/PlaylistSong.hxx \
-	src/PlaylistState.cxx src/PlaylistState.hxx \
 	src/playlist/PlaylistQueue.cxx src/playlist/PlaylistQueue.hxx \
 	src/playlist/Print.cxx src/playlist/Print.hxx \
 	src/db/PlaylistVector.cxx src/db/PlaylistVector.hxx \
@@ -162,6 +157,11 @@ libmpd_a_SOURCES = \
 	src/queue/Queue.cxx src/queue/Queue.hxx \
 	src/queue/QueuePrint.cxx src/queue/QueuePrint.hxx \
 	src/queue/QueueSave.cxx src/queue/QueueSave.hxx \
+	src/queue/Playlist.cxx src/queue/Playlist.hxx \
+	src/queue/PlaylistControl.cxx \
+	src/queue/PlaylistEdit.cxx \
+	src/queue/PlaylistTag.cxx \
+	src/queue/PlaylistState.cxx src/queue/PlaylistState.hxx \
 	src/ReplayGainConfig.cxx src/ReplayGainConfig.hxx \
 	src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx \
 	src/DetachedSong.cxx src/DetachedSong.hxx \
@@ -191,7 +191,7 @@ endif
 
 if ENABLE_DATABASE
 libmpd_a_SOURCES += \
-	src/PlaylistUpdate.cxx \
+	src/queue/PlaylistUpdate.cxx \
 	src/command/StorageCommands.cxx src/command/StorageCommands.hxx \
 	src/command/DatabaseCommands.cxx src/command/DatabaseCommands.hxx \
 	src/db/LightSong.cxx src/db/LightSong.hxx \

src/Partition.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_PARTITION_HXX
 #define MPD_PARTITION_HXX
 
-#include "Playlist.hxx"
+#include "queue/Playlist.hxx"
 #include "output/MultipleOutputs.hxx"
 #include "mixer/Listener.hxx"
 #include "PlayerControl.hxx"

src/PlaylistPrint.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "PlaylistPrint.hxx"
 #include "PlaylistFile.hxx"
-#include "Playlist.hxx"
+#include "queue/Playlist.hxx"
 #include "queue/QueuePrint.hxx"
 #include "SongPrint.hxx"
 #include "Partition.hxx"

src/PlaylistSave.cxx

@@ -21,7 +21,7 @@
 #include "PlaylistSave.hxx"
 #include "PlaylistFile.hxx"
 #include "PlaylistError.hxx"
-#include "Playlist.hxx"
+#include "queue/Playlist.hxx"
 #include "DetachedSong.hxx"
 #include "SongLoader.hxx"
 #include "Mapper.hxx"

src/StateFile.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "StateFile.hxx"
 #include "output/OutputState.hxx"
-#include "PlaylistState.hxx"
+#include "queue/PlaylistState.hxx"
 #include "fs/TextFile.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"

src/command/PlayerCommands.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "PlayerCommands.hxx"
 #include "CommandError.hxx"
-#include "Playlist.hxx"
+#include "queue/Playlist.hxx"
 #include "PlaylistPrint.hxx"
 #include "client/Client.hxx"
 #include "mixer/Volume.hxx"

src/command/PlaylistCommands.cxx

@@ -28,12 +28,12 @@
 #include "SongLoader.hxx"
 #include "playlist/PlaylistQueue.hxx"
 #include "playlist/Print.hxx"
+#include "queue/Playlist.hxx"
 #include "TimePrint.hxx"
 #include "client/Client.hxx"
 #include "protocol/ArgParser.hxx"
 #include "protocol/Result.hxx"
 #include "ls.hxx"
-#include "Playlist.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
 

src/command/QueueCommands.cxx

@@ -24,7 +24,7 @@
 #include "db/Selection.hxx"
 #include "SongFilter.hxx"
 #include "SongLoader.hxx"
-#include "Playlist.hxx"
+#include "queue/Playlist.hxx"
 #include "PlaylistPrint.hxx"
 #include "client/Client.hxx"
 #include "Partition.hxx"

src/playlist/PlaylistQueue.cxx

@@ -21,7 +21,7 @@
 #include "PlaylistQueue.hxx"
 #include "PlaylistAny.hxx"
 #include "PlaylistSong.hxx"
-#include "Playlist.hxx"
+#include "queue/Playlist.hxx"
 #include "SongEnumerator.hxx"
 #include "DetachedSong.hxx"
 #include "thread/Mutex.hxx"