feat(audio): car numbers in heat calls and staggered starts, names optional (1.89.11)
This commit is contained in:
1 parent
755844c22d
commit
3a0e871ebc
11 files changed
+96
-20
No files matched your search
+22
-7
@@ -20,7 +20,7 @@ import { renderDaySchedulePanel, bindDaySchedulePanel, buildDaySchedulePrintHtml
|
||||
import { beginSession as beginSessionControl, finishSession as finishSessionControl, pauseSession as pauseSessionControl, resumeSession as resumeSessionControl } from "./session_control.js";
|
||||
import { normalizeSeries, buildSeriesStandings, getSeriesRoundStatus, getSeriesRoundNextStep, getSeriesDayResult } from "./series_logic.js";
|
||||
import { renderSeriesView } from "./series_view.js";
|
||||
import { RACE_AUDIO_EVENT_DEFINITIONS, createRaceAudioEngine, normalizeRaceAudioSettings, isSilencedDuringRace, formatSpokenLapTime } from "./race_audio.js";
|
||||
import { RACE_AUDIO_EVENT_DEFINITIONS, createRaceAudioEngine, normalizeRaceAudioSettings, isSilencedDuringRace, formatSpokenLapTime, resolveDriverCallStyle, formatCarCall, formatHeatCallDrivers } from "./race_audio.js";
|
||||
|
||||
import { renderRaceFormatField, renderRaceFormatContextCard, getRaceSummaryItems, getRaceSummaryWarnings, renderManageStatusBadge, renderRaceWizardSteps, renderRaceWizardContent, renderRaceStandingsTable } from "./race_setup_ui.js";
|
||||
|
||||
@@ -274,8 +274,14 @@ const startSessionWithAudio = (session, callbacks) => {
|
||||
// qualifying/finals, and already ranked like a real timed session, not rolling) and
|
||||
// gets the same countdown/lights/start-tone ceremony as qualifying/heat/final.
|
||||
const skipCeremony = ["open_practice", "free_practice"].includes(String(session?.type || ""));
|
||||
const audio = normalizeRaceAudioSettings(state.settings.raceAudio);
|
||||
const callStyle = resolveDriverCallStyle(audio.driverCallStyle, session?.type);
|
||||
// Grid slot = car number: "Bil 1", "Bil 2 Roy" - never the transponder number.
|
||||
const staggerOrder = getSessionGridOrder(session)
|
||||
.map((driverId) => state.drivers.find((driver) => driver.id === driverId)?.transponder)
|
||||
.map((driverId, index) => {
|
||||
const driver = state.drivers.find((item) => item.id === driverId);
|
||||
return driver?.transponder ? { transponder: driver.transponder, call: formatCarCall(index, driver.speechName || driver.name, callStyle, audio.language) } : null;
|
||||
})
|
||||
.filter(Boolean);
|
||||
return raceAudioEngine.runStartSequence(session, { ...callbacks, skipAudio: skipCeremony, staggerOrder });
|
||||
};
|
||||
@@ -513,14 +519,13 @@ function callHeat(sessionId) {
|
||||
}
|
||||
// "Drivers: Roy, Eddie. " in the announcer's language (not the page's), with each driver's
|
||||
// spoken name; drivers that can't be found are left out rather than read as "unknown driver".
|
||||
// Grid order, so "Bil 3" is the third grid slot even when a driver can't be found.
|
||||
function buildHeatCallDrivers(session) {
|
||||
const names = getSessionGridOrder(session)
|
||||
.map((driverId) => state.drivers.find((item) => item.id === driverId))
|
||||
.filter(Boolean)
|
||||
.map((driver) => String(driver.speechName || driver.name || "").trim())
|
||||
.filter(Boolean);
|
||||
if (!names.length) return "";
|
||||
return `${state.settings.raceAudio?.language === "en" ? "Drivers" : "Förare"}: ${names.join(", ")}. `;
|
||||
.map((driver) => String(driver?.speechName || driver?.name || "").trim());
|
||||
const audio = normalizeRaceAudioSettings(state.settings.raceAudio);
|
||||
return formatHeatCallDrivers(names, resolveDriverCallStyle(audio.driverCallStyle, session?.type), audio.language);
|
||||
}
|
||||
function getDueCallFor(date) {
|
||||
return getDueCall(buildDayRows(date), { day: getDayPlan(date), snoozedUntil: (id) => callSnoozes.get(id) || 0 });
|
||||
@@ -2894,6 +2899,11 @@ const TRANSLATIONS = {
|
||||
"audio.practice_hype_hint": "Bara i träning, aldrig i kval eller final: varvjubileum, nära bästa varvet, snittet går ner, snabbare varv i rad, snabbare än förra gången, placering i klassen och dueller. Varje utrop kan också stängas av i listan nedan.",
|
||||
"audio.race_leader_calls": "Ledare i kval och final",
|
||||
"audio.practice_leader_calls": "Ny ledare i träning",
|
||||
"audio.driver_call_style": "Upprop och förskjuten start",
|
||||
"audio.driver_call_auto": "Auto (bilnummer i finaler, annars namn)",
|
||||
"audio.driver_call_names": "Namn",
|
||||
"audio.driver_call_numbers": "Bilnummer (bil 1, 2, 3)",
|
||||
"audio.driver_call_both": "Bilnummer + namn (bil 5 Anders)",
|
||||
"audio.practice_leader_on": "På",
|
||||
"audio.practice_leader_off": "Av (ingen kör mot någon)",
|
||||
"audio.race_leader_both": "Vid byte och var 2:a minut",
|
||||
@@ -5164,6 +5174,11 @@ const TRANSLATIONS = {
|
||||
"audio.practice_hype_hint": "Practice only, never in qualifying or finals: lap milestones, close to best, average going down, faster laps in a row, faster than last time, class rank and duels. Each call can also be turned off in the list below.",
|
||||
"audio.race_leader_calls": "Leader in qualifying and finals",
|
||||
"audio.practice_leader_calls": "New leader in practice",
|
||||
"audio.driver_call_style": "Heat call and staggered start",
|
||||
"audio.driver_call_auto": "Auto (car numbers in finals, names otherwise)",
|
||||
"audio.driver_call_names": "Names",
|
||||
"audio.driver_call_numbers": "Car numbers (car 1, 2, 3)",
|
||||
"audio.driver_call_both": "Car number + name (car 5 Anders)",
|
||||
"audio.practice_leader_on": "On",
|
||||
"audio.practice_leader_off": "Off (nobody races anyone)",
|
||||
"audio.race_leader_both": "On change and every 2 minutes",
|
||||
|
||||
+33
-1
@@ -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; }
|
||||
}
|
||||
|
||||
@@ -257,6 +257,7 @@ export function renderSettings(deps) {
|
||||
<label class="toggle" title="${t("audio.practice_hype_hint")}"><input type="checkbox" name="raceAudioPracticeHype" form="settingsForm" ${raceAudio.practiceHype ? "checked" : ""} /><span>${t("audio.practice_hype")}</span></label>
|
||||
<label title="${t("audio.lap_time_calls_hint")}"><span>${t("audio.lap_time_calls")}</span><select name="raceAudioLapTimeCalls" form="settingsForm">${["practice", "always", "off"].map((value) => `<option value="${value}" ${raceAudio.lapTimeCalls === value ? "selected" : ""}>${t("audio.lap_time_calls_" + value)}</option>`).join("")}</select></label>
|
||||
<label class="toggle"><input type="checkbox" name="raceAudioLapTimeCallName" form="settingsForm" ${raceAudio.lapTimeCallName ? "checked" : ""} /><span>${t("audio.lap_time_call_name")}</span></label>
|
||||
<label><span>${t("audio.driver_call_style")}</span><select name="raceAudioDriverCallStyle" form="settingsForm">${["auto", "names", "numbers", "both"].map((value) => `<option value="${value}" ${raceAudio.driverCallStyle === value ? "selected" : ""}>${t("audio.driver_call_" + value)}</option>`).join("")}</select></label>
|
||||
<label><span>${t("audio.practice_leader_calls")}</span><select name="raceAudioPracticeLeaderCalls" form="settingsForm">${["on", "off"].map((value) => `<option value="${value}" ${raceAudio.practiceLeaderCalls === value ? "selected" : ""}>${t("audio.practice_leader_" + value)}</option>`).join("")}</select></label>
|
||||
<label><span>${t("audio.race_leader_calls")}</span><select name="raceAudioLeaderCalls" form="settingsForm">${["both", "change", "off"].map((value) => `<option value="${value}" ${raceAudio.raceLeaderCalls === value ? "selected" : ""}>${t("audio.race_leader_" + value)}</option>`).join("")}</select></label>
|
||||
<label title="${t("audio.practice_pb_hint")}"><span>${t("audio.practice_pb_warmup")}</span><input type="number" min="0" max="30" step="1" name="raceAudioPbWarmup" form="settingsForm" value="${raceAudio.practicePbWarmupLaps}" /></label>
|
||||
@@ -674,6 +675,7 @@ Erik Eriksson;654321;4WD;Associated;;</code></pre>
|
||||
lapTimeCallName: form.get("raceAudioLapTimeCallName") === "on",
|
||||
raceLeaderCalls: String(form.get("raceAudioLeaderCalls") || "both"),
|
||||
practiceLeaderCalls: String(form.get("raceAudioPracticeLeaderCalls") || "on"),
|
||||
driverCallStyle: String(form.get("raceAudioDriverCallStyle") || "auto"),
|
||||
startSound: String(form.get("raceAudioStartSound") || "tone"),
|
||||
finishSound: String(form.get("raceAudioFinishSound") || "stop"),
|
||||
practicePbWarmupLaps: Number(form.get("raceAudioPbWarmup")),
|
||||
|
||||
@@ -36,6 +36,7 @@ export function renderSpeakerPanel({ state, t, escapeHtml }) {
|
||||
<label class="toggle"><input type="checkbox" data-speaker-audio="muted" ${audio.muted ? "checked" : ""} /><span>${t("speaker.muted")}</span></label>
|
||||
${select("lapTimeCalls", ["practice", "always", "off"], "audio.lap_time_calls", "audio.lap_time_calls_")}
|
||||
${select("raceLeaderCalls", ["both", "change", "off"], "audio.race_leader_calls", "audio.race_leader_")}
|
||||
${select("driverCallStyle", ["auto", "names", "numbers", "both"], "audio.driver_call_style", "audio.driver_call_")}
|
||||
${select("practiceLeaderCalls", ["on", "off"], "audio.practice_leader_calls", "audio.practice_leader_")}
|
||||
<label class="toggle"><input type="checkbox" data-speaker-audio="practiceHype" ${audio.practiceHype ? "checked" : ""} /><span>${t("audio.practice_hype")}</span></label>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user