antebudimir/feishin
1
0
Fork 0
mirror of https://github.com/antebudimir/feishin.git synced 2026-01-01 10:23:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #501 from kgarner7/allow-no-mpv

Browse source 
- OOBE default to web player
- Allow mpv to run using PATH env
- Add improved mpv error logging
- Add web player fallback on mpv error
This commit is contained in:
Jeff 2024-02-13 16:16:01 -08:00 • committed by GitHub
commit eab11658bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 706 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/renderer/features/player/hooks/use-center-controls.ts
View file

@ -1,5 +1,3 @@
// import { write, writeFile } from 'fs';
// import { deflate } from 'zlib';
import { useCallback, useEffect } from 'react';
import isElectron from 'is-electron';
import { PlaybackType, PlayerRepeat, PlayerShuffle, PlayerStatus } from '/@/renderer/types';
@ -13,7 +11,7 @@ import {
useSetCurrentTime,
useShuffleStatus,
} from '/@/renderer/store';
import { usePlayerType, useSettingsStore } from '/@/renderer/store/settings.store';
import { usePlaybackType } from '/@/renderer/store/settings.store';
import { useScrobble } from '/@/renderer/features/player/hooks/use-scrobble';
import debounce from 'lodash/debounce';
import { QueueSong } from '/@/renderer/api/types';
@ -32,7 +30,6 @@ export const useCenterControls = (args: { playersRef: any }) => {
const { t } = useTranslation();
const { playersRef } = args;
const settings = useSettingsStore((state) => state.playback);
const currentPlayer = useCurrentPlayer();
const { setShuffle, setRepeat, play, pause, previous, next, setCurrentIndex, autoNext } =
usePlayerControls();
@ -41,7 +38,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
const playerStatus = useCurrentStatus();
const repeatStatus = useRepeatStatus();
const shuffleStatus = useShuffleStatus();
const playerType = usePlayerType();
const playbackType = usePlaybackType();
const player1Ref = playersRef?.current?.player1;
const player2Ref = playersRef?.current?.player2;
const currentPlayerRef = currentPlayer === 1 ? player1Ref : player2Ref;
@ -77,7 +74,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
resetPlayers();
}, [player1Ref, player2Ref, resetPlayers]);
const isMpvPlayer = isElectron() && settings.type === PlaybackType.LOCAL;
const isMpvPlayer = isElectron() && playbackType === PlaybackType.LOCAL;
const mprisUpdateSong = (args?: {
currentTime?: number;
@ -282,13 +279,13 @@ export const useCenterControls = (args: { playersRef: any }) => {
switch (repeatStatus) {
case PlayerRepeat.NONE:
handleRepeatNone[playerType]();
handleRepeatNone[playbackType]();
break;
case PlayerRepeat.ALL:
handleRepeatAll[playerType]();
handleRepeatAll[playbackType]();
break;
case PlayerRepeat.ONE:
handleRepeatOne[playerType]();
handleRepeatOne[playbackType]();
break;
default:
@ -299,7 +296,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
checkIsLastTrack,
pause,
play,
playerType,
playbackType,
repeatStatus,
resetPlayers,
setCurrentIndex,
@ -380,13 +377,13 @@ export const useCenterControls = (args: { playersRef: any }) => {
switch (repeatStatus) {
case PlayerRepeat.NONE:
handleRepeatNone[playerType]();
handleRepeatNone[playbackType]();
break;
case PlayerRepeat.ALL:
handleRepeatAll[playerType]();
handleRepeatAll[playbackType]();
break;
case PlayerRepeat.ONE:
handleRepeatOne[playerType]();
handleRepeatOne[playbackType]();
break;
default:
@ -398,7 +395,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
checkIsLastTrack,
next,
pause,
playerType,
playbackType,
repeatStatus,
resetPlayers,
setCurrentIndex,
@ -511,13 +508,13 @@ export const useCenterControls = (args: { playersRef: any }) => {
switch (repeatStatus) {
case PlayerRepeat.NONE:
handleRepeatNone[playerType]();
handleRepeatNone[playbackType]();
break;
case PlayerRepeat.ALL:
handleRepeatAll[playerType]();
handleRepeatAll[playbackType]();
break;
case PlayerRepeat.ONE:
handleRepeatOne[playerType]();
handleRepeatOne[playbackType]();
break;
default:
@ -531,7 +528,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
handleScrobbleFromSongRestart,
isMpvPlayer,
pause,
playerType,
playbackType,
previous,
queue.length,
repeatStatus,

8
src/renderer/features/player/hooks/use-handle-playqueue-add.ts
View file

@ -1,7 +1,7 @@
import { useCallback, useRef } from 'react';
import { useQueryClient } from '@tanstack/react-query';
import { useCurrentServer, usePlayerControls, usePlayerStore } from '/@/renderer/store';
import { usePlayerType } from '/@/renderer/store/settings.store';
import { usePlaybackType } from '/@/renderer/store/settings.store';
import {
PlayQueueAddOptions,
Play,
@ -65,7 +65,7 @@ const addToQueue = usePlayerStore.getState().actions.addToQueue;
export const useHandlePlayQueueAdd = () => {
const { t } = useTranslation();
const queryClient = useQueryClient();
const playerType = usePlayerType();
const playbackType = usePlaybackType();
const server = useCurrentServer();
const { play } = usePlayerControls();
const timeoutIds = useRef<Record<string, ReturnType<typeof setTimeout>> | null>({});
@ -170,7 +170,7 @@ export const useHandlePlayQueueAdd = () => {
const hadSong = usePlayerStore.getState().queue.default.length > 0;
const playerData = addToQueue({ initialIndex: initialSongIndex, playType, songs });
if (playerType === PlaybackType.LOCAL) {
if (playbackType === PlaybackType.LOCAL) {
mpvPlayer!.volume(usePlayerStore.getState().volume);
if (playType === Play.NOW || !hadSong) {
@ -198,7 +198,7 @@ export const useHandlePlayQueueAdd = () => {
return null;
},
[play, playerType, queryClient, server, t],
[play, playbackType, queryClient, server, t],
);
return handlePlayQueueAdd;