implement SeekFwdBackN
This commit is contained in:
@@ -183,6 +183,22 @@ func (p *playbackEngine) SeekBackOrPrevious() error {
|
|||||||
return p.PlayTrackAt(p.nowPlayingIdx - 1)
|
return p.PlayTrackAt(p.nowPlayingIdx - 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *playbackEngine) SeekFwdBackN(n int) error {
|
||||||
|
idx := p.nowPlayingIdx
|
||||||
|
if n < 0 && p.player.GetStatus().TimePos > 3 {
|
||||||
|
n += 1 // first seek back is just seek to beginning of current
|
||||||
|
}
|
||||||
|
if n == 0 || (idx == 0 && n < 0) {
|
||||||
|
return p.player.SeekSeconds(0) // seek back in current song
|
||||||
|
}
|
||||||
|
lastIdx := len(p.playQueue) - 1
|
||||||
|
if idx == lastIdx && n > 0 {
|
||||||
|
return nil // already on last track, nothing to seek next to
|
||||||
|
}
|
||||||
|
newIdx := minInt(len(p.playQueue)-1, maxInt(0, idx+n))
|
||||||
|
return p.PlayTrackAt(newIdx)
|
||||||
|
}
|
||||||
|
|
||||||
// Seek to given absolute position in the current track by seconds.
|
// Seek to given absolute position in the current track by seconds.
|
||||||
func (p *playbackEngine) SeekSeconds(sec float64) error {
|
func (p *playbackEngine) SeekSeconds(sec float64) error {
|
||||||
if p.isRadio {
|
if p.isRadio {
|
||||||
@@ -667,3 +683,17 @@ func (p *playbackEngine) doUpdateTimePos(seeked bool) {
|
|||||||
cb(s.TimePos, duration, seeked)
|
cb(s.TimePos, duration, seeked)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func minInt(a, b int) int {
|
||||||
|
if a < b {
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|
||||||
|
func maxInt(a, b int) int {
|
||||||
|
if a > b {
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|||||||
@@ -405,7 +405,7 @@ func (p *PlaybackManager) runCmdQueue(ctx context.Context) {
|
|||||||
case cmdSeekSeconds:
|
case cmdSeekSeconds:
|
||||||
p.engine.SeekSeconds(c.Arg.(float64))
|
p.engine.SeekSeconds(c.Arg.(float64))
|
||||||
case cmdSeekFwdBackN:
|
case cmdSeekFwdBackN:
|
||||||
log.Println("TODO")
|
p.engine.SeekFwdBackN(c.Arg.(int))
|
||||||
case cmdVolume:
|
case cmdVolume:
|
||||||
p.engine.SetVolume(c.Arg.(int))
|
p.engine.SetVolume(c.Arg.(int))
|
||||||
case cmdLoopMode:
|
case cmdLoopMode:
|
||||||
|
|||||||
Reference in New Issue
Block a user