Fixed audio disabling so it remains quiet
This commit is contained in:
parent
b541dd49e2
commit
260139b7a3
@ -225,6 +225,7 @@ const RoomView = (props: RoomProps) => {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (state === "volcano") {
|
if (state === "volcano") {
|
||||||
|
if (audio) {
|
||||||
if (!audioEffects.volcano) {
|
if (!audioEffects.volcano) {
|
||||||
audioEffects.volcano = loadAudio("volcano-eruption.mp3");
|
audioEffects.volcano = loadAudio("volcano-eruption.mp3");
|
||||||
audioEffects.volcano.volume = volume * volume;
|
audioEffects.volcano.volume = volume * volume;
|
||||||
@ -234,6 +235,18 @@ const RoomView = (props: RoomProps) => {
|
|||||||
audioEffects.volcano.play().catch((e) => console.error("Audio play failed:", e));
|
audioEffects.volcano.play().catch((e) => console.error("Audio play failed:", e));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// Audio disabled -> stop any currently playing volcano effect
|
||||||
|
if (audioEffects.volcano) {
|
||||||
|
try {
|
||||||
|
audioEffects.volcano.pause();
|
||||||
|
audioEffects.volcano.currentTime = 0;
|
||||||
|
} catch (e) {
|
||||||
|
/* ignore */
|
||||||
|
}
|
||||||
|
audioEffects.volcano.hasPlayed = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if (audioEffects.volcano) {
|
if (audioEffects.volcano) {
|
||||||
audioEffects.volcano.hasPlayed = false;
|
audioEffects.volcano.hasPlayed = false;
|
||||||
@ -242,6 +255,9 @@ const RoomView = (props: RoomProps) => {
|
|||||||
}, [state, volume]);
|
}, [state, volume]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
// When audio is enabled we may create/play effects; when disabled ensure
|
||||||
|
// any existing effects are stopped and reset.
|
||||||
|
if (audio) {
|
||||||
if (turn && turn.color === color && state !== "room") {
|
if (turn && turn.color === color && state !== "room") {
|
||||||
if (!audioEffects.yourTurn) {
|
if (!audioEffects.yourTurn) {
|
||||||
audioEffects.yourTurn = loadAudio("its-your-turn.mp3");
|
audioEffects.yourTurn = loadAudio("its-your-turn.mp3");
|
||||||
@ -289,11 +305,33 @@ const RoomView = (props: RoomProps) => {
|
|||||||
audioEffects.knights.hasPlayed = false;
|
audioEffects.knights.hasPlayed = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// audio disabled: stop any currently playing effects and reset their state
|
||||||
|
const stopIfPlaying = (ae?: AudioEffect) => {
|
||||||
|
if (!ae) return;
|
||||||
|
try {
|
||||||
|
ae.pause();
|
||||||
|
ae.currentTime = 0;
|
||||||
|
} catch (e) {
|
||||||
|
/* ignore */
|
||||||
|
}
|
||||||
|
ae.hasPlayed = false;
|
||||||
|
};
|
||||||
|
stopIfPlaying(audioEffects.yourTurn);
|
||||||
|
stopIfPlaying(audioEffects.robber);
|
||||||
|
stopIfPlaying(audioEffects.knights);
|
||||||
|
}
|
||||||
}, [state, turn, color, volume]);
|
}, [state, turn, color, volume]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
for (const key in audioEffects) {
|
for (const key in audioEffects) {
|
||||||
audioEffects[key].volume = volume * volume;
|
if (audioEffects[key]) {
|
||||||
|
try {
|
||||||
|
audioEffects[key]!.volume = volume * volume;
|
||||||
|
} catch (e) {
|
||||||
|
/* ignore */
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, [volume]);
|
}, [volume]);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user