From 9de984f7f8ea98fcac544ad3dc046d0a57dccfba Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 28 Feb 2016 11:04:35 +0100 Subject: [PATCH] queue/PlaylistControl: throw PlaylistError on error --- src/queue/PlaylistControl.cxx | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/queue/PlaylistControl.cxx b/src/queue/PlaylistControl.cxx index 5310a0fa1..3c7a69c61 100644 --- a/src/queue/PlaylistControl.cxx +++ b/src/queue/PlaylistControl.cxx @@ -228,11 +228,8 @@ playlist::SeekSongPosition(PlayerControl &pc, unsigned song, SongTime seek_time, Error &error) { - if (!queue.IsValidPosition(song)) { - error.Set(playlist_domain, int(PlaylistResult::BAD_RANGE), - "Bad range"); - return false; - } + if (!queue.IsValidPosition(song)) + throw PlaylistError::BadRange(); unsigned i = queue.random ? queue.PositionToOrder(song) @@ -246,11 +243,8 @@ playlist::SeekSongId(PlayerControl &pc, unsigned id, SongTime seek_time, Error &error) { int song = queue.IdToPosition(id); - if (song < 0) { - error.Set(playlist_domain, int(PlaylistResult::NO_SUCH_SONG), - "No such song"); - return false; - } + if (song < 0) + throw PlaylistError::NoSuchSong(); return SeekSongPosition(pc, song, seek_time, error); }