vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-16 13:40:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

move timestamp update to separate effect

Browse Source
This commit is contained in:
jeffvli
2025-11-16 21:37:07 -08:00
parent 6842da1d68
commit a78d917fd2
4 changed files with 74 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/features/player/audio-player/web-player.tsx
+32 -16
View File
@@ -1,7 +1,7 @@
import type { Dispatch } from 'react';
import type ReactPlayer from 'react-player';
import { useCallback, useRef, useState } from 'react';
import { useCallback, useEffect, useRef, useState } from 'react';
import {
WebPlayerEngine,
@@ -23,7 +23,7 @@ const PLAY_PAUSE_FADE_DURATION = 300;
const PLAY_PAUSE_FADE_INTERVAL = 10;
export function WebPlayer() {
const playerRef = useRef<WebPlayerEngineHandle>(null);
const playerRef = useRef<null | WebPlayerEngineHandle>(null);
const { num, player1, player2, status } = usePlayerData();
const { mediaAutoNext, setTimestamp } = usePlayerActions();
const { crossfadeDuration, speed, transitionType } = usePlayerProperties();
@@ -71,12 +71,6 @@ export function WebPlayer() {
const onProgressPlayer1 = useCallback(
(e: PlayerOnProgressProps) => {
if (transitionType === 'crossfade' && num === 1) {
setTimestamp(Number(e.playedSeconds.toFixed(0)));
} else if (transitionType === 'gapless') {
setTimestamp(Number(e.playedSeconds.toFixed(0)));
}
if (!playerRef.current?.player1()) {
return;
}
@@ -108,17 +102,11 @@ export function WebPlayer() {
break;
}
},
[crossfadeDuration, isTransitioning, num, setTimestamp, transitionType, volume],
[crossfadeDuration, isTransitioning, num, transitionType, volume],
);
const onProgressPlayer2 = useCallback(
(e: PlayerOnProgressProps) => {
if (transitionType === PlayerStyle.CROSSFADE && num === 2) {
setTimestamp(Number(e.playedSeconds.toFixed(0)));
} else if (transitionType === PlayerStyle.GAPLESS) {
setTimestamp(Number(e.playedSeconds.toFixed(0)));
}
if (!playerRef.current?.player2()) {
return;
}
@@ -150,7 +138,7 @@ export function WebPlayer() {
break;
}
},
[crossfadeDuration, isTransitioning, num, setTimestamp, transitionType, volume],
[crossfadeDuration, isTransitioning, num, transitionType, volume],
);
const handleOnEndedPlayer1 = useCallback(() => {
@@ -205,6 +193,34 @@ export function WebPlayer() {
[volume, num, isTransitioning],
);
useEffect(() => {
if (localPlayerStatus !== PlayerStatus.PLAYING) {
return;
}
const interval = setInterval(() => {
const activePlayer =
num === 1 ? playerRef.current?.player1() : playerRef.current?.player2();
const internalPlayer =
activePlayer?.ref?.getInternalPlayer() as HTMLAudioElement | null;
if (!internalPlayer) {
return;
}
const currentTime = internalPlayer.currentTime;
if (
transitionType === PlayerStyle.CROSSFADE ||
transitionType === PlayerStyle.GAPLESS
) {
setTimestamp(Number(currentTime.toFixed(0)));
}
}, 500);
return () => clearInterval(interval);
}, [localPlayerStatus, num, setTimestamp, transitionType]);
useMainPlayerListener();
return (