diff --git a/CHANGELOG.md b/CHANGELOG.md index 4465ea2..ef9f688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.56.0 - 2026-11-03 + +### Added + +- The start and finish signals can be chosen under Settings → Audio, each with ▶ to listen: start signal Trumpet (default), Air horn or Beep; finish signal Trumpet fanfare (default), Air horn or Classic. + +### Changed + +- New default sounds: a trumpet blast for the start (`start_trumpet.wav`) and a short trumpet fanfare at the finish (`finish_fanfare.wav`). + ## 1.55.2 - 2026-11-03 ### Fixed diff --git a/README.md b/README.md index 34cc23e..7156ce3 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Swedish version: [README.sv.md](README.sv.md) · Changes: [CHANGELOG.md](CHANGEL ## Highlights - **Race Day page** with heat queue, preflight checks and one-click start. -- **Start procedure as in EFRA/IFMAR:** a count-down with announcements (2 min, 1 min, 30 s, 10, 9 … 3), hold for the grid, flying start for qualifying, and grid start with lights and a horn 1-3 s after "3" for finals. The start and the end of a race are signalled with an air horn. +- **Start procedure as in EFRA/IFMAR:** a count-down with announcements (2 min, 1 min, 30 s, 10, 9 … 3), hold for the grid, flying start for qualifying, and grid start with lights and a horn 1-3 s after "3" for finals. The start and the end of a race are signalled with a trumpet blast and a trumpet fanfare by default; air horn or the classic sounds can be chosen under Settings → Audio. - **Transponder check** during the count-down: a green tick for every driver seen, and a wrong transponder fixed in one click. - **Qualifying and finals:** generated from the entry list with evenly split heats, A/B/C finals, bump-ups, points tables, tie-breaks and a drag-and-drop grid. - **Series / cup:** a points table, best N or drop X, a club-members-only option, standings per class, and each round run from the series page. diff --git a/README.sv.md b/README.sv.md index 26e6f4f..00acf0f 100644 --- a/README.sv.md +++ b/README.sv.md @@ -33,7 +33,7 @@ English version: [README.md](README.md) · Ändringar: [CHANGELOG.md](CHANGELOG. ## Höjdpunkter - **Race Day-sida** med heat-kö, förkontroll och start med ett klick. -- **Startförfarande som i EFRA/IFMAR:** nedräkning med utrop (2 min, 1 min, 30 s, 10, 9 … 3), paus medan bilarna ställs upp, flygande start för kval och gridstart med startljus och tuta 1-3 s efter "3" för finaler. Start och målgång signaleras med en tryckluftstuta. +- **Startförfarande som i EFRA/IFMAR:** nedräkning med utrop (2 min, 1 min, 30 s, 10, 9 … 3), paus medan bilarna ställs upp, flygande start för kval och gridstart med startljus och tuta 1-3 s efter "3" för finaler. Start och målgång signaleras som standard med en trumpetstöt och en trumpetfanfar; tryckluftstuta eller de klassiska ljuden kan väljas under Inställningar → Ljud. - **Transponderkontroll** under nedräkningen: grön bock för varje förare som passerat, och fel transponder rättas med ett klick. - **Kval och finaler:** skapas från deltagarlistan med jämnt fördelade heat, A/B/C-finaler, bump-up, poängtabeller, tie-break och grid med dra-och-släpp. - **Serie / cup:** poängtabell, bästa N eller stryk X, val för endast klubbmedlemmar, ställning per klass och varje deltävling sköts från seriesidan. diff --git a/package-lock.json b/package-lock.json index a2fb7de..ce59d1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.55.2", + "version": "1.56.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.55.2", + "version": "1.56.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 0545767..cc52d6a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.55.2", + "version": "1.56.0", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/rc-race-sound-pack/README.md b/rc-race-sound-pack/README.md index ab3d5ec..676d598 100644 --- a/rc-race-sound-pack/README.md +++ b/rc-race-sound-pack/README.md @@ -25,7 +25,7 @@ Keep announcements dry (no reverb) so they remain intelligible over RC cars and 1. Play `drivers_ready` 2. Play `start_phrase` 3. Wait a random 1–4 seconds -4. Play `effects/start_horn.wav` (an air horn; `start_beep.wav` is kept as an alternative) +4. Play the start signal chosen in Settings: `effects/start_trumpet.wav` (default), `start_horn.wav` or `start_beep.wav`. The finish plays `finish_fanfare.wav` (default), `finish_horn.wav` or `race_finish.wav` 5. Start race timing on the tone ## Integration diff --git a/rc-race-sound-pack/sound_manifest.json b/rc-race-sound-pack/sound_manifest.json index 43b9be1..f9415a8 100644 --- a/rc-race-sound-pack/sound_manifest.json +++ b/rc-race-sound-pack/sound_manifest.json @@ -2,10 +2,10 @@ "format": { "sample_rate": 48000, "channels": 1, "pcm": "16-bit", "recommended_runtime_gain_db": -6 }, "effects": [ "fastest_lap_trophy.wav", "final_lap.wav", "personal_best.wav", "position_gain.wav", "position_loss.wav", - "finish_horn.wav", "race_finish.wav", "start_beep.wav", "start_horn.wav", "track_record_fanfare.wav", "transponder_pass.wav", "warning.wav" + "finish_fanfare.wav", "finish_horn.wav", "race_finish.wav", "start_beep.wav", "start_horn.wav", "start_trumpet.wav", "track_record_fanfare.wav", "transponder_pass.wav", "warning.wav" ], "events": { - "start_tone": { "effect": "effects/start_horn.wav" }, + "start_tone": { "effect": "effects/start_trumpet.wav" }, "transponder_pass": { "effect": "effects/transponder_pass.wav" }, "transponder_detected": { "effect": "effects/transponder_pass.wav" }, "training_stable_pace": { "voice": "training_stable_pace" }, @@ -17,8 +17,8 @@ "position_gain": { "effect": "effects/position_gain.wav" }, "position_loss": { "effect": "effects/position_loss.wav" }, "final_lap": { "effect": "effects/final_lap.wav" }, - "race_finished": { "effect": "effects/finish_horn.wav" }, - "qualifying_finished": { "effect": "effects/finish_horn.wav" }, + "race_finished": { "effect": "effects/finish_fanfare.wav" }, + "qualifying_finished": { "effect": "effects/finish_fanfare.wav" }, "race_winner": { "effect": "effects/fastest_lap_trophy.wav" }, "heat_winner": { "effect": "effects/fastest_lap_trophy.wav" }, "overall_winner": { "effect": "effects/fastest_lap_trophy.wav" }, @@ -108,7 +108,7 @@ "runtime": { "start_delay_seconds": { "min": 1.0, "max": 4.0, "randomize": true }, "passing_sound": "effects/transponder_pass.wav", "passing_sound_pool": ["pass_01.wav", "pass_02.wav", "pass_03.wav", "pass_04.wav", "pass_05.wav", "pass_06.wav", "pass_07.wav", "pass_08.wav"], - "start_sound": "effects/start_horn.wav", "fastest_lap_sound": "effects/fastest_lap_trophy.wav", - "track_record_sound": "effects/track_record_fanfare.wav", "finish_sound": "effects/finish_horn.wav" + "start_sound": "effects/start_trumpet.wav", "fastest_lap_sound": "effects/fastest_lap_trophy.wav", + "track_record_sound": "effects/track_record_fanfare.wav", "finish_sound": "effects/finish_fanfare.wav" } } diff --git a/rc-race-sound-pack/sounds/effects/finish_fanfare.wav b/rc-race-sound-pack/sounds/effects/finish_fanfare.wav new file mode 100644 index 0000000..2be1118 Binary files /dev/null and b/rc-race-sound-pack/sounds/effects/finish_fanfare.wav differ diff --git a/rc-race-sound-pack/sounds/effects/start_trumpet.wav b/rc-race-sound-pack/sounds/effects/start_trumpet.wav new file mode 100644 index 0000000..c74ad92 Binary files /dev/null and b/rc-race-sound-pack/sounds/effects/start_trumpet.wav differ diff --git a/src/app.js b/src/app.js index 393e1b4..995b03a 100644 --- a/src/app.js +++ b/src/app.js @@ -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", diff --git a/src/race_audio.js b/src/race_audio.js index d55557f..5b8804b 100644 --- a/src/race_audio.js +++ b/src/race_audio.js @@ -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; diff --git a/src/settings.js b/src/settings.js index d77a7f9..8d48359 100644 --- a/src/settings.js +++ b/src/settings.js @@ -263,6 +263,8 @@ export function renderSettings(deps) { + + @@ -634,6 +636,8 @@ Erik Eriksson;654321;4WD;Associated;; 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), diff --git a/src/styles.css b/src/styles.css index 3b49328..594d08e 100644 --- a/src/styles.css +++ b/src/styles.css @@ -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; } diff --git a/tests/race_audio.test.js b/tests/race_audio.test.js index 5a04a3d..88989b3 100644 --- a/tests/race_audio.test.js +++ b/tests/race_audio.test.js @@ -63,7 +63,7 @@ test("start lights, random delay and tone precede the official start callback", await engine.runStartSequence({ id: "race", type: "final" }, { onTone: () => calls.push(["timing-start"]) }); assert.deepEqual(states, ["IDLE", "GRID", "READY", "LIGHT_1", "LIGHT_2", "LIGHT_3", "LIGHT_4", "LIGHT_5", "WAIT_RANDOM", "GO"]); assert.equal(calls.at(-1)[0], "timing-start"); - assert.deepEqual(calls.slice(-3), [["wait", 2500], ["effect", "/race-sounds/sounds/effects/start_beep.wav"], ["timing-start"]]); + assert.deepEqual(calls.slice(-3), [["wait", 2500], ["effect", "/race-sounds/sounds/effects/start_trumpet.wav"], ["timing-start"]]); }); test("staggered start mode calls out each car in grid order, 3s apart, after the official start", async () => { @@ -105,7 +105,7 @@ test("a flying start has no start procedure: horn, then 'clock is running' (EFRA await engine.runStartSequence({ id: "q1", type: "qualification", startMode: "flying" }, { onTone: () => calls.push(["timing-start"]), skipCountdown: true }); await new Promise((resolve) => setImmediate(resolve)); assert.deepEqual(states, ["IDLE", "GRID", "GO"], "no lights and no random delay"); - assert.deepEqual(calls, [["effect", "start_beep.wav"], ["timing-start"], ["voice", "Klockan går."]]); + assert.deepEqual(calls, [["effect", "start_trumpet.wav"], ["timing-start"], ["voice", "Klockan går."]]); }); test("after the prologue a grid start skips its own count-down and intro calls", async () => { @@ -115,7 +115,7 @@ test("after the prologue a grid start skips its own count-down and intro calls", assert.equal(calls.length, 3, "only the quiet and the horn are left"); assert.equal(calls[0][0], "wait"); assert.ok(calls[0][1] >= 1000 && calls[0][1] <= 3000, "1-3 s of quiet"); - assert.deepEqual(calls.slice(1), [["effect", "start_beep.wav"], ["timing-start"]]); + assert.deepEqual(calls.slice(1), [["effect", "start_trumpet.wav"], ["timing-start"]]); }); test("after the count-down's 3 it is quiet until the horn 1-3 s later, with the lights inside that time", async () => { @@ -133,7 +133,7 @@ test("after the count-down's 3 it is quiet until the horn 1-3 s later, with the assert.equal(calls.filter(([kind]) => kind === "voice").length, 0, "nothing is said"); const waited = calls.filter(([kind]) => kind === "wait").reduce((sum, [, ms]) => sum + ms, 0); assert.ok(Math.abs(waited - totalMs) <= 6, `horn ${totalMs} ms after the 3, was ${waited}`); - assert.deepEqual(calls.at(-1), ["effect", "start_beep.wav"]); + assert.deepEqual(calls.at(-1), ["effect", "start_trumpet.wav"]); } }); @@ -313,3 +313,14 @@ test("count-down calls replace each other instead of queueing, and late ones are assert.equal(await late.voiceDone, false); assert.ok(!spoken.includes("6")); }); + +test("the start and finish signals are chosen in Settings: trumpet and fanfare by default", async () => { + for (const [settings, start, finish] of [[{}, "start_trumpet.wav", "finish_fanfare.wav"], [{ startSound: "horn", finishSound: "classic" }, "start_horn.wav", "race_finish.wav"]]) { + const calls = []; + const engine = createRecordingEngine(calls, settings); + await engine.playEffect("start_tone", { force: true }); + await engine.playEffect("race_finished", { force: true }); + assert.deepEqual(calls, [["effect", start], ["effect", finish]]); + } + assert.equal(normalizeRaceAudioSettings({ startSound: "nope" }).startSound, "trumpet"); +}); diff --git a/tests/server_persistence.integration.test.js b/tests/server_persistence.integration.test.js index 0dc50fe..bbf3e26 100644 --- a/tests/server_persistence.integration.test.js +++ b/tests/server_persistence.integration.test.js @@ -115,7 +115,7 @@ test("SQLite API persists state, passings, and overlay session results", { timeo const soundManifestResponse = await fetch(`${baseUrl}/race-sounds/sound_manifest.json`); const soundManifest = await soundManifestResponse.json(); assert.equal(soundManifestResponse.status, 200); - assert.equal(soundManifest.events.start_tone.effect, "effects/start_horn.wav"); + assert.equal(soundManifest.events.start_tone.effect, "effects/start_trumpet.wav"); assert.equal(soundManifest.voice_events.sv.track_call, "Stopp på banan. Stopp på banan."); const ammcConfigResponse = await fetch(`${baseUrl}/api/ammc/config`, {