feat(audio): trumpet start and fanfare finish by default, start/finish signal chosen in settings (1.56.0)
This commit is contained in:
1 parent
36fe1e3933
commit
a8aaeae02f
15 files changed
+73
-21
No files matched your search
+16
@@ -2484,6 +2484,14 @@ const TRANSLATIONS = {
|
||||
"audio.enabled": "Aktivera nya raceljud",
|
||||
"audio.mute": "Tysta allt",
|
||||
"audio.language": "Utropsspråk",
|
||||
"audio.start_sound": "Startsignal",
|
||||
"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_fanfare": "Trumpetfanfar",
|
||||
"audio.finish_sound_horn": "Tryckluftstuta",
|
||||
"audio.finish_sound_classic": "Klassisk",
|
||||
"audio.voice_select": "Race-röst",
|
||||
"audio.voice_auto": "Automatisk röst för valt språk",
|
||||
"audio.voice_rate": "Race-röstens hastighet",
|
||||
@@ -4443,6 +4451,14 @@ const TRANSLATIONS = {
|
||||
"audio.enabled": "Enable new race audio",
|
||||
"audio.mute": "Mute all",
|
||||
"audio.language": "Announcement language",
|
||||
"audio.start_sound": "Start signal",
|
||||
"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_fanfare": "Trumpet fanfare",
|
||||
"audio.finish_sound_horn": "Air horn",
|
||||
"audio.finish_sound_classic": "Classic",
|
||||
"audio.voice_select": "Race voice",
|
||||
"audio.voice_auto": "Automatic voice for selected language",
|
||||
"audio.voice_rate": "Race voice speed",
|
||||
|
||||
+12
-4
@@ -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_horn.wav"),
|
||||
event("start_tone", "start", "high", false, "effects/start_trumpet.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_horn.wav"),
|
||||
event("race_finished", "race", "high", true, "effects/finish_fanfare.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_horn.wav"), event("provisional_pole", "qualifying", "normal"),
|
||||
event("qualifying_finished", "qualifying", "high", true, "effects/finish_fanfare.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"),
|
||||
@@ -55,6 +55,11 @@ const clamp = (value, fallback, min = 0, max = 1) => {
|
||||
return Math.max(min, Math.min(max, Number.isFinite(number) ? number : fallback));
|
||||
};
|
||||
|
||||
// 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" });
|
||||
const FINISH_EVENTS = new Set(["race_finished", "qualifying_finished"]);
|
||||
|
||||
export function normalizeRaceAudioSettings(value = {}) {
|
||||
const source = value && typeof value === "object" ? value : {};
|
||||
const events = {};
|
||||
@@ -85,6 +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",
|
||||
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)),
|
||||
@@ -182,7 +189,8 @@ export function createRaceAudioEngine(options = {}) {
|
||||
if (!settings.enabled || settings.muted || !configured.effect || !definition?.effect) return false;
|
||||
await loadManifest();
|
||||
const customPath = safeEffectPath(eventOptions.effectPath);
|
||||
const effectPath = customPath || safeEffectPath(manifest?.events?.[key]?.effect || definition.effect);
|
||||
const chosen = key === "start_tone" ? START_SOUNDS[settings.startSound] : FINISH_EVENTS.has(key) ? FINISH_SOUNDS[settings.finishSound] : "";
|
||||
const effectPath = customPath || chosen || safeEffectPath(manifest?.events?.[key]?.effect || definition.effect);
|
||||
const isPassing = key === "transponder_pass" || key === "transponder_detected";
|
||||
const volume = settings.masterVolume * (isPassing ? settings.passingVolume : settings.effectsVolume);
|
||||
const rate = settings.perCompetitorPassingTone && isPassing && eventOptions.variant ? variantPlaybackRate(eventOptions.variant) : undefined;
|
||||
|
||||
@@ -263,6 +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 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>
|
||||
@@ -634,6 +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"),
|
||||
practicePbWarmupLaps: Number(form.get("raceAudioPbWarmup")),
|
||||
practicePbCooldownSec: Number(form.get("raceAudioPbCooldown")),
|
||||
practicePbMinGainMs: Math.round(Number(form.get("raceAudioPbMinGain")) * 1000),
|
||||
|
||||
@@ -4840,3 +4840,6 @@ details.event-group > summary { cursor: pointer; list-style: revert; }
|
||||
.row-menu > summary { list-style: none; cursor: pointer; }
|
||||
.row-menu > summary::-webkit-details-marker { display: none; }
|
||||
.row-menu-list { position: absolute; right: 0; z-index: 20; display: grid; gap: 6px; min-width: 200px; padding: 8px; margin-top: 4px; border: 1px solid var(--line); border-radius: 10px; background: var(--panel); box-shadow: var(--shadow); }
|
||||
|
||||
.sound-choice { display: flex; gap: 6px; align-items: center; }
|
||||
.sound-choice select { flex: 1; }
|
||||
Reference in new issue
Block a user