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

fix: sleep timer end-of-song mode (#1706)

Browse Source
This commit is contained in:
York
2026-03-08 12:23:19 +08:00
committed by GitHub
parent 6e3f0f2253
commit 6d2c084355
3 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/features/player/audio-player/web-player.tsx
+27 -2
View File
@@ -20,6 +20,7 @@ import {
usePlayerData,
usePlayerMuted,
usePlayerProperties,
usePlayerStoreBase,
usePlayerVolume,
} from '/@/renderer/store';
import { toast } from '/@/shared/components/toast/toast';
@@ -180,7 +181,15 @@ export function WebPlayer() {
promise.then(() => {
playerRef.current?.player1()?.ref?.getInternalPlayer().pause();
playerRef.current?.setVolume(volume);
// If mediaAutoNext resulted in a paused state (e.g. end of queue,
// or pauseOnNextSongEnd flag), stop all audio instead of restoring volume.
const currentStatus = usePlayerStoreBase.getState().player.status;
if (currentStatus === PlayerStatus.PAUSED) {
playerRef.current?.pause();
} else {
playerRef.current?.setVolume(volume);
}
setIsTransitioning(false);
});
}, [mediaAutoNext, volume]);
@@ -193,7 +202,13 @@ export function WebPlayer() {
promise.then(() => {
playerRef.current?.player2()?.ref?.getInternalPlayer().pause();
playerRef.current?.setVolume(volume);
const currentStatus = usePlayerStoreBase.getState().player.status;
if (currentStatus === PlayerStatus.PAUSED) {
playerRef.current?.pause();
} else {
playerRef.current?.setVolume(volume);
}
setIsTransitioning(false);
});
}, [mediaAutoNext, volume]);
@@ -527,6 +542,11 @@ function crossfadeHandler(args: {
if (!isTransitioning) {
if (duration > 0 && currentTime > duration - crossfadeDuration) {
// Skip pre-starting next player if pauseOnNextSongEnd is set
if (usePlayerStoreBase.getState().player.pauseOnNextSongEnd) {
return;
}
nextPlayer.setVolume(0);
nextPlayer.ref?.getInternalPlayer().play();
return setIsTransitioning(player);
@@ -616,6 +636,11 @@ function gaplessHandler(args: {
const durationPadding = getDurationPadding(isFlac);
if (currentTime + durationPadding >= duration) {
// Skip pre-starting next player if pauseOnNextSongEnd is set
if (usePlayerStoreBase.getState().player.pauseOnNextSongEnd) {
return null;
}
return nextPlayer.ref
?.getInternalPlayer()
?.play()