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, SongTime seek_time,
Error &error) Error &error)
{ {
if (!queue.IsValidPosition(song)) { if (!queue.IsValidPosition(song))
error.Set(playlist_domain, int(PlaylistResult::BAD_RANGE), throw PlaylistError::BadRange();
"Bad range");
return false;
}
unsigned i = queue.random unsigned i = queue.random
? queue.PositionToOrder(song) ? queue.PositionToOrder(song)
@ -246,11 +243,8 @@ playlist::SeekSongId(PlayerControl &pc, unsigned id, SongTime seek_time,
Error &error) Error &error)
{ {
int song = queue.IdToPosition(id); int song = queue.IdToPosition(id);
if (song < 0) { if (song < 0)
error.Set(playlist_domain, int(PlaylistResult::NO_SUCH_SONG), throw PlaylistError::NoSuchSong();
"No such song");
return false;
}
return SeekSongPosition(pc, song, seek_time, error); return SeekSongPosition(pc, song, seek_time, error);
} }