mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-21 23:05:46 +00:00
45b9229ceb
* refactor(queue): wire queue UI to the track resolver (thin-state phase 3) cucadmuh's phase-3 steps: - Selectors (useQueueTracks) read resolver-first: getCachedTrack → queue: Track[] fallback (until phase 4), F4 star/rating overrides merged on read. - QueueList rows source their track from the resolver (queue fallback); rows show title/artist/duration only, so no override merge there. - pendingStarSync star/rating success → invalidateQueueResolver so the cache reflects the synced value. - queueResolverBridge re-seeds on queueIndex change too — the prefetch window travels with the playing track. Additive: queue: Track[] stays canonical and behaviour is unchanged (rows resolve to the same data). Phase 4 drops queue: Track[] and the fallbacks. * docs(changelog): queue panel reads through track cache (#860) * fix(queue): stop a render loop that froze the UI on long queues A long virtualized queue + a track change could lock the WebView for ~2 min: - useVirtualizer was handed a fresh `initialRect` object literal every render, so it kept re-initializing in a loop. Hoisted it to a stable module constant. - getCachedTrack did an LRU bump (Map delete+set) during render — a render-time side effect. Made it a pure read; recency is set at write time in cacheSet. * perf(mobile): virtualize the mobile player queue drawer The mobile now-playing queue drawer rendered the full queue with .map; a multi-thousand-track queue meant thousands of DOM nodes. Virtualize it with @tanstack/react-virtual (uniform rows, stable initialRect) so the DOM stays at O(visible rows), matching the desktop QueuePanel. Active track is centred on open via scrollToIndex. * perf(mini): virtualize the mini-player queue list The mini-player queue rendered the full MiniSyncPayload queue with .map. Virtualize it against the OverlayScrollArea viewport (stable initialRect) so the mini window's DOM stays at O(visible rows). Drag-reorder is preserved: rows keep data-mq-idx alongside the virtualizer's measureElement. * refactor(queue): add resolveQueueTrack/getQueueTracksView helper (thin-state phase 4) Render-safe ref→Track view for the phase-4 consumer migration off queue: Track[]. Resolver cache → caller fallback (legacy queue[idx] during dual-write) → placeholder; ref queue-only flags carried, F4 overrides merged. Pure synchronous read, no cache mutation (the freeze landmine), so it is safe in render. * refactor(queue): keep queueItems as the canonical in-memory mirror (thin-state phase 4) Step 1b: dual-write the thin queueItems ref list at every queue write site (the 11 mutations, next/radio top-up, playTrack, undo/redo restore, instant-mix, radio, server-queue init, lucky-mix rollback, and hydrate) so it tracks queue: Track[] in memory, not only at persist time. Identity-preserving maps (star/rating overrides) keep the same refs and are intentionally left untouched. Resolves the restore double-role flagged for 1b: queueItemsIndex is now the restore-pending sentinel that gates hydrateQueueFromIndex, while queueItems stays canonical -- rebuilt from the whole queue after a full hydrate instead of cleared. Normal mutations never set the sentinel, so it only fires on a fresh cold-start restore, not on later server switches. No behaviour change; queue: Track[] stays the source consumers read until phase 3. tsc + full vitest suite (1119 tests) green. * refactor(queue): mobile queue drawer reads through the track resolver (thin-state phase 4) Step 2: the mobile now-playing queue drawer resolves each row's track from the resolver cache (→ queue: Track[] fallback until phase 4), matching the desktop QueueList wired in the phase-3 commit. Subscribes to the resolver version so rows re-render as the cache fills. Structure (count, order, keys, the playTrack arg) still comes from queue: Track[] until it is dropped in the final step. The mobile drawer was the last queue display surface still reading track metadata straight off the fat queue. tsc + full vitest suite green. * refactor(queue): ref-native queue mutations + dual-write bridge (thin-state phase 4) Step 3a: the 11 queueMutationActions now splice/filter/reorder QueueItemRef[] (matching by trackId + the ref's queue-only flags) instead of Track[]. `bridgeQueueFromItems` rebuilds the dual-written queue: Track[] from the new refs by id — purely structural (no resolver/override merge), so behaviour is byte-identical and playerStore.queue.test.ts stays unchanged green. The working ref list comes from `itemsOf(state)` (derived from queue: Track[] for now); the final step swaps that one line to state.queueItems once the fat queue is gone. enqueue / enqueueAt / enqueueRadio seed the resolver cache with incoming tracks (seed-before-splice) so they resolve without a network round-trip after the fat queue is dropped. Adds a DEV-only id-parity guardrail (queue vs queueItems); dev-runtime only, silent in vitest and prod. tsc + full vitest suite (1119) green; contract test unchanged. * refactor(queue): ref-native radio/infinite top-ups (thin-state phase 4) Step 3b: nextAction's proactive infinite-queue and radio top-ups build the new queue as QueueItemRef[] and bridge back to queue: Track[] (same as the queue mutations), and seed the resolver cache with the freshly fetched tracks so they resolve without a network round-trip after the fat queue is dropped. The radio top-up keeps its HISTORY_KEEP front-trim, now expressed on refs. The exhausted-queue refill paths hand their new queue to playTrack, which keeps its fat-queue handling until the final step (its no-arg case needs the resolver- derived queue that lands with the queue: Track[] removal). tsc + full vitest (1119) green; contract test unchanged. * refactor(queue): undo snapshots store thin refs, not Track[] (thin-state phase 4) Step 4: QueueUndoSnapshot.queue: Track[] becomes queueItems: QueueItemRef[], killing the undo "hidden multiplier" — 32 snapshots of a 50k queue now cost refs, not 32×50k full tracks. applyQueueHistorySnapshot rebuilds the display queue from the refs via resolveQueueTrack: resolver cache → the live queue by id (covers tracks the edit didn't remove) → placeholder. currentTrack stays a full track in the snapshot and is restored to the engine unchanged. The snapshot refs derive from queue: Track[] for now (so the undo/redo contract cases, which seed only `queue`, stay green); the final step swaps that to [...s.queueItems]. tsc + full vitest suite (1119) green. * perf(mini): cap the mini-player queue snapshot to ±100 around the current track (thin-state phase 4) Step 5: the mini bridge no longer serializes the full queue over IPC on every push — a 50k Artist-Radio queue would otherwise re-encode in full on every track advance. snapshot() sends a window of 100 tracks before/after the playing song; queueIndex is made slice-relative. The mini component stays unchanged (slice- relative); jump/reorder/remove control events are translated back to absolute queue indices via the window offset captured on the last push. tsc + full vitest suite (1119) green. Mini bridge has no unit tests — needs a quick mini-player smoke (queue shows ±100, jump/reorder/remove land correctly). * refactor(queue): make queueItems a required PlayerState field (thin-state phase 4) Foundation for the final consumer migration off queue: Track[]: queueItems has been written at every queue write site since phase 1b, so promoting it from optional to required is a no-op at runtime (tsc confirms zero new errors) and lets the upcoming reader migrations read state.queueItems without `?? []` noise. * refactor(queue): migrate structural queue readers off queue: Track[] (thin-state phase 4) First reader batch toward dropping queue: Track[]: the queue-length selectors (usePlaybackServerId, usePlaybackCoverArt, useQueuePanelDrag, useMiniQueueDrag) now read state.queueItems.length, and FullscreenPlayer's next-track cover prefetch resolves through useQueueTrackAt instead of indexing the fat queue. All behaviour- identical during dual-write (queueItems is in lockstep with queue). tsc + full vitest suite (1119) green. Note: getPlaybackServerId() (playbackServer.ts) deliberately stays on queue for now — it is called from many partially-mocked test stores, so it migrates with the final field removal where the seedQueue helper covers those tests. * refactor(queue): QueuePanel save/share/playlist read queueItems (thin-state phase 4) The id/length reads (save to playlist, share link, create playlist, empty-queue guards, next-tracks divider) now read state.queueItems instead of the fat queue. Behaviour-identical during dual-write; queue: Track[] stays for the rendered QueueList + auto-scroll until the field is dropped. tsc + full suite (1119) green. * refactor(queue): drop queue: Track[] — thin queueItems is the only queue (thin-state phase 4) The store no longer holds the fat queue. `queueItems: QueueItemRef[]` is the sole canonical queue; full `Track`s resolve on demand via the resolver (index batch → getSong fallback, bounded LRU cache); only `currentTrack` stays a full Track. At 50k tracks the store holds ~hundreds of resolved tracks + the refs, not 50k Track objects. - **Persist:** partialize is refs-only (no windowed slice / PERSIST_QUEUE_HALF). A `merge` migrates every historical blob shape → `queueItems` (existing `queueItems` → legacy `queueRefs` → pre-ref windowed `queue: Track[]`) and drops the obsolete `queue` key, so saved queues survive the upgrade. - **Restore (decision B):** `hydrateQueueFromIndex` eager-resolves the whole ref list into the cache on cold start (index → getSong, so an index-off queue still plays), clears the restore sentinel. - **Resolver bridge:** keeps `[idx-50, idx+200]` warm via `resolveVisibleRange`. - **Mutations / actions / playback:** operate on refs; the playing track is `currentTrack`, the next/neighbour tracks resolve from the cache. Navigation (next/previous/row-jump) keeps `queueItems` and only moves the index — no full resolve or queue rebuild per track change. - **Persist tests** cover the three old-blob migrations; `seedQueue` test helper replaces the `setState({ queue })` seeds. tsc + full vitest suite (1115) green. Behaviour-preserving by the test contract; the gapless track change + cold-start restore + mini cap still want a live smoke before merge. * fix(queue): star/rating keeps the queue row resolved instead of blanking to "…" (thin-state) Rating/starring a queue song flashed the row's title to the "…" placeholder until the next track change. Root cause: on sync success pendingStarSync called invalidateQueueResolver, which DROPPED the cached track — and with queue: Track[] gone there's no fat fallback, so the row resolved to a placeholder until the resolver bridge re-fetched the window. Fix: add patchCachedTrack(trackId, patch) and use it on star/rating success to update the cached entry in place (title kept, synced starred/userRating applied) instead of dropping it. No placeholder flash, no re-fetch. tsc + full vitest suite (1115) green. * fix(player): quota-safe persist so a full localStorage can't kill playback A very large queue (~50k refs) overflows the localStorage quota; the persist write then threw QuotaExceededError from inside set(), which aborted playTrack before audio_play — no audio output at all. Back the player persist with a quota-safe storage wrapper so a failed write degrades to a no-op instead of throwing. Restoring the full ref list at that ceiling (vs a windowed cap) is left as a follow-up. * polish(player): throttle the quota-skip persist warning to once per key The quota-safe persist logs a skip on every failed write; on a huge queue that floods the dev console once per mutation. Warn once per key per quota-exceeded streak, re-armed when a write to that key next succeeds. * fix(queue): port new cover-pipeline readers to thin-state Main's cover pipeline (#870) reads s.queue.length and seeds the player store with queue: [track] in its tests. Under thin-state, queue: Track[] no longer exists — the canonical queue is queueItems: QueueItemRef[]. These four files were brought across in the merge but still spoke the old shape; this commit aligns them with the thin-state contract. - src/cover/usePlaybackCoverArt: queueLength = queueItems.length - src/cover/usePlaybackCoverArt.test: seed via toQueueItemRefs - src/api/coverCache.test: same - src/hooks/useNowPlayingPrewarm.test: same (two test cases) * fix(queue): canonicalize thin-state server identity for mixed-server queues `QueueItemRef.serverId` and `PlayerState.queueServerId` are now written as the URL-derived index key on every writer path, matching the library index direction. Mixed-server queues with duplicate `trackId` across servers stay unambiguous because the resolver cache, persistence, and playback bindings all share one key shape. - new `canonicalQueueServerKey()` helper (idempotent UUID-or-key normalizer) - `toQueueItemRefs`, `bindQueueServerForPlayback`, `seedQueueResolver`, and `hydrateQueueFromIndex` emit canonical keys - `getCachedTrack` falls back to the canonical lookup so refs persisted in the legacy UUID shape still resolve through the migration window - persist `merge` rewrites `queueServerId` and every ref `serverId` on rehydrate, so the live store never holds mixed shapes - `removeServer` compares against the resolved id so a profile delete still clears the matching queue binding - the two `playbackServer.test.ts` asserts that hard-coded the UUID shape are updated to the canonical key (existing reader-tolerance is unchanged) * fix(queue-undo): bind snapshot prepend to snapshot-canonical server identity When `applyQueueHistorySnapshot` has to prepend the still-playing track (the snapshot's queue does not contain it), the new ref must follow the snapshot's playback server, not the live `queueServerId`. A server switch racing the undo would otherwise stamp the prepended ref with the new server, mis-resolving the playing track on the very next render. - `QueueUndoSnapshot` now carries `queueServerId` (captured by `queueUndoSnapshotFromState`); older in-memory entries fall back through the snapshot's own refs and finally the live store value - the prepend in `applyQueueHistorySnapshot` plus the post-restore `seedQueueResolver` both source the server identity from this snapshot context, run through `canonicalQueueServerKey` so cache bucket and ref shape stay in lockstep * test(queue): regression cluster for mixed-server queues with duplicate trackId Covers the four invariants the thin-state review called out: - resolver correctness: same `trackId` on two servers maps to two distinct cache entries via canonical keys, and legacy UUID-shaped refs still read the same entries through the compat lookup path - restore/hydrate: persist `merge` forward-migrates UUID-form blobs in three shapes (canonical `queueItems`, legacy `queueRefs`, mixed-server `queueItems`) to canonical keys - undo snapshot application: prepended ref follows the snapshot's playback server even when the live queue has been rebound to a different one, with fallback to snapshot refs and live state for legacy entries - queue sync id emission: `flushPlayQueuePosition` -> `savePlayQueue` passes plain track ids and the playback server out of band, no per-ref `serverId` ever leaks into the request body Also asserts the write helpers (`toQueueItemRefs`, `bindQueueServerForPlayback`) emit canonical keys directly. * perf(queue-header): coalesce resolver burst updates and aggregate in one pass `QueueHeader` recomputed total and remaining queue durations on every resolver cache version bump via two separate full-queue reduces. A mass resolve burst (queue restore, prefetch window slide) bumps the version dozens of times in one frame, and very long queues turned that into visible main-thread stutter. - one pass: a single for-loop produces both total and future-tracks duration; a 50k-track queue costs one walk per recompute, not two - `useDeferredValue(version)` coalesces the burst into a single low-priority commit so the cache version is only sampled once per React frame instead of once per cache write * fix(queue): use stable artist seed for radio top-up The proactive radio top-up in `runNext` seeded `getSimilarSongs2` and `getTopSongs` from `resolveQueueTrack(nextRef)` metadata. When the next ref is still cold in the resolver cache, the placeholder track has empty artist fields, and the top-up would fire `getSimilarSongs2('')` -- silently returning nothing and leaving the queue dry just before the radio rail would have refilled. - prefer the just-played `currentTrack` (always fully resolved in the player store) and the stored radio seed artist id - fall back to the next-track metadata only when those are missing - skip the top-up entirely when no stable seed is available, instead of emitting a non-deterministic empty request * docs(changelog): queue mixed-server routing and quota-safe persist (#872)
243 lines
8.8 KiB
TypeScript
243 lines
8.8 KiB
TypeScript
import { reportNowPlaying } from '../api/subsonicScrobble';
|
|
import { invoke } from '@tauri-apps/api/core';
|
|
import { getPlaybackServerId } from '../utils/playback/playbackServer';
|
|
import { getPlaybackSourceKind } from '../utils/playback/resolvePlaybackUrl';
|
|
import { useAuthStore } from './authStore';
|
|
import {
|
|
bumpPlayGeneration,
|
|
getPlayGeneration,
|
|
setIsAudioPaused,
|
|
} from './engineState';
|
|
import { clearPreloadingIds } from './gaplessPreloadState';
|
|
import { deriveNormalizationSnapshot } from './normalizationSnapshot';
|
|
import type { PlayerState, QueueItemRef } from './playerStoreTypes';
|
|
import { resolveQueueTrack } from '../utils/library/queueTrackView';
|
|
import { seedQueueResolver } from '../utils/library/queueTrackResolver';
|
|
import { canonicalQueueServerKey } from '../utils/server/serverIndexKey';
|
|
import { sameQueueTrackId } from '../utils/playback/queueIdentity';
|
|
import { queueUndoRestoreAudioEngine } from './queueUndoAudioRestore';
|
|
import {
|
|
setPendingQueueListScrollTop,
|
|
type QueueUndoSnapshot,
|
|
} from './queueUndo';
|
|
import { refreshLoudnessForTrack } from './loudnessRefresh';
|
|
import { refreshWaveformForTrack } from './waveformRefresh';
|
|
import { stopRadio } from './radioPlayer';
|
|
import { clearAllPlaybackScheduleTimers } from './scheduleTimers';
|
|
import { syncQueueToServer } from './queueSync';
|
|
|
|
type SetState = (
|
|
partial: Partial<PlayerState> | ((state: PlayerState) => Partial<PlayerState>),
|
|
) => void;
|
|
type GetState = () => PlayerState;
|
|
|
|
/**
|
|
* Apply a queue-undo snapshot to the player store and resync the Rust
|
|
* audio engine where needed. Used by both `undoLastQueueEdit` and
|
|
* `redoLastQueueEdit` actions inside the store.
|
|
*
|
|
* Behaviour matrix:
|
|
* - **Snapshot has no current track but playback is live** — keep the
|
|
* playing track and prepend it to the restored queue (or rebind by
|
|
* id when it's already there).
|
|
* - **Snapshot's current track matches the live one** — keep playback
|
|
* going, restore queue + position only.
|
|
* - **Snapshot's current track differs** — issue a full audio_play via
|
|
* `queueUndoRestoreAudioEngine` to put the engine on the snapshot
|
|
* track at the captured position.
|
|
*
|
|
* Returns false only when nothing changed (caller shows no toast).
|
|
*/
|
|
export function applyQueueHistorySnapshot(
|
|
snap: QueueUndoSnapshot,
|
|
prior: PlayerState,
|
|
set: SetState,
|
|
get: GetState,
|
|
): boolean {
|
|
if (prior.currentRadio) {
|
|
stopRadio();
|
|
}
|
|
// Rebuild the display queue from the snapshot's thin refs (thin-state):
|
|
// resolver cache → placeholder. The canonical queue is the snapshot's refs;
|
|
// this resolved `nextQueue` is only for the engine restore / normalization /
|
|
// prepend logic below. The playing track is restored separately from the full
|
|
// `snap.currentTrack`.
|
|
let nextQueue = snap.queueItems.map(ref => resolveQueueTrack(ref));
|
|
let nextItems: QueueItemRef[] = [...snap.queueItems];
|
|
let nextIndex = snap.queueIndex;
|
|
let nextTrack = snap.currentTrack ? { ...snap.currentTrack } : null;
|
|
|
|
if (snap.currentTrack == null && prior.currentTrack) {
|
|
const playing = prior.currentTrack;
|
|
const pos = nextQueue.findIndex(t => sameQueueTrackId(t.id, playing.id));
|
|
if (pos === -1) {
|
|
// Prepend ref must bind to the *snapshot's* playback server (H3): a live
|
|
// server switch racing the undo would otherwise stamp the prepended ref
|
|
// with the new server, mis-resolving the still-playing track. Snapshot
|
|
// fields take precedence; existing refs in the snapshot are the next
|
|
// fallback (they share the snapshot's server); live `queueServerId` is
|
|
// last resort. Canonical key everywhere (B1).
|
|
const snapshotSid =
|
|
snap.queueServerId
|
|
?? snap.queueItems[0]?.serverId
|
|
?? get().queueServerId
|
|
?? '';
|
|
const prependServerId = canonicalQueueServerKey(snapshotSid);
|
|
nextQueue = [{ ...playing }, ...nextQueue];
|
|
nextItems = [
|
|
{ serverId: prependServerId, trackId: playing.id },
|
|
...nextItems,
|
|
];
|
|
nextIndex = 0;
|
|
nextTrack = { ...playing };
|
|
} else {
|
|
nextTrack = { ...playing };
|
|
nextIndex = pos;
|
|
}
|
|
}
|
|
|
|
nextIndex = Math.max(0, Math.min(nextIndex, Math.max(0, nextQueue.length - 1)));
|
|
|
|
const keepPlaybackFromPrior =
|
|
prior.currentTrack != null
|
|
&& nextTrack != null
|
|
&& sameQueueTrackId(prior.currentTrack.id, nextTrack.id)
|
|
&& nextQueue.some(t => sameQueueTrackId(t.id, prior.currentTrack!.id))
|
|
&& (
|
|
(snap.currentTrack != null && sameQueueTrackId(prior.currentTrack.id, snap.currentTrack.id))
|
|
|| snap.currentTrack == null
|
|
);
|
|
|
|
if (keepPlaybackFromPrior) {
|
|
const playingKeep = prior.currentTrack;
|
|
if (playingKeep) {
|
|
const idxPrior = nextQueue.findIndex(t => sameQueueTrackId(t.id, playingKeep.id));
|
|
if (idxPrior >= 0) {
|
|
nextIndex = idxPrior;
|
|
nextTrack = { ...playingKeep };
|
|
}
|
|
}
|
|
}
|
|
|
|
let tRestoreRaw = typeof snap.currentTime === 'number' && Number.isFinite(snap.currentTime)
|
|
? snap.currentTime
|
|
: 0;
|
|
let playingRestore = snap.isPlaying !== false;
|
|
if (keepPlaybackFromPrior && prior.currentTrack) {
|
|
tRestoreRaw = prior.currentTime;
|
|
playingRestore = prior.isPlaying;
|
|
}
|
|
const durForProgress = nextTrack?.duration && nextTrack.duration > 0 ? nextTrack.duration : null;
|
|
let pRestore = typeof snap.progress === 'number' && Number.isFinite(snap.progress)
|
|
? snap.progress
|
|
: (durForProgress != null && durForProgress > 0
|
|
? Math.max(0, Math.min(1, tRestoreRaw / durForProgress))
|
|
: 0);
|
|
if (keepPlaybackFromPrior) {
|
|
pRestore = prior.progress;
|
|
}
|
|
const tRestore = durForProgress != null
|
|
? Math.max(0, Math.min(tRestoreRaw, durForProgress))
|
|
: Math.max(0, tRestoreRaw);
|
|
|
|
const keepWaveform =
|
|
prior.currentTrack?.id != null &&
|
|
nextTrack?.id != null &&
|
|
sameQueueTrackId(prior.currentTrack.id, nextTrack.id);
|
|
const norm =
|
|
nextTrack != null
|
|
? deriveNormalizationSnapshot(nextTrack, nextQueue, nextIndex)
|
|
: ({
|
|
normalizationNowDb: null,
|
|
normalizationTargetLufs: null,
|
|
normalizationEngineLive: 'off',
|
|
} as Pick<
|
|
PlayerState,
|
|
'normalizationNowDb' | 'normalizationTargetLufs' | 'normalizationEngineLive'
|
|
>);
|
|
const playbackSid = getPlaybackServerId();
|
|
const playbackSourceUndo = nextTrack
|
|
? getPlaybackSourceKind(nextTrack.id, playbackSid, null)
|
|
: null;
|
|
const playbackSourceFinal = keepPlaybackFromPrior && prior.currentPlaybackSource != null
|
|
? prior.currentPlaybackSource
|
|
: playbackSourceUndo;
|
|
|
|
clearAllPlaybackScheduleTimers();
|
|
set({
|
|
scheduledPauseAtMs: null,
|
|
scheduledPauseStartMs: null,
|
|
scheduledResumeAtMs: null,
|
|
scheduledResumeStartMs: null,
|
|
});
|
|
|
|
clearPreloadingIds();
|
|
|
|
let gen = getPlayGeneration();
|
|
const resyncEngine = Boolean(nextTrack) && !keepPlaybackFromPrior;
|
|
if (resyncEngine || !nextTrack) {
|
|
gen = bumpPlayGeneration();
|
|
if (resyncEngine) {
|
|
setIsAudioPaused(false);
|
|
}
|
|
}
|
|
|
|
// Seed the resolver with the playing track so its ref always resolves (it may
|
|
// have been prepended and not yet in the cache window). Same canonical key
|
|
// source as the prepend above — keeps cache bucket and ref serverId in lockstep
|
|
// even when a server switch races the undo.
|
|
const seedSid = canonicalQueueServerKey(
|
|
snap.queueServerId
|
|
?? snap.queueItems[0]?.serverId
|
|
?? get().queueServerId
|
|
?? '',
|
|
);
|
|
if (seedSid && nextTrack) seedQueueResolver(seedSid, [nextTrack]);
|
|
set({
|
|
queueItems: nextItems,
|
|
queueIndex: nextIndex,
|
|
currentTrack: nextTrack,
|
|
currentRadio: null,
|
|
currentTime: tRestore,
|
|
progress: pRestore,
|
|
isPlaying: playingRestore,
|
|
waveformBins: keepWaveform ? prior.waveformBins : null,
|
|
enginePreloadedTrackId: keepPlaybackFromPrior ? prior.enginePreloadedTrackId : null,
|
|
currentPlaybackSource: playbackSourceFinal,
|
|
...norm,
|
|
});
|
|
|
|
if (!nextTrack) {
|
|
invoke('audio_stop').catch(console.error);
|
|
setIsAudioPaused(false);
|
|
syncQueueToServer(nextItems, null, 0);
|
|
if (typeof snap.queueListScrollTop === 'number' && Number.isFinite(snap.queueListScrollTop)) {
|
|
setPendingQueueListScrollTop(Math.max(0, snap.queueListScrollTop));
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void refreshWaveformForTrack(nextTrack.id);
|
|
void refreshLoudnessForTrack(nextTrack.id);
|
|
get().updateReplayGainForCurrentTrack();
|
|
|
|
if (!keepPlaybackFromPrior) {
|
|
const { nowPlayingEnabled: npUndo } = useAuthStore.getState();
|
|
if (npUndo) reportNowPlaying(nextTrack.id, getPlaybackServerId());
|
|
|
|
queueUndoRestoreAudioEngine({
|
|
generation: gen,
|
|
track: nextTrack,
|
|
queue: nextQueue,
|
|
queueIndex: nextIndex,
|
|
atSeconds: tRestore,
|
|
wantPlaying: playingRestore,
|
|
});
|
|
}
|
|
if (typeof snap.queueListScrollTop === 'number' && Number.isFinite(snap.queueListScrollTop)) {
|
|
setPendingQueueListScrollTop(Math.max(0, snap.queueListScrollTop));
|
|
}
|
|
syncQueueToServer(nextItems, nextTrack, tRestore);
|
|
return true;
|
|
}
|