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

ensure no concurrent playback on non-transition state on web player (#1829)

Browse Source
This commit is contained in:
jeffvli
2026-03-15 18:00:51 -07:00
parent d96b282cae
commit d318e6d341
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/features/player/audio-player/engine/web-player-engine.tsx
+23
View File
@@ -119,6 +119,8 @@ export const WebPlayerEngine = (props: WebPlayerEngineProps) => {
player2Ref.current?.getInternalPlayer()?.pause(); player2Ref.current?.getInternalPlayer()?.pause();
}, },
play() { play() {
player1Ref.current?.getInternalPlayer()?.pause();
player2Ref.current?.getInternalPlayer()?.pause();
if (playerNum === 1) { if (playerNum === 1) {
player1Ref.current?.getInternalPlayer()?.play(); player1Ref.current?.getInternalPlayer()?.play();
} else { } else {
@@ -157,6 +159,11 @@ export const WebPlayerEngine = (props: WebPlayerEngineProps) => {
const volume1 = convertToLogVolume(internalVolume1); const volume1 = convertToLogVolume(internalVolume1);
const volume2 = convertToLogVolume(internalVolume2); const volume2 = convertToLogVolume(internalVolume2);
const pauseBothPlayers = useCallback(() => {
player1Ref.current?.getInternalPlayer()?.pause();
player2Ref.current?.getInternalPlayer()?.pause();
}, []);
const handleOnError = ( const handleOnError = (
playerRef: React.RefObject<null | ReactPlayer>, playerRef: React.RefObject<null | ReactPlayer>,
onEnded: () => void, onEnded: () => void,
@@ -186,6 +193,7 @@ export const WebPlayerEngine = (props: WebPlayerEngineProps) => {
networkRetryCountRef.current += 1; networkRetryCountRef.current += 1;
const audio = target; const audio = target;
setTimeout(() => { setTimeout(() => {
pauseBothPlayers();
audio.load(); audio.load();
audio.play().catch(() => { audio.play().catch(() => {
logFn.error(logMsg[LogCategory.PLAYER].playbackError, { logFn.error(logMsg[LogCategory.PLAYER].playbackError, {
@@ -202,6 +210,7 @@ export const WebPlayerEngine = (props: WebPlayerEngineProps) => {
return; return;
} }
pauseBothPlayers();
if (error?.code === MediaError.MEDIA_ERR_DECODE) { if (error?.code === MediaError.MEDIA_ERR_DECODE) {
onEnded(); onEnded();
} else { } else {
@@ -217,6 +226,20 @@ export const WebPlayerEngine = (props: WebPlayerEngineProps) => {
networkRetryCount2.current = 0; networkRetryCount2.current = 0;
}, [src1, src2]); }, [src1, src2]);
// When not transitioning, ensure only the active player can play (e.g. after seek/prev during transition)
useEffect(() => {
if (isTransitioning) return;
if (playerStatus !== PlayerStatus.PLAYING) {
pauseBothPlayers();
return;
}
if (playerNum === 1) {
player2Ref.current?.getInternalPlayer()?.pause();
} else {
player1Ref.current?.getInternalPlayer()?.pause();
}
}, [isTransitioning, playerNum, playerStatus, pauseBothPlayers]);
useEffect(() => { useEffect(() => {
const player1 = player1Ref.current?.getInternalPlayer(); const player1 = player1Ref.current?.getInternalPlayer();
if (player1 && player1 instanceof HTMLAudioElement) { if (player1 && player1 instanceof HTMLAudioElement) {