feat(audio): 'starting to the sound of the tone' call, tone start and stop signal finish by default (1.57.0)
This commit is contained in:
1 parent
a8aaeae02f
commit
221a06c899
14 files changed
+54
-39
No files matched your search
@@ -2485,10 +2485,12 @@ const TRANSLATIONS = {
|
||||
"audio.mute": "Tysta allt",
|
||||
"audio.language": "Utropsspråk",
|
||||
"audio.start_sound": "Startsignal",
|
||||
"audio.start_sound_tone": "Ton (som tidtagningssystem)",
|
||||
"audio.start_sound_trumpet": "Trumpet",
|
||||
"audio.start_sound_horn": "Tryckluftstuta",
|
||||
"audio.start_sound_beep": "Pip (klassisk)",
|
||||
"audio.finish_sound": "Målgångssignal",
|
||||
"audio.finish_sound_stop": "Stoppsignal",
|
||||
"audio.finish_sound_fanfare": "Trumpetfanfar",
|
||||
"audio.finish_sound_horn": "Tryckluftstuta",
|
||||
"audio.finish_sound_classic": "Klassisk",
|
||||
@@ -4452,10 +4454,12 @@ const TRANSLATIONS = {
|
||||
"audio.mute": "Mute all",
|
||||
"audio.language": "Announcement language",
|
||||
"audio.start_sound": "Start signal",
|
||||
"audio.start_sound_tone": "Tone (like timing systems)",
|
||||
"audio.start_sound_trumpet": "Trumpet",
|
||||
"audio.start_sound_horn": "Air horn",
|
||||
"audio.start_sound_beep": "Beep (classic)",
|
||||
"audio.finish_sound": "Finish signal",
|
||||
"audio.finish_sound_stop": "Stop signal",
|
||||
"audio.finish_sound_fanfare": "Trumpet fanfare",
|
||||
"audio.finish_sound_horn": "Air horn",
|
||||
"audio.finish_sound_classic": "Classic",
|
||||
|
||||
+11
-8
@@ -7,7 +7,7 @@ export const RACE_AUDIO_EVENT_DEFINITIONS = Object.freeze([
|
||||
event("race_1_minute", "start", "normal"), event("race_30_seconds", "start", "normal"),
|
||||
event("race_10_seconds", "start", "normal", true, "effects/warning.wav"),
|
||||
event("drivers_ready", "start", "high"), event("start_sequence", "start", "high"),
|
||||
event("start_tone", "start", "high", false, "effects/start_trumpet.wav"),
|
||||
event("start_tone", "start", "high", false, "effects/start_tone.wav"),
|
||||
event("false_start", "start", "critical", true, "effects/warning.wav", 1000), event("restart_race", "start", "high"),
|
||||
event("staggered_release", "start", "normal"),
|
||||
event("prologue_start", "start", "normal"), event("prologue_minutes", "start", "normal"),
|
||||
@@ -27,7 +27,7 @@ export const RACE_AUDIO_EVENT_DEFINITIONS = Object.freeze([
|
||||
event("one_minute_remaining", "race", "normal"), event("thirty_seconds_remaining", "race", "normal"),
|
||||
event("ten_seconds_remaining", "race", "normal", true, "effects/warning.wav"),
|
||||
event("time_expired", "race", "high", true, "effects/warning.wav"),
|
||||
event("race_finished", "race", "high", true, "effects/finish_fanfare.wav"),
|
||||
event("race_finished", "race", "high", true, "effects/finish_stop.wav"),
|
||||
event("track_call", "control", "critical", true, "effects/warning.wav", 1000), event("track_clear", "control", "critical"),
|
||||
event("yellow_flag", "control", "critical", true, "effects/warning.wav"), event("red_flag", "control", "critical", true, "effects/warning.wav"),
|
||||
event("race_paused", "control", "critical", true, "effects/warning.wav"), event("race_resumed", "control", "high"),
|
||||
@@ -38,7 +38,7 @@ export const RACE_AUDIO_EVENT_DEFINITIONS = Object.freeze([
|
||||
event("entering_pits", "pit", "low", false, "effects/transponder_pass.wav"), event("leaving_pits", "pit", "low", false, "effects/transponder_pass.wav"),
|
||||
event("pit_speed_warning", "pit", "high", true, "effects/warning.wav"),
|
||||
event("qualifying_start", "qualifying", "high"), event("qualifying_remaining", "qualifying", "normal"),
|
||||
event("qualifying_finished", "qualifying", "high", true, "effects/finish_fanfare.wav"), event("provisional_pole", "qualifying", "normal"),
|
||||
event("qualifying_finished", "qualifying", "high", true, "effects/finish_stop.wav"), event("provisional_pole", "qualifying", "normal"),
|
||||
event("pole_position", "qualifying", "normal", true, "effects/fastest_lap_trophy.wav"),
|
||||
event("race_winner", "results", "high", true, "effects/fastest_lap_trophy.wav"), event("second_place", "results", "normal"),
|
||||
event("third_place", "results", "normal"), event("podium", "results", "normal"),
|
||||
@@ -56,8 +56,8 @@ const clamp = (value, fallback, min = 0, max = 1) => {
|
||||
};
|
||||
|
||||
// The start and finish signals can be chosen in Settings (the files are in the sound pack).
|
||||
export const START_SOUNDS = Object.freeze({ trumpet: "effects/start_trumpet.wav", horn: "effects/start_horn.wav", beep: "effects/start_beep.wav" });
|
||||
export const FINISH_SOUNDS = Object.freeze({ fanfare: "effects/finish_fanfare.wav", horn: "effects/finish_horn.wav", classic: "effects/race_finish.wav" });
|
||||
export const START_SOUNDS = Object.freeze({ tone: "effects/start_tone.wav", trumpet: "effects/start_trumpet.wav", horn: "effects/start_horn.wav", beep: "effects/start_beep.wav" });
|
||||
export const FINISH_SOUNDS = Object.freeze({ stop: "effects/finish_stop.wav", fanfare: "effects/finish_fanfare.wav", horn: "effects/finish_horn.wav", classic: "effects/race_finish.wav" });
|
||||
const FINISH_EVENTS = new Set(["race_finished", "qualifying_finished"]);
|
||||
|
||||
export function normalizeRaceAudioSettings(value = {}) {
|
||||
@@ -90,8 +90,8 @@ export function normalizeRaceAudioSettings(value = {}) {
|
||||
minStartDelay,
|
||||
maxStartDelay,
|
||||
perCompetitorPassingTone: source.perCompetitorPassingTone === true,
|
||||
startSound: Object.hasOwn(START_SOUNDS, source.startSound) ? source.startSound : "trumpet",
|
||||
finishSound: Object.hasOwn(FINISH_SOUNDS, source.finishSound) ? source.finishSound : "fanfare",
|
||||
startSound: Object.hasOwn(START_SOUNDS, source.startSound) ? source.startSound : "tone",
|
||||
finishSound: Object.hasOwn(FINISH_SOUNDS, source.finishSound) ? source.finishSound : "stop",
|
||||
raceCallouts: source.raceCallouts === "full" ? "full" : "passing",
|
||||
// Open Practice personal best calls (practice_callouts_logic.js); 0 turns a rule off.
|
||||
practicePbWarmupLaps: Math.round(clamp(source.practicePbWarmupLaps, 10, 0, 30)),
|
||||
@@ -327,8 +327,11 @@ export function createRaceAudioEngine(options = {}) {
|
||||
await trigger("drivers_ready", { interrupt: true }).voiceDone; if (cancelled()) return false;
|
||||
if (session?.type === "qualification") await trigger("qualifying_start").voiceDone; if (cancelled()) return false;
|
||||
await trigger("start_sequence").voiceDone; if (cancelled()) return false;
|
||||
} else {
|
||||
// After the count-down's "3": "Starting to the sound of the tone", like a timing system.
|
||||
await trigger("start_sequence").voiceDone; if (cancelled()) return false;
|
||||
}
|
||||
// After the count-down's "3" (IFMAR 4.2.6) it is quiet until the horn, 1-3 s later; the
|
||||
// After that call it is quiet until the tone, 1-3 s later (IFMAR 4.2.6); the
|
||||
// lights come on within that time. Otherwise: lights, then the random delay from settings.
|
||||
const afterCountDown = Boolean(callbacks.skipIntro);
|
||||
const windowMs = afterCountDown ? 1000 + random() * 2000 : 0;
|
||||
|
||||
+4
-4
@@ -263,8 +263,8 @@ export function renderSettings(deps) {
|
||||
<label><span>${t("audio.effects_volume")}</span><input type="range" min="0" max="1" step="0.05" name="raceAudioEffects" form="settingsForm" value="${raceAudio.effectsVolume}" /></label>
|
||||
<label><span>${t("audio.voice_volume")}</span><input type="range" min="0" max="1" step="0.05" name="raceAudioVoice" form="settingsForm" value="${raceAudio.voiceVolume}" /></label>
|
||||
<label><span>${t("audio.passing_volume")}</span><input type="range" min="0" max="1" step="0.05" name="raceAudioPassing" form="settingsForm" value="${raceAudio.passingVolume}" /></label>
|
||||
<label><span>${t("audio.start_sound")}</span><span class="sound-choice"><select name="raceAudioStartSound" form="settingsForm">${["trumpet", "horn", "beep"].map((value) => `<option value="${value}" ${raceAudio.startSound === value ? "selected" : ""}>${t(`audio.start_sound_${value}`)}</option>`).join("")}</select><button class="btn btn-mini" type="button" data-test-race-audio="start_tone" title="${t("audio.test")}">▶</button></span></label>
|
||||
<label><span>${t("audio.finish_sound")}</span><span class="sound-choice"><select name="raceAudioFinishSound" form="settingsForm">${["fanfare", "horn", "classic"].map((value) => `<option value="${value}" ${raceAudio.finishSound === value ? "selected" : ""}>${t(`audio.finish_sound_${value}`)}</option>`).join("")}</select><button class="btn btn-mini" type="button" data-test-race-audio="race_finished" title="${t("audio.test")}">▶</button></span></label>
|
||||
<label><span>${t("audio.start_sound")}</span><span class="sound-choice"><select name="raceAudioStartSound" form="settingsForm">${["tone", "trumpet", "horn", "beep"].map((value) => `<option value="${value}" ${raceAudio.startSound === value ? "selected" : ""}>${t(`audio.start_sound_${value}`)}</option>`).join("")}</select><button class="btn btn-mini" type="button" data-test-race-audio="start_tone" title="${t("audio.test")}">▶</button></span></label>
|
||||
<label><span>${t("audio.finish_sound")}</span><span class="sound-choice"><select name="raceAudioFinishSound" form="settingsForm">${["stop", "fanfare", "horn", "classic"].map((value) => `<option value="${value}" ${raceAudio.finishSound === value ? "selected" : ""}>${t(`audio.finish_sound_${value}`)}</option>`).join("")}</select><button class="btn btn-mini" type="button" data-test-race-audio="race_finished" title="${t("audio.test")}">▶</button></span></label>
|
||||
<label class="toggle"><input type="checkbox" name="raceAudioStartLights" form="settingsForm" ${raceAudio.startLights ? "checked" : ""} /><span>${t("audio.start_lights")}</span></label>
|
||||
<label class="toggle"><input type="checkbox" name="raceAudioRandomDelay" form="settingsForm" ${raceAudio.randomStartDelay ? "checked" : ""} /><span>${t("audio.random_delay")}</span></label>
|
||||
<label><span>${t("audio.min_delay")}</span><input type="number" min="0" max="10" step="0.1" name="raceAudioMinDelay" form="settingsForm" value="${raceAudio.minStartDelay}" /></label>
|
||||
@@ -636,8 +636,8 @@ Erik Eriksson;654321;4WD;Associated;;</code></pre>
|
||||
randomStartDelay: form.get("raceAudioRandomDelay") === "on", minStartDelay: Number(form.get("raceAudioMinDelay")),
|
||||
maxStartDelay: Number(form.get("raceAudioMaxDelay")), perCompetitorPassingTone: form.get("raceAudioPerCompetitor") === "on",
|
||||
raceCallouts: String(form.get("raceAudioRaceCallouts") || "passing"),
|
||||
startSound: String(form.get("raceAudioStartSound") || "trumpet"),
|
||||
finishSound: String(form.get("raceAudioFinishSound") || "fanfare"),
|
||||
startSound: String(form.get("raceAudioStartSound") || "tone"),
|
||||
finishSound: String(form.get("raceAudioFinishSound") || "stop"),
|
||||
practicePbWarmupLaps: Number(form.get("raceAudioPbWarmup")),
|
||||
practicePbCooldownSec: Number(form.get("raceAudioPbCooldown")),
|
||||
practicePbMinGainMs: Math.round(Number(form.get("raceAudioPbMinGain")) * 1000),
|
||||
|
||||
Reference in new issue
Block a user