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

Handle shuffle/repeat playback for web

Browse Source
This commit is contained in:
jeffvli
2022-11-12 01:19:17 -08:00
parent 34f4458733
commit 0b5cea16e9
3 changed files with 24 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/audio-player/index.tsx
+13
View File
@@ -75,6 +75,19 @@ export const AudioPlayer = forwardRef(
setIsTransitioning(false);
};
useEffect(() => {
if (status === PlayerStatus.PLAYING) {
if (currentPlayer === 1) {
player1Ref.current.getInternalPlayer().play();
} else {
player2Ref.current.getInternalPlayer().play();
}
} else {
player1Ref.current.getInternalPlayer().pause();
player2Ref.current.getInternalPlayer().pause();
}
}, [currentPlayer, status]);
const handleCrossfade1 = useCallback(
(e: AudioPlayerProgress) => {
return crossfadeHandler({
src/renderer/features/player/hooks/use-center-controls.ts
+11 -69
View File
@@ -163,7 +163,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
if (isLastTrack) {
resetPlayers();
} else {
next();
autoNext();
resetPlayers();
}
},
@@ -179,7 +179,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
if (isLastTrack) {
resetPlayers();
} else {
next();
autoNext();
resetPlayers();
}
},
@@ -202,7 +202,6 @@ export const useCenterControls = (args: { playersRef: any }) => {
}, [
autoNext,
checkIsLastTrack,
next,
pause,
play,
playerType,
@@ -258,10 +257,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
},
web: () => {
if (!isLastTrack) {
resetPlayers();
} else {
next();
resetPlayers();
}
},
};
@@ -321,11 +317,11 @@ export const useCenterControls = (args: { playersRef: any }) => {
}
},
web: () => {
if (!isFirstTrack) {
prev();
if (isFirstTrack) {
setCurrentIndex(queue.length - 1);
resetPlayers();
} else {
setCurrentIndex(queue.length - 1);
prev();
resetPlayers();
}
},
@@ -338,12 +334,12 @@ export const useCenterControls = (args: { playersRef: any }) => {
mpvPlayer.previous();
},
web: () => {
if (!isFirstTrack) {
prev();
resetPlayers();
} else {
if (isFirstTrack) {
resetPlayers();
pause();
} else {
prev();
resetPlayers();
}
},
};
@@ -359,13 +355,8 @@ export const useCenterControls = (args: { playersRef: any }) => {
}
},
web: () => {
if (!isFirstTrack) {
prev();
resetPlayers();
} else {
resetPlayers();
pause();
}
prev();
resetPlayers();
},
};
@@ -384,23 +375,6 @@ export const useCenterControls = (args: { playersRef: any }) => {
break;
}
// if (isMpvPlayer) {
// if (shuffle === PlayerShuffle.TRACK) {
// // const playerData = setCurrentIndex(shuffleTrackPrevious());
// // mpvPlayer.setQueue(playerData);
// mpvPlayer.previous();
// } else if (shuffle === PlayerShuffle.ALBUM) {
// } else {
// const playerData = prev();
// mpvPlayer.setQueue(playerData);
// mpvPlayer.previous();
// }
// }
// if (!isMpvPlayer) {
// resetPlayers();
// }
return setCurrentTime(0);
}, [
checkIsFirstTrack,
@@ -483,40 +457,14 @@ export const useCenterControls = (args: { playersRef: any }) => {
useEffect(() => {
ipc?.RENDERER_PLAYER_PLAY_PAUSE(() => {
handlePlayPause();
// const { status } = usePlayerStore.getState().current;
// if (status === PlayerStatus.PAUSED) {
// play();
// if (isMpvPlayer) {
// mpvPlayer.play();
// }
// } else {
// pause();
// if (isMpvPlayer) {
// mpvPlayer.pause();
// }
// }
});
ipc?.RENDERER_PLAYER_NEXT(() => {
handleNextTrack();
// const playerData = next();
// if (isMpvPlayer) {
// mpvPlayer.setQueue(playerData);
// mpvPlayer.next();
// }
});
ipc?.RENDERER_PLAYER_PREVIOUS(() => {
handlePrevTrack();
// const playerData = prev();
// if (isMpvPlayer) {
// mpvPlayer.setQueue(playerData);
// mpvPlayer.previous();
// }
});
ipc?.RENDERER_PLAYER_PLAY(() => handlePlay());
@@ -529,12 +477,6 @@ export const useCenterControls = (args: { playersRef: any }) => {
ipc?.RENDERER_PLAYER_AUTO_NEXT(() => {
handleAutoNext();
// const playerData = autoNext();
// console.log('playerData', playerData);
// if (playerData.queue.next) {
// mpvPlayer.playerAutoNext(playerData);
// play();
// }
});
return () => {
src/renderer/store/player.store.ts
-39
View File
@@ -249,45 +249,6 @@ export const usePlayerStore = create<PlayerSlice>()(
status: PlayerStatus.PAUSED,
time: 0,
},
// getNextTrack: () => {
// const shuffle = get().shuffle;
// const queue = get().queue.default;
// const shuffledQueue = get().queue.shuffled;
// if (shuffle === PlayerShuffle.TRACK) {
// }
// const currentIndex =
// shuffle === PlayerShuffle.TRACK
// ? get().current.shuffledIndex
// : get().current.index;
// const current = queue.find(
// (song) => song.uniqueId === queue[currentIndex]
// ) as QueueSong;
// let nextSongIndex: number | undefined;
// if (repeat === PlayerRepeat.ALL) {
// if (isLastTrack) nextSongIndex = 0;
// else nextSongIndex = currentIndex + 1;
// }
// if (repeat === PlayerRepeat.ONE) {
// nextSongIndex = currentIndex;
// }
// if (repeat === PlayerRepeat.NONE) {
// if (isLastTrack) nextSongIndex = undefined;
// else nextSongIndex = currentIndex + 1;
// }
// const next = nextSongIndex
// ? (queue.find(
// (song) => song.uniqueId === queue[nextSongIndex as number]
// ) as QueueSong)
// : undefined;
// },
getPlayerData: () => {
const queue = get().queue.default;
const currentPlayer = get().current.player;