From 53b9031c366ff19a1e42971bcfc64316126759f3 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Tue, 3 Feb 2026 05:16:17 -0600 Subject: [PATCH] fix(player): sync track changes from remote control When tracks are changed externally (via PWA remote control), the desktop player now detects the track_id mismatch and fetches the new track info from the backend queue. This fixes bidirectional sync where skipping tracks on the PWA wasn't reflected in the QBZ desktop UI. --- src/lib/stores/playerStore.ts | 46 ++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/src/lib/stores/playerStore.ts b/src/lib/stores/playerStore.ts index d80406e05..89cf007c6 100644 --- a/src/lib/stores/playerStore.ts +++ b/src/lib/stores/playerStore.ts @@ -75,6 +75,22 @@ interface PlaybackEvent { bit_depth: number | null; // Actual stream bit depth } +// Queue track from backend (for external track sync) +interface QueueTrack { + id: number; + title: string; + artist: string; + album: string; + duration_secs: number; + artwork_url: string | null; + hires: boolean; + bit_depth: number | null; + sample_rate: number | null; + is_local?: boolean; + album_id?: string | null; + artist_id?: number | null; +} + // ============ State ============ /** @@ -419,9 +435,37 @@ export function setOnTrackEnded(callback: () => Promise): void { * Handle playback event from backend */ async function handlePlaybackEvent(event: PlaybackEvent): Promise { + // Track changed externally (e.g., from remote control) + if (event.track_id !== 0 && (!currentTrack || event.track_id !== currentTrack.id)) { + console.log('[Player] Track changed externally, fetching new track info...'); + try { + const queueTrack = await invoke('get_current_queue_track'); + if (queueTrack && queueTrack.id === event.track_id) { + currentTrack = { + id: queueTrack.id, + title: queueTrack.title, + artist: queueTrack.artist, + album: queueTrack.album, + artwork: queueTrack.artwork_url || '', + duration: queueTrack.duration_secs, + quality: queueTrack.hires ? 'Hi-Res' : 'CD Quality', + bitDepth: queueTrack.bit_depth, + samplingRate: queueTrack.sample_rate, + isLocal: queueTrack.is_local, + albumId: queueTrack.album_id, + artistId: queueTrack.artist_id + }; + duration = queueTrack.duration_secs; + console.log('[Player] Updated to external track:', queueTrack.title); + } + } catch (err) { + console.error('[Player] Failed to fetch external track:', err); + } + } + if (!currentTrack) return; - // Only update if we have a matching track + // Update playback state if track matches if (event.track_id === currentTrack.id) { currentTime = event.position; isPlaying = event.is_playing;