remove unused properties from PlayerData

This commit is contained in:
jeffvli
2026-01-01 15:31:57 -08:00
parent 588e0609fd
commit cb47883328
2 changed files with 1 additions and 29 deletions
-21
View File
@@ -1234,20 +1234,13 @@ export const usePlayerStoreBase = createWithEqualityFn<PlayerState>()(
return { return {
currentSong, currentSong,
index: queueIndex, // Return the actual queue position for display index: queueIndex, // Return the actual queue position for display
muted: state.player.muted,
nextSong, nextSong,
num: state.player.playerNum, num: state.player.playerNum,
player1: state.player.playerNum === 1 ? currentSong : nextSong, player1: state.player.playerNum === 1 ? currentSong : nextSong,
player2: state.player.playerNum === 2 ? currentSong : nextSong, player2: state.player.playerNum === 2 ? currentSong : nextSong,
previousSong, previousSong,
queue: state.queue,
queueLength: state.queue.default.length + state.queue.priority.length, queueLength: state.queue.default.length + state.queue.priority.length,
repeat: state.player.repeat,
shuffle: state.player.shuffle,
speed: state.player.speed,
status: state.player.status, status: state.player.status,
transitionType: state.player.transitionType,
volume: state.player.volume,
}; };
}, },
getQueue: (groupBy?: QueueGroupingProperty) => { getQueue: (groupBy?: QueueGroupingProperty) => {
@@ -1379,20 +1372,13 @@ export const usePlayerStoreBase = createWithEqualityFn<PlayerState>()(
return { return {
currentSong: queue.items[nextIndex], currentSong: queue.items[nextIndex],
index: nextIndex, index: nextIndex,
muted: player.muted,
nextSong, nextSong,
num: newPlayerNum, num: newPlayerNum,
player1: newPlayerNum === 1 ? queue.items[nextIndex] : nextSong, player1: newPlayerNum === 1 ? queue.items[nextIndex] : nextSong,
player2: newPlayerNum === 2 ? queue.items[nextIndex] : nextSong, player2: newPlayerNum === 2 ? queue.items[nextIndex] : nextSong,
previousSong: queue.items[nextIndex - 1], previousSong: queue.items[nextIndex - 1],
queue: get().queue,
queueLength: queue.items.length, queueLength: queue.items.length,
repeat: player.repeat,
shuffle: player.shuffle,
speed: player.speed,
status: newStatus, status: newStatus,
transitionType: player.transitionType,
volume: player.volume,
}; };
}, },
mediaNext: () => { mediaNext: () => {
@@ -2607,20 +2593,13 @@ export const usePlayerData = (): PlayerData => {
return { return {
currentSong, currentSong,
index: queueIndex, // Return the actual queue position for display index: queueIndex, // Return the actual queue position for display
muted: state.player.muted,
nextSong, nextSong,
num: state.player.playerNum, num: state.player.playerNum,
player1: state.player.playerNum === 1 ? currentSong : nextSong, player1: state.player.playerNum === 1 ? currentSong : nextSong,
player2: state.player.playerNum === 2 ? currentSong : nextSong, player2: state.player.playerNum === 2 ? currentSong : nextSong,
previousSong, previousSong,
queue: state.queue,
queueLength: state.queue.default.length + state.queue.priority.length, queueLength: state.queue.default.length + state.queue.priority.length,
repeat: state.player.repeat,
shuffle: state.player.shuffle,
speed: state.player.speed,
status: state.player.status, status: state.player.status,
transitionType: state.player.transitionType,
volume: state.player.volume,
}; };
}), }),
); );
+1 -8
View File
@@ -18,7 +18,7 @@ import {
NDUserListSort, NDUserListSort,
} from '/@/shared/api/navidrome/navidrome-types'; } from '/@/shared/api/navidrome/navidrome-types';
import { ServerFeatures } from '/@/shared/types/features-types'; import { ServerFeatures } from '/@/shared/types/features-types';
import { PlayerRepeat, PlayerShuffle, PlayerStatus, PlayerStyle } from '/@/shared/types/types'; import { PlayerStatus } from '/@/shared/types/types';
export enum LibraryItem { export enum LibraryItem {
ALBUM = 'album', ALBUM = 'album',
@@ -57,20 +57,13 @@ export type AnyLibraryItems =
export interface PlayerData { export interface PlayerData {
currentSong: QueueSong | undefined; currentSong: QueueSong | undefined;
index: number; index: number;
muted: boolean;
nextSong: QueueSong | undefined; nextSong: QueueSong | undefined;
num: 1 | 2; num: 1 | 2;
player1: QueueSong | undefined; player1: QueueSong | undefined;
player2: QueueSong | undefined; player2: QueueSong | undefined;
previousSong: QueueSong | undefined; previousSong: QueueSong | undefined;
queue: QueueData;
queueLength: number; queueLength: number;
repeat: PlayerRepeat;
shuffle: PlayerShuffle;
speed: number;
status: PlayerStatus; status: PlayerStatus;
transitionType: PlayerStyle;
volume: number;
} }
export interface QueueData { export interface QueueData {