feat(audio): car numbers in heat calls and staggered starts, names optional (1.89.11)

This commit is contained in:
larssand committed 2026-11-12 21:43:51 +01:00
1 parent 755844c22d
commit 3a0e871ebc
11 files changed
+96 -20

No files matched your search

+33 -1
View File
@@ -96,6 +96,8 @@ export function normalizeRaceAudioSettings(value = {}) {
minStartDelay,
maxStartDelay,
perCompetitorPassingTone: source.perCompetitorPassingTone === true,
// How the heat call and a staggered start name the drivers (see resolveDriverCallStyle).
driverCallStyle: ["auto", "names", "numbers", "both"].includes(source.driverCallStyle) ? source.driverCallStyle : "auto",
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",
@@ -141,6 +143,32 @@ export function isSilencedDuringRace(eventKey, settings, session) {
return RACE_PASSING_CALLOUT_EVENTS.includes(eventKey);
}
// Heat call / staggered start: "names" (Roy), "numbers" (car 1 - the grid slot) or "both"
// (car 1 Roy). "auto" = numbers in finals, where drivers go by their grid slot, names otherwise.
export function resolveDriverCallStyle(style, sessionType) {
if (["names", "numbers", "both"].includes(style)) return style;
return String(sessionType || "") === "final" ? "numbers" : "names";
}
const CAR_WORD = { sv: "Bil", en: "Car" };
// One car at a staggered start: "Bil 1", "Bil 1 Roy" or "Roy" (index = grid slot - 1).
export function formatCarCall(index, name, style, language = "sv") {
const car = `${CAR_WORD[language] || CAR_WORD.sv} ${index + 1}`;
const spoken = String(name || "").trim();
if (style === "names") return spoken || car;
return style === "both" && spoken ? `${car} ${spoken}` : car;
}
// The drivers in a heat call, in grid order: "Förare: Roy, Eddie. ", "Bil 1, 2, 3. " or
// "Bil 1 Roy, bil 2 Eddie. " - empty when the heat has no drivers.
export function formatHeatCallDrivers(names, style, language = "sv") {
const list = (names || []).map((name) => String(name || "").trim());
if (!list.length) return "";
const word = CAR_WORD[language] || CAR_WORD.sv;
if (style === "numbers") return `${word} ${list.map((_name, index) => index + 1).join(", ")}. `;
if (style === "both") return `${list.map((name, index) => `${index ? word.toLowerCase() : word} ${index + 1}${name ? ` ${name}` : ""}`).join(", ")}. `;
const named = list.filter(Boolean);
return named.length ? `${language === "en" ? "Drivers" : "Förare"}: ${named.join(", ")}. ` : "";
}
// The quick passing call used at race tracks: seconds and tenths, "17 six", "18 flat"
// ("17 sex", "18 jämnt"). Over a minute: "1 05 two".
const TENTHS = { en: ["flat", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"], sv: ["jämnt", "ett", "två", "tre", "fyra", "fem", "sex", "sju", "åtta", "nio"] };
@@ -430,7 +458,11 @@ export function createRaceAudioEngine(options = {}) {
if (session?.startMode === "staggered" && Array.isArray(callbacks.staggerOrder) && callbacks.staggerOrder.length) {
for (let index = 0; index < callbacks.staggerOrder.length; index += 1) {
if (cancelled()) return false;
await trigger("staggered_release", { variables: { tp: callbacks.staggerOrder[index] }, scope: callbacks.staggerOrder[index], logData: { sessionId: session?.id, transponder: callbacks.staggerOrder[index] } }).voiceDone;
// Each item: { transponder, call } ("Bil 1"); a bare transponder string is read as before.
const item = callbacks.staggerOrder[index];
const transponder = typeof item === "object" ? item?.transponder : item;
const car = typeof item === "object" ? item?.call : `${CAR_WORD[settings.language] || CAR_WORD.sv} ${transponder}`;
await trigger("staggered_release", { variables: { car, tp: index + 1 }, scope: transponder || car, logData: { sessionId: session?.id, transponder } }).voiceDone;
if (cancelled()) return false;
if (index < callbacks.staggerOrder.length - 1) { await wait(3000); if (cancelled()) return false; }
}