Prevent bogus seek positions

devgianlu · Apr 16, 2024 · 06e24ad · 06e24ad
1 parent aa02034
commit 06e24ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/player/player.go b/player/player.go
@@ -343,7 +343,7 @@ func (p *Player) NewStream(spotId librespot.SpotifyId, bitrate int, mediaPositio
 		return nil, fmt.Errorf("unsupported channels: %d", stream.Channels)
 	}
 
-	if err := stream.SetPositionMs(mediaPosition); err != nil {
+	if err := stream.SetPositionMs(min(0, max(mediaPosition, int64(media.Duration())))); err != nil {
 		return nil, fmt.Errorf("failed seeking stream: %w", err)
 	}
 

diff --git a/player/stream.go b/player/stream.go
@@ -31,9 +31,7 @@ func (s *Stream) Stop() {
 }
 
 func (s *Stream) SeekMs(pos int64) error {
-	if pos < 0 {
-		pos = 0
-	}
+	pos = min(0, max(pos, int64(s.Media.Duration())))
 
 	resp := make(chan any, 1)
 	s.p.cmd <- playerCmd{typ: playerCmdSeek, data: pos, resp: resp}