Skip to content

fix: seek near end #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
defaultdino merged 2 commits into from
Oct 23, 2026
Merged

fix: seek near end #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b3f68
wait for seeks instead of exiting on track finished decoding
defaultdino Oct 23, 2026
766245e
format
defaultdino Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/audio/player.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,17 @@ fn decode(
return;
}
};
// after `End` we stay alive for seeks until the player drops the track
let mut ended = false;
loop {
if let Some((generation, ms)) = seeks.try_iter().last() {
let mut seek = seeks.try_iter().last();

if ended && seek.is_none() {
let Ok(s) = seeks.recv() else { return };
seek = Some(seeks.try_iter().last().unwrap_or(s));
}

if let Some((generation, ms)) = seek {
let reached_ms = dec.seek(ms).map_err(|e| format!("seek: {e:#}"));
if out
.send(Chunk::Seeked {
Expand All @@ -149,8 +158,9 @@ fn decode(
Chunk::Failed(format!("{}: {e:#}", track.title))
}
};
let last = !matches!(chunk, Chunk::Pcm(..));
if out.send(chunk).is_err() || last {
let failed = matches!(chunk, Chunk::Failed(_));
ended = matches!(chunk, Chunk::End);
if out.send(chunk).is_err() || failed {
return;
}
}
Expand Down Expand Up @@ -451,7 +461,7 @@ impl Player {
};
let (track, awaiting_seek) = (cur.track.clone(), cur.awaiting_seek);
match chunk {
Chunk::Pcm(..) if awaiting_seek => {}
Chunk::Pcm(..) | Chunk::End if awaiting_seek => {}
Chunk::Pcm(rate, pcm) => {
if !cur.start_queued {
cur.start_queued = true;
Expand Down
Loading