Merge branch 'v0.18.x'

This commit is contained in:
Max Kellermann
2014-07-11 21:33:50 +02:00
12 changed files with 148 additions and 33 deletions

View File

@@ -26,6 +26,7 @@
#include "PlaylistFile.hxx"
#include "db/PlaylistVector.hxx"
#include "SongLoader.hxx"
#include "BulkEdit.hxx"
#include "playlist/PlaylistQueue.hxx"
#include "playlist/Print.hxx"
#include "queue/Playlist.hxx"
@@ -66,6 +67,8 @@ handle_load(Client &client, unsigned argc, char *argv[])
} else if (!check_range(client, &start_index, &end_index, argv[2]))
return CommandResult::ERROR;
const ScopeBulkEdit bulk_edit(client.partition);
Error error;
const SongLoader loader(client);
if (!playlist_open_into_queue(argv[1],