oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

queue/PlaylistControl: throw PlaylistError on error

Browse Source
This commit is contained in:
Max Kellermann 2016-02-28 11:04:35 +01:00
parent b6cb9b853a
commit 9de984f7f8
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/queue/PlaylistControl.cxx
View File

@ -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);
}