Playlist: use the Error library to return errors

This commit is contained in:
Max Kellermann
2014-02-27 17:27:23 +01:00
parent 809b89b5af
commit 1c772ef699
9 changed files with 83 additions and 82 deletions

View File

@@ -66,16 +66,14 @@ handle_load(Client &client, int argc, char *argv[])
} else if (!check_range(client, &start_index, &end_index, argv[2]))
return CommandResult::ERROR;
const SongLoader loader(client);
const PlaylistResult result =
playlist_open_into_queue(argv[1],
start_index, end_index,
client.playlist,
client.player_control, loader);
if (result != PlaylistResult::NO_SUCH_LIST)
return print_playlist_result(client, result);
Error error;
const SongLoader loader(client);
if (!playlist_open_into_queue(argv[1],
start_index, end_index,
client.playlist,
client.player_control, loader, error))
return print_error(client, error);
if (playlist_load_spl(client.playlist, client.player_control,
argv[1], start_index, end_index,
error))