Add checks for player type

This commit is contained in:
jeffvli 2022-12-25 01:55:00 -08:00
parent ae5afe868e
commit 4353e81df3
6 changed files with 47 additions and 18 deletions

View file

@ -26,7 +26,7 @@ import {
useShuffleStatus,
useCurrentTime,
} from '/@/renderer/store';
import { useSettingsStore } from '/@/renderer/store/settings.store';
import { usePlayerType, useSettingsStore } from '/@/renderer/store/settings.store';
import { PlayerStatus, PlaybackType, PlayerShuffle, PlayerRepeat } from '/@/renderer/types';
interface CenterControlsProps {
@ -69,7 +69,7 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
const currentSong = useCurrentSong();
const songDuration = currentSong?.duration;
const skip = useSettingsStore((state) => state.player.skipButtons);
const playerType = useSettingsStore((state) => state.player.type);
const playerType = usePlayerType();
const player1 = playersRef?.current?.player1;
const player2 = playersRef?.current?.player2;
const status = useCurrentStatus();

View file

@ -11,7 +11,7 @@ import {
useSetCurrentTime,
useShuffleStatus,
} from '/@/renderer/store';
import { useSettingsStore } from '/@/renderer/store/settings.store';
import { usePlayerType, useSettingsStore } from '/@/renderer/store/settings.store';
const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
const mpvPlayerListener = isElectron() ? window.electron.mpvPlayerListener : null;
@ -29,7 +29,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
const playerStatus = useCurrentStatus();
const repeatStatus = useRepeatStatus();
const shuffleStatus = useShuffleStatus();
const playerType = useSettingsStore((state) => state.player.type);
const playerType = usePlayerType();
const player1Ref = playersRef?.current?.player1;
const player2Ref = playersRef?.current?.player2;
const currentPlayerRef = currentPlayer === 1 ? player1Ref : player2Ref;

View file

@ -6,7 +6,7 @@ import { ndNormalize } from '/@/renderer/api/navidrome.api';
import { NDSong } from '/@/renderer/api/navidrome.types';
import { queryKeys } from '/@/renderer/api/query-keys';
import { useAuthStore, usePlayerStore } from '/@/renderer/store';
import { useSettingsStore } from '/@/renderer/store/settings.store';
import { usePlayerType } from '/@/renderer/store/settings.store';
import { PlayQueueAddOptions, LibraryItem, Play, PlaybackType } from '/@/renderer/types';
import { toast } from '/@/renderer/components/toast';
import isElectron from 'is-electron';
@ -15,7 +15,7 @@ const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
export const useHandlePlayQueueAdd = () => {
const queryClient = useQueryClient();
const playerType = useSettingsStore.getState().player.type;
const playerType = usePlayerType();
const deviceId = useAuthStore.getState().deviceId;
const server = useAuthStore.getState().currentServer;