diff --git a/src/renderer/store/player.store.ts b/src/renderer/store/player.store.ts index e214fb4da..74ecc41f1 100644 --- a/src/renderer/store/player.store.ts +++ b/src/renderer/store/player.store.ts @@ -1234,20 +1234,13 @@ export const usePlayerStoreBase = createWithEqualityFn()( return { currentSong, index: queueIndex, // Return the actual queue position for display - muted: state.player.muted, nextSong, num: state.player.playerNum, player1: state.player.playerNum === 1 ? currentSong : nextSong, player2: state.player.playerNum === 2 ? currentSong : nextSong, previousSong, - queue: state.queue, 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, - transitionType: state.player.transitionType, - volume: state.player.volume, }; }, getQueue: (groupBy?: QueueGroupingProperty) => { @@ -1379,20 +1372,13 @@ export const usePlayerStoreBase = createWithEqualityFn()( return { currentSong: queue.items[nextIndex], index: nextIndex, - muted: player.muted, nextSong, num: newPlayerNum, player1: newPlayerNum === 1 ? queue.items[nextIndex] : nextSong, player2: newPlayerNum === 2 ? queue.items[nextIndex] : nextSong, previousSong: queue.items[nextIndex - 1], - queue: get().queue, queueLength: queue.items.length, - repeat: player.repeat, - shuffle: player.shuffle, - speed: player.speed, status: newStatus, - transitionType: player.transitionType, - volume: player.volume, }; }, mediaNext: () => { @@ -2607,20 +2593,13 @@ export const usePlayerData = (): PlayerData => { return { currentSong, index: queueIndex, // Return the actual queue position for display - muted: state.player.muted, nextSong, num: state.player.playerNum, player1: state.player.playerNum === 1 ? currentSong : nextSong, player2: state.player.playerNum === 2 ? currentSong : nextSong, previousSong, - queue: state.queue, 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, - transitionType: state.player.transitionType, - volume: state.player.volume, }; }), ); diff --git a/src/shared/types/domain-types.ts b/src/shared/types/domain-types.ts index 0e4c8b4e2..d3f4d4fd8 100644 --- a/src/shared/types/domain-types.ts +++ b/src/shared/types/domain-types.ts @@ -18,7 +18,7 @@ import { NDUserListSort, } from '/@/shared/api/navidrome/navidrome-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 { ALBUM = 'album', @@ -57,20 +57,13 @@ export type AnyLibraryItems = export interface PlayerData { currentSong: QueueSong | undefined; index: number; - muted: boolean; nextSong: QueueSong | undefined; num: 1 | 2; player1: QueueSong | undefined; player2: QueueSong | undefined; previousSong: QueueSong | undefined; - queue: QueueData; queueLength: number; - repeat: PlayerRepeat; - shuffle: PlayerShuffle; - speed: number; status: PlayerStatus; - transitionType: PlayerStyle; - volume: number; } export interface QueueData {