vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-08 13:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix shuffle order in usePlayerData

Browse Source
This commit is contained in:
jeffvli
2025-12-04 21:19:16 -08:00
parent 566d938b6c
commit de86f687ea
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/store/player.store.ts
+18 -1
View File
@@ -2234,9 +2234,26 @@ export const usePlayerData = (): PlayerData => {
} }
const currentSong = queue.items[queueIndex]; const currentSong = queue.items[queueIndex];
const previousSong = queueIndex > 0 ? queue.items[queueIndex - 1] : undefined;
const repeat = state.player.repeat; const repeat = state.player.repeat;
// For previousSong calculation, we need to consider the shuffled order (only if not in priority mode)
let previousSong: QueueSong | undefined;
if (isShuffleEnabled(state)) {
// Calculate previous in shuffled order
const previousShuffledIndex = index - 1;
if (previousShuffledIndex >= 0) {
const previousQueueIndex = state.queue.shuffled[previousShuffledIndex];
previousSong = queue.items[previousQueueIndex];
} else if (repeat === PlayerRepeat.ALL) {
// Wrap to last in shuffled order
const lastShuffledIndex = state.queue.shuffled.length - 1;
const lastQueueIndex = state.queue.shuffled[lastShuffledIndex];
previousSong = queue.items[lastQueueIndex];
}
} else {
previousSong = queueIndex > 0 ? queue.items[queueIndex - 1] : undefined;
}
// For nextSong calculation, we need to consider the shuffled order (only if not in priority mode) // For nextSong calculation, we need to consider the shuffled order (only if not in priority mode)
let nextSong: QueueSong | undefined; let nextSong: QueueSong | undefined;
if (isShuffleEnabled(state)) { if (isShuffleEnabled(state)) {