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

queue/Playlist: seek methods return bool/Error instead of PlaylistResult

Browse Source
This commit is contained in:
Max Kellermann
2015-11-11 19:32:32 +01:00
parent 0f4f04eaa4
commit 5e93c05095
5 changed files with 78 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Partition.hxx
View File

@@ -142,17 +142,19 @@ struct Partition final : private PlayerListener, private MixerListener {
return playlist.PlayPrevious(pc);
}
PlaylistResult SeekSongPosition(unsigned song_position,
SongTime seek_time) {
return playlist.SeekSongPosition(pc, song_position, seek_time);
bool SeekSongPosition(unsigned song_position,
SongTime seek_time, Error &error) {
return playlist.SeekSongPosition(pc, song_position, seek_time,
error);
}
PlaylistResult SeekSongId(unsigned song_id, SongTime seek_time) {
return playlist.SeekSongId(pc, song_id, seek_time);
bool SeekSongId(unsigned song_id, SongTime seek_time, Error &error) {
return playlist.SeekSongId(pc, song_id, seek_time, error);
}
PlaylistResult SeekCurrent(SignedSongTime seek_time, bool relative) {
return playlist.SeekCurrent(pc, seek_time, relative);
bool SeekCurrent(SignedSongTime seek_time, bool relative,
Error &error) {
return playlist.SeekCurrent(pc, seek_time, relative, error);
}
void SetRepeat(bool new_value) {

21
src/command/PlayerCommands.cxx
View File

@@ -296,9 +296,10 @@ handle_seek(Client &client, Request args, Response &r)
if (!args.Parse(0, song, r) || !args.Parse(1, seek_time, r))
return CommandResult::ERROR;
PlaylistResult result =
client.partition.SeekSongPosition(song, seek_time);
return print_playlist_result(r, result);
Error error;
return client.partition.SeekSongPosition(song, seek_time, error)
? CommandResult::OK
: print_error(r, error);
}
CommandResult
@@ -311,9 +312,10 @@ handle_seekid(Client &client, Request args, Response &r)
if (!args.Parse(1, seek_time, r))
return CommandResult::ERROR;
PlaylistResult result =
client.partition.SeekSongId(id, seek_time);
return print_playlist_result(r, result);
Error error;
return client.partition.SeekSongId(id, seek_time, error)
? CommandResult::OK
: print_error(r, error);
}
CommandResult
@@ -325,9 +327,10 @@ handle_seekcur(Client &client, Request args, Response &r)
if (!ParseCommandArg(r, seek_time, p))
return CommandResult::ERROR;
PlaylistResult result =
client.partition.SeekCurrent(seek_time, relative);
return print_playlist_result(r, result);
Error error;
return client.partition.SeekCurrent(seek_time, relative, error)
? CommandResult::OK
: print_error(r, error);
}
CommandResult

24
src/queue/Playlist.hxx
View File

@@ -280,16 +280,19 @@ public:
void PlayPrevious(PlayerControl &pc);
PlaylistResult SeekSongOrder(PlayerControl &pc,
unsigned song_order,
SongTime seek_time);
bool SeekSongOrder(PlayerControl &pc,
unsigned song_order,
SongTime seek_time,
Error &error);
PlaylistResult SeekSongPosition(PlayerControl &pc,
unsigned song_position,
SongTime seek_time);
bool SeekSongPosition(PlayerControl &pc,
unsigned sonag_position,
SongTime seek_time,
Error &error);
PlaylistResult SeekSongId(PlayerControl &pc,
unsigned song_id, SongTime seek_time);
bool SeekSongId(PlayerControl &pc,
unsigned song_id, SongTime seek_time,
Error &error);
/**
* Seek within the current song. Fails if MPD is not currently
@@ -299,8 +302,9 @@ public:
* @param relative if true, then the specified time is relative to the
* current position
*/
PlaylistResult SeekCurrent(PlayerControl &pc,
SignedSongTime seek_time, bool relative);
bool SeekCurrent(PlayerControl &pc,
SignedSongTime seek_time, bool relative,
Error &error);
bool GetRepeat() const {
return queue.repeat;

62
src/queue/PlaylistControl.cxx
View File

@@ -189,8 +189,9 @@ playlist::PlayPrevious(PlayerControl &pc)
PlayOrder(pc, order);
}
PlaylistResult
playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time)
bool
playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time,
Error &error)
{
assert(queue.IsValidOrder(i));
@@ -213,52 +214,71 @@ playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time)
if (!pc.LockSeek(new DetachedSong(queue.GetOrder(i)), seek_time)) {
UpdateQueuedSong(pc, queued_song);
return PlaylistResult::NOT_PLAYING;
// TODO: fix error code
error.Set(playlist_domain, int(PlaylistResult::NOT_PLAYING),
"Decoder failed to seek");
return false;
}
queued = -1;
UpdateQueuedSong(pc, nullptr);
return PlaylistResult::SUCCESS;
return true;
}
PlaylistResult
bool
playlist::SeekSongPosition(PlayerControl &pc, unsigned song,
SongTime seek_time)
SongTime seek_time,
Error &error)
{
if (!queue.IsValidPosition(song))
return PlaylistResult::BAD_RANGE;
if (!queue.IsValidPosition(song)) {
error.Set(playlist_domain, int(PlaylistResult::BAD_RANGE),
"Bad range");
return false;
}
unsigned i = queue.random
? queue.PositionToOrder(song)
: song;
return SeekSongOrder(pc, i, seek_time);
return SeekSongOrder(pc, i, seek_time, error);
}
PlaylistResult
playlist::SeekSongId(PlayerControl &pc, unsigned id, SongTime seek_time)
bool
playlist::SeekSongId(PlayerControl &pc, unsigned id, SongTime seek_time,
Error &error)
{
int song = queue.IdToPosition(id);
if (song < 0)
return PlaylistResult::NO_SUCH_SONG;
if (song < 0) {
error.Set(playlist_domain, int(PlaylistResult::NO_SUCH_SONG),
"No such song");
return false;
}
return SeekSongPosition(pc, song, seek_time);
return SeekSongPosition(pc, song, seek_time, error);
}
PlaylistResult
bool
playlist::SeekCurrent(PlayerControl &pc,
SignedSongTime seek_time, bool relative)
SignedSongTime seek_time, bool relative,
Error &error)
{
if (!playing)
return PlaylistResult::NOT_PLAYING;
if (!playing) {
error.Set(playlist_domain, int(PlaylistResult::NOT_PLAYING),
"Not playing");
return false;
}
if (relative) {
const auto status = pc.LockGetStatus();
if (status.state != PlayerState::PLAY &&
status.state != PlayerState::PAUSE)
return PlaylistResult::NOT_PLAYING;
status.state != PlayerState::PAUSE) {
error.Set(playlist_domain,
int(PlaylistResult::NOT_PLAYING),
"Not playing");
return false;
}
seek_time += status.elapsed_time;
if (seek_time.IsNegative())
@@ -268,5 +288,5 @@ playlist::SeekCurrent(PlayerControl &pc,
if (seek_time.IsNegative())
seek_time = SignedSongTime::zero();
return SeekSongOrder(pc, current, SongTime(seek_time));
return SeekSongOrder(pc, current, SongTime(seek_time), error);
}

3
src/queue/PlaylistState.cxx
View File

@@ -198,7 +198,8 @@ playlist_state_restore(const char *line, TextFile &file,
else if (seek_time.count() == 0)
playlist.PlayPosition(pc, current);
else
playlist.SeekSongPosition(pc, current, seek_time);
playlist.SeekSongPosition(pc, current, seek_time,
IgnoreError());
if (state == PlayerState::PAUSE)
pc.LockPause();