Skip to content

M
mpd
Commit f8810d7c authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

PlaylistError: add NotPlaying()

parent 92f54f0b
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 11 deletions
src/PlaylistError.hxx
View file @ f8810d7c
...@@ -64,6 +64,11 @@ public: ...@@ -64,6 +64,11 @@ public:
return PlaylistError(PlaylistResult::BAD_RANGE, return PlaylistError(PlaylistResult::BAD_RANGE,
"Bad song index"); "Bad song index");
} }
static PlaylistError NotPlaying() {
return PlaylistError(PlaylistResult::NOT_PLAYING,
"Not playing");
}
}; };
#endif #endif
src/queue/PlaylistControl.cxx
View file @ f8810d7c
...@@ -260,22 +260,15 @@ playlist::SeekCurrent(PlayerControl &pc, ...@@ -260,22 +260,15 @@ playlist::SeekCurrent(PlayerControl &pc,
SignedSongTime seek_time, bool relative, SignedSongTime seek_time, bool relative,
Error &error) Error &error)
{ {
if (!playing) { if (!playing)
error.Set(playlist_domain, int(PlaylistResult::NOT_PLAYING), throw PlaylistError::NotPlaying();
"Not playing");
return false;
}
if (relative) { if (relative) {
const auto status = pc.LockGetStatus(); const auto status = pc.LockGetStatus();
if (status.state != PlayerState::PLAY && if (status.state != PlayerState::PLAY &&
status.state != PlayerState::PAUSE) { status.state != PlayerState::PAUSE)
error.Set(playlist_domain, throw PlaylistError::NotPlaying();
int(PlaylistResult::NOT_PLAYING),
"Not playing");
return false;
}
seek_time += status.elapsed_time; seek_time += status.elapsed_time;
if (seek_time.IsNegative()) if (seek_time.IsNegative())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment