diff options
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | src/Partition.hxx | 2 | ||||
| -rw-r--r-- | src/PlaylistPrint.cxx | 2 | ||||
| -rw-r--r-- | src/PlaylistSave.cxx | 2 | ||||
| -rw-r--r-- | src/StateFile.cxx | 2 | ||||
| -rw-r--r-- | src/command/PlayerCommands.cxx | 2 | ||||
| -rw-r--r-- | src/command/PlaylistCommands.cxx | 2 | ||||
| -rw-r--r-- | src/command/QueueCommands.cxx | 2 | ||||
| -rw-r--r-- | src/playlist/PlaylistQueue.cxx | 2 | ||||
| -rw-r--r-- | src/queue/Playlist.cxx (renamed from src/Playlist.cxx) | 0 | ||||
| -rw-r--r-- | src/queue/Playlist.hxx (renamed from src/Playlist.hxx) | 0 | ||||
| -rw-r--r-- | src/queue/PlaylistControl.cxx (renamed from src/PlaylistControl.cxx) | 0 | ||||
| -rw-r--r-- | src/queue/PlaylistEdit.cxx (renamed from src/PlaylistEdit.cxx) | 0 | ||||
| -rw-r--r-- | src/queue/PlaylistState.cxx (renamed from src/PlaylistState.cxx) | 0 | ||||
| -rw-r--r-- | src/queue/PlaylistState.hxx (renamed from src/PlaylistState.hxx) | 0 | ||||
| -rw-r--r-- | src/queue/PlaylistTag.cxx (renamed from src/PlaylistTag.cxx) | 0 | ||||
| -rw-r--r-- | src/queue/PlaylistUpdate.cxx (renamed from src/PlaylistUpdate.cxx) | 0 |
17 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 11ab70a6e..83a61fbc9 100644 --- a/Makefile.am +++ b/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 \ diff --git a/src/Partition.hxx b/src/Partition.hxx index 991234a50..7f7def4af 100644 --- a/src/Partition.hxx +++ b/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" diff --git a/src/PlaylistPrint.cxx b/src/PlaylistPrint.cxx index 9e0dcade0..cfa56c7b3 100644 --- a/src/PlaylistPrint.cxx +++ b/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" diff --git a/src/PlaylistSave.cxx b/src/PlaylistSave.cxx index 62c27c96e..875fb1eeb 100644 --- a/src/PlaylistSave.cxx +++ b/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" diff --git a/src/StateFile.cxx b/src/StateFile.cxx index a1d8945c4..a3069605f 100644 --- a/src/StateFile.cxx +++ b/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" diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx index a4e0ec0a7..748b5b894 100644 --- a/src/command/PlayerCommands.cxx +++ b/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" diff --git a/src/command/PlaylistCommands.cxx b/src/command/PlaylistCommands.cxx index 6406b0770..35dc0ceb3 100644 --- a/src/command/PlaylistCommands.cxx +++ b/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" diff --git a/src/command/QueueCommands.cxx b/src/command/QueueCommands.cxx index f14beb872..105a33ebb 100644 --- a/src/command/QueueCommands.cxx +++ b/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" diff --git a/src/playlist/PlaylistQueue.cxx b/src/playlist/PlaylistQueue.cxx index 80018658d..3c7194ad7 100644 --- a/src/playlist/PlaylistQueue.cxx +++ b/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" diff --git a/src/Playlist.cxx b/src/queue/Playlist.cxx index abcb2ceaa..abcb2ceaa 100644 --- a/src/Playlist.cxx +++ b/src/queue/Playlist.cxx diff --git a/src/Playlist.hxx b/src/queue/Playlist.hxx index 09980155e..09980155e 100644 --- a/src/Playlist.hxx +++ b/src/queue/Playlist.hxx diff --git a/src/PlaylistControl.cxx b/src/queue/PlaylistControl.cxx index 9d75cc26d..9d75cc26d 100644 --- a/src/PlaylistControl.cxx +++ b/src/queue/PlaylistControl.cxx diff --git a/src/PlaylistEdit.cxx b/src/queue/PlaylistEdit.cxx index 8d2c76e6e..8d2c76e6e 100644 --- a/src/PlaylistEdit.cxx +++ b/src/queue/PlaylistEdit.cxx diff --git a/src/PlaylistState.cxx b/src/queue/PlaylistState.cxx index f5c798e3e..f5c798e3e 100644 --- a/src/PlaylistState.cxx +++ b/src/queue/PlaylistState.cxx diff --git a/src/PlaylistState.hxx b/src/queue/PlaylistState.hxx index 8d3f88ae2..8d3f88ae2 100644 --- a/src/PlaylistState.hxx +++ b/src/queue/PlaylistState.hxx diff --git a/src/PlaylistTag.cxx b/src/queue/PlaylistTag.cxx index 556e7f4e9..556e7f4e9 100644 --- a/src/PlaylistTag.cxx +++ b/src/queue/PlaylistTag.cxx diff --git a/src/PlaylistUpdate.cxx b/src/queue/PlaylistUpdate.cxx index 8876711ef..8876711ef 100644 --- a/src/PlaylistUpdate.cxx +++ b/src/queue/PlaylistUpdate.cxx |