Commit 704be54c authored by Max Kellermann's avatar Max Kellermann

PlaylistControl: move code to new method SeekSongOrder()

parent 24061525
...@@ -234,6 +234,10 @@ public: ...@@ -234,6 +234,10 @@ public:
void PlayPrevious(PlayerControl &pc); void PlayPrevious(PlayerControl &pc);
PlaylistResult SeekSongOrder(PlayerControl &pc,
unsigned song_order,
float seek_time);
PlaylistResult SeekSongPosition(PlayerControl &pc, PlaylistResult SeekSongPosition(PlayerControl &pc,
unsigned song_position, unsigned song_position,
float seek_time); float seek_time);
......
...@@ -190,17 +190,12 @@ playlist::PlayPrevious(PlayerControl &pc) ...@@ -190,17 +190,12 @@ playlist::PlayPrevious(PlayerControl &pc)
} }
PlaylistResult PlaylistResult
playlist::SeekSongPosition(PlayerControl &pc, unsigned song, float seek_time) playlist::SeekSongOrder(PlayerControl &pc, unsigned i, float seek_time)
{ {
if (!queue.IsValidPosition(song)) assert(queue.IsValidOrder(i));
return PlaylistResult::BAD_RANGE;
const Song *queued_song = GetQueuedSong(); const Song *queued_song = GetQueuedSong();
unsigned i = queue.random
? queue.PositionToOrder(song)
: song;
pc.ClearError(); pc.ClearError();
stop_on_error = true; stop_on_error = true;
error_count = 0; error_count = 0;
...@@ -229,6 +224,19 @@ playlist::SeekSongPosition(PlayerControl &pc, unsigned song, float seek_time) ...@@ -229,6 +224,19 @@ playlist::SeekSongPosition(PlayerControl &pc, unsigned song, float seek_time)
} }
PlaylistResult PlaylistResult
playlist::SeekSongPosition(PlayerControl &pc, unsigned song, float seek_time)
{
if (!queue.IsValidPosition(song))
return PlaylistResult::BAD_RANGE;
unsigned i = queue.random
? queue.PositionToOrder(song)
: song;
return SeekSongOrder(pc, i, seek_time);
}
PlaylistResult
playlist::SeekSongId(PlayerControl &pc, unsigned id, float seek_time) playlist::SeekSongId(PlayerControl &pc, unsigned id, float seek_time)
{ {
int song = queue.IdToPosition(id); int song = queue.IdToPosition(id);
......
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