Joren/qbz
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #583 from afonsojramos/bugfix/internal/cancel-superseded-play

Browse Source 
fix(player): cancel superseded play_track completions
This commit is contained in:
Victor RH authored and GitHub committed 2026-07-12 19:39:54 -06:00
2 parents b99598e122 101490043d
commit 287c3e93b5
2 files changed
+98 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/qbz-player/src/player/mod.rs
+69 -6
View File
@@ -1308,6 +1308,10 @@ pub struct Player {
/// Two-level playback cache (L1 memory + optional L2 disk). A track is
/// cached after its first play so replays start instantly.
audio_cache: Arc<qbz_cache::AudioCache>,
/// Monotonic play generation. Bumped on every new play intent so a slow
/// `play_track` (network/CMAF) that finishes after a newer play cannot
/// restart the previous track (last-writer race on `AudioCommand::Play`).
play_generation: AtomicU64,
}
impl Default for Player {
@@ -3784,9 +3788,21 @@ impl Player {
visualizer_tap,
diagnostic,
audio_cache,
play_generation: AtomicU64::new(0),
}
}
/// Start a new play intent; returns the generation token for this intent.
/// Any earlier in-flight `play_track` whose generation no longer matches
/// must not start audio.
fn begin_play(&self) -> u64 {
self.play_generation.fetch_add(1, Ordering::SeqCst) + 1
}
fn is_current_play(&self, gen: u64) -> bool {
self.play_generation.load(Ordering::SeqCst) == gen
}
/// Play a track by ID.
///
/// First attempts the CMAF streaming pipeline (Akamai CDN, encrypted
@@ -3802,8 +3818,10 @@ impl Player {
quality: Quality,
start_position_secs: u64,
) -> Result<(), String> {
// Supersede any earlier in-flight play_track for a different intent.
let gen = self.begin_play();
log::info!(
"Player: Starting playback for track {} with quality {:?} (start {}s)",
"Player: Starting playback for track {} with quality {:?} (start {}s, gen {gen})",
track_id,
quality,
start_position_secs
@@ -3819,16 +3837,23 @@ impl Player {
quality
);
} else {
if !self.is_current_play(gen) {
log::info!(
"Player: cache-hit play for track {track_id} superseded (gen {gen})"
);
return Ok(());
}
log::info!(
"[CACHE HIT] Track {} ({} bytes) — playing from cache",
track_id,
cached.size_bytes
);
let r = self.play_data(cached.data, track_id);
// Use apply_play_data so we do not bump generation again.
let r = self.apply_play_data(cached.data, track_id);
// Cached tracks play from in-memory data (no streaming resume
// offset); honor a session-resume position with a best-effort
// seek once playback has been handed to the audio thread.
if r.is_ok() && start_position_secs > 0 {
if r.is_ok() && start_position_secs > 0 && self.is_current_play(gen) {
let _ = self.seek(start_position_secs);
}
return r;
@@ -3848,6 +3873,12 @@ impl Player {
log::info!("[CMAF] Attempting CMAF streaming for track {}", track_id);
match qbz_qobuz::cmaf::setup_streaming(client, track_id, quality).await {
Ok(cmaf_info) => {
if !self.is_current_play(gen) {
log::info!(
"Player: CMAF setup for track {track_id} superseded (gen {gen})"
);
return Ok(());
}
// Derive stream parameters from init segment metadata.
let sample_rate = cmaf_info.sampling_rate.unwrap_or(44100);
let channels = 2u16; // FLAC from Qobuz is always stereo
@@ -3950,6 +3981,13 @@ impl Player {
}
}
if !self.is_current_play(gen) {
log::info!(
"Player: legacy path for track {track_id} superseded before URL fetch (gen {gen})"
);
return Ok(());
}
// Legacy fallback: get the stream URL
log::info!("Player: Getting stream URL...");
let stream_url = client
@@ -3960,6 +3998,13 @@ impl Player {
format!("Failed to get stream URL: {}", e)
})?;
if !self.is_current_play(gen) {
log::info!(
"Player: legacy download for track {track_id} superseded after URL (gen {gen})"
);
return Ok(());
}
log::info!(
"Player: Got stream URL: {} (format: {})",
stream_url.url,
@@ -3974,14 +4019,21 @@ impl Player {
})?;
log::info!("Player: Cached {} bytes of audio data", audio_data.len());
if !self.is_current_play(gen) {
log::info!(
"Player: legacy play for track {track_id} superseded after download (gen {gen})"
);
return Ok(());
}
// Store the legacy download in the cache for instant replay.
if !skip_cache {
self.audio_cache.insert(track_id, audio_data.clone());
}
// Send to audio thread
let r = self.play_data(audio_data, track_id);
if r.is_ok() && start_position_secs > 0 {
// Send to audio thread (do not re-bump generation)
let r = self.apply_play_data(audio_data, track_id);
if r.is_ok() && start_position_secs > 0 && self.is_current_play(gen) {
let _ = self.seek(start_position_secs);
}
r
@@ -4386,7 +4438,18 @@ impl Player {
}
/// Play from raw audio data (for cached tracks)
/// Play from raw audio data (for cached / offline tracks).
///
/// Bumps play generation so this call supersedes any in-flight
/// `play_track` that has not yet applied audio.
pub fn play_data(&self, data: Vec<u8>, track_id: u64) -> Result<(), String> {
let _gen = self.begin_play();
self.apply_play_data(data, track_id)
}
/// Send `Play` without bumping generation (used by `play_track` after
/// its own `begin_play` + supersede checks).
fn apply_play_data(&self, data: Vec<u8>, track_id: u64) -> Result<(), String> {
log::info!(
"Player: Playing {} bytes of audio data for track {}",
data.len(),
crates/qbz/src/playback.rs
+29 -16
View File
@@ -583,7 +583,7 @@ async fn play_audible(runtime: &Runtime, weak: &slint::Weak<AppWindow>, track_id
// Session resume: if this is the track restored at launch, start it at the
// saved position (consumed once); any other track starts from 0.
let start_position_secs = crate::session_persist::take_resume_for(track_id);
if let Err(e) = runtime
match runtime
.core()
.play_track_resolved(
track_id,
@@ -594,21 +594,34 @@ async fn play_audible(runtime: &Runtime, weak: &slint::Weak<AppWindow>, track_id
)
.await
{
log::error!("[qbz-slint] playback: play_track {track_id} failed: {e}");
// Superseded fetch: the user already started another play while this
// one was resolving — that newer play owns the cursor; do NOT skip.
let still_current = PENDING_PLAY_ID.load(std::sync::atomic::Ordering::Relaxed)
== track_id;
// The fetch failed: no audio will advance, so the poll loop would never
// clear the spinner. Drop it now (only if this play is still current).
clear_loading(weak, track_id);
// Tauri-parity regression fix: an unavailable track used to be
// auto-skipped by the frontend (playbackService `autoSkipToNext`,
// bounded, issue #467). Without this the queue cursor parks on the
// dead track and playback stops. Terminal errors only — transient
// failures were already retried by the client and should not skip.
if still_current && is_terminal_unavailable(&e) {
auto_skip_unavailable(runtime, weak, track_id).await;
Ok(()) => {
// Player also cancels superseded play_track work; this gates any
// post-success UI side effects if another play already owns the spinner.
let still_current = PENDING_PLAY_ID.load(std::sync::atomic::Ordering::Relaxed)
== track_id;
if !still_current {
log::info!(
"[qbz-slint] playback: play_track {track_id} completed but was superseded"
);
}
}
Err(e) => {
log::error!("[qbz-slint] playback: play_track {track_id} failed: {e}");
// Superseded fetch: the user already started another play while this
// one was resolving — that newer play owns the cursor; do NOT skip.
let still_current = PENDING_PLAY_ID.load(std::sync::atomic::Ordering::Relaxed)
== track_id;
// The fetch failed: no audio will advance, so the poll loop would never
// clear the spinner. Drop it now (only if this play is still current).
clear_loading(weak, track_id);
// Tauri-parity regression fix: an unavailable track used to be
// auto-skipped by the frontend (playbackService `autoSkipToNext`,
// bounded, issue #467). Without this the queue cursor parks on the
// dead track and playback stops. Terminal errors only — transient
// failures were already retried by the client and should not skip.
if still_current && is_terminal_unavailable(&e) {
auto_skip_unavailable(runtime, weak, track_id).await;
}
}
}
}