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

[bugfix]: SAFARI WHY. Use GainNode volume instead for volume control

Browse Source
This commit is contained in:
Kendall Garner
2024-01-25 08:54:25 -08:00
parent 669c2a973f
commit 4a953e42f0
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/audio-player/index.tsx
+9 -5
View File
@@ -81,7 +81,7 @@ export const AudioPlayer = forwardRef(
const calculateReplayGain = useCallback(
(song: Song): number => {
if (playback.replayGainMode === 'no') {
return 1;
return volume;
}
let gain: number | undefined;
@@ -99,7 +99,7 @@ export const AudioPlayer = forwardRef(
gain = playback.replayGainFallbackDB;
if (!gain) {
return 1;
return volume;
}
}
@@ -116,13 +116,14 @@ export const AudioPlayer = forwardRef(
if (playback.replayGainClip) {
return Math.min(expectedGain, 1 / peak);
}
return expectedGain;
return expectedGain * volume;
},
[
playback.replayGainClip,
playback.replayGainFallbackDB,
playback.replayGainMode,
playback.replayGainPreampDB,
volume,
],
);
@@ -311,6 +312,9 @@ export const AudioPlayer = forwardRef(
[player2Source, webAudio],
);
// Bugfix for Safari: rather than use the `<audio>` volume (which doesn't work),
// use the GainNode to scale the volume. In this case, for compatibility with
// other browsers, set the `<audio>` volume to 1
return (
<>
<ReactPlayer
@@ -324,7 +328,7 @@ export const AudioPlayer = forwardRef(
playing={currentPlayer === 1 && status === PlayerStatus.PLAYING}
progressInterval={isTransitioning ? 10 : 250}
url={player1?.streamUrl || EMPTY_SOURCE}
volume={volume}
volume={webAudio ? 1 : volume}
width={0}
onEnded={handleOnEnded}
onProgress={
@@ -343,7 +347,7 @@ export const AudioPlayer = forwardRef(
playing={currentPlayer === 2 && status === PlayerStatus.PLAYING}
progressInterval={isTransitioning ? 10 : 250}
url={player2?.streamUrl || EMPTY_SOURCE}
volume={volume}
volume={webAudio ? 1 : volume}
width={0}
onEnded={handleOnEnded}
onProgress={