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

+22 -7
View File
@@ -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",