From 2722949805c7e000a12f972d09f4c177f6194ad9 Mon Sep 17 00:00:00 2001
From: BenStullsBets <ben@benbetson.us>
Date: Fri, 26 Jun 2026 12:55:50 -0700
Subject: [PATCH] fix(audio): off/on Audio + Video toggles; fix Safari autoplay
 + GPU video-off
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Operator-driven live-UI revision:
- Video + Audio are now Dev-Mode-style on/off toggles (Audio on = soundtrack);
  white-noise deferred (removed from the live control; pure machinery kept).
- FIX video-off not blanking: the <video>/<canvas> are GPU-composited and could
  paint above the auto-z #black on a real GPU — give #black z-index + its own
  layer AND hide the video layers (opacity 0) on video-off.
- FIX no soundtrack on Safari/iOS: Safari unlocks <audio> only when play() runs
  INSIDE the user gesture; the start gesture now primes both A/B elements
  synchronously, so the async crossfades are allowed to play.
- Toggles wired on 'change' (matches the Dev Mode switch).
- player/audio.py AUDIO_SOURCES -> {off, soundtrack}; tests + E2E updated.
- Verified in headless Chromium AND WebKit: audio plays, video-off blanks both
  layers, zero JS errors. 288 tests + 3 Playwright E2E pass.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .gitignore                                    |  3 ++
 ...6-audio-video-separated-controls-design.md | 14 ++++-
 ...-06-26-networked-control-surface-design.md |  2 +-
 player/audio.py                               | 23 ++++-----
 player/controls.py                            |  2 +-
 player/state.py                               |  4 +-
 simulator/app.py                              |  5 +-
 simulator/build_audio_media.py                | 20 ++++----
 simulator/static/app.js                       | 51 ++++++++++++++-----
 simulator/static/index.html                   | 22 ++++----
 simulator/static/style.css                    |  9 +++-
 tests/test_e2e_audio.py                       | 43 ++++++++--------
 tests/test_player_audio.py                    | 28 +++++-----
 tests/test_player_controls.py                 |  6 +--
 tests/test_player_state.py                    |  8 +--
 tests/test_simulator_api.py                   | 12 ++---
 16 files changed, 146 insertions(+), 106 deletions(-)

diff --git a/.gitignore b/.gitignore
index 889577c..138ca78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ simulator/sample_media/**/*.m4a
 # Local-only candidate review galleries (re-buildable; not shipped content).
 simulator/static/review.html
 simulator/static/review_audio.html
+
+# Editor annotation/comment-thread metadata (not project content)
+.threads/
diff --git a/docs/superpowers/specs/2026-06-26-audio-video-separated-controls-design.md b/docs/superpowers/specs/2026-06-26-audio-video-separated-controls-design.md
index 6c0a456..6de6952 100644
--- a/docs/superpowers/specs/2026-06-26-audio-video-separated-controls-design.md
+++ b/docs/superpowers/specs/2026-06-26-audio-video-separated-controls-design.md
@@ -1,8 +1,18 @@
 # Audio + Video — separated Visual & Audio controls — design
 
-**Status:** proposed → in implementation (plan `docs/superpowers/plans/2026-06-26-audio-video-separated-controls.md`, session 0020)
+**Status:** proposed → built (sessions 0020 build + 0021 revision)
 **Date:** 2026-06-26
-**Session:** 0020 (audio)
+**Session:** 0020 (audio) · 0021 (live-UI revision)
+
+> **v1 build revision (session 0021, operator-driven):** the live **Audio** control
+> ships as a simple **off / soundtrack** toggle (styled like the Dev Mode switch),
+> and **Video** is the matching on/off toggle. **White-noise is deferred** with music
+> (the orthogonal Visual × Audio model and the synthesized-pink-noise machinery
+> remain in the codebase for when it's wanted). Two real-browser bugs were fixed in
+> this revision: video-off now blanks GPU-composited layers (z-index + explicit layer
+> hide), and the soundtrack now plays on Safari/iOS (audio elements unlocked
+> synchronously inside the start gesture). Sections below describe the fuller
+> off/soundtrack/white-noise design; v1 live = off/soundtrack.
 **Extends / reframes:** [`2026-06-26-networked-control-surface-design.md`](./2026-06-26-networked-control-surface-design.md)
 §3 (control inventory) and §5 (server contract) — its bundled **Content** selector
 is split into two orthogonal controls. Everything else in that spec (server-of-truth
diff --git a/docs/superpowers/specs/2026-06-26-networked-control-surface-design.md b/docs/superpowers/specs/2026-06-26-networked-control-surface-design.md
index a3e2fea..be8568b 100644
--- a/docs/superpowers/specs/2026-06-26-networked-control-surface-design.md
+++ b/docs/superpowers/specs/2026-06-26-networked-control-surface-design.md
@@ -75,7 +75,7 @@ inventory is exactly what the sim exposes today:
 | Control | Sim today | Physical form (later) |
 |---|---|---|
 | **Visual** | toggle (show video on/off) | 2-position switch |
-| **Audio** | 3-way `<select>` (off / soundtrack / white noise; ·music deferred) | rotary selector switch (3 pos) |
+| **Audio** | on/off toggle (on = per-altitude soundtrack; ·white-noise & music deferred) | 2-position switch (rotary selector when more sources land) |
 | **Altitude** | endless circular dial — walks the 5 scales (cosmos→abyss), wraps | rotary encoder (endless, detented) |
 | **Left** (analytical) | slider 0–4 | knob/pot, 5 detents |
 | **Right** (dreamlike) | slider 0–4 | knob/pot, 5 detents |
diff --git a/player/audio.py b/player/audio.py
index a2e706a..c28c769 100644
--- a/player/audio.py
+++ b/player/audio.py
@@ -2,17 +2,18 @@
 §4/§6). The single source of truth for: whether the projector shows video, and
 which audio url plays for a given (audio source, current altitude).
 
-Replaces player/content.py's 7-way bundled table. White-noise is a global,
-altitude-independent bed; soundtrack follows the single Altitude dial; off is
-silence. `music` is a reserved, deferred source — not in v1."""
+Replaces player/content.py's 7-way bundled table. Soundtrack follows the single
+Altitude dial; off is silence. `white_noise` and `music` are deferred sources —
+not in v1 (the live control is a simple Audio on/off toggle where on=soundtrack)."""
 
 from __future__ import annotations
 
 from dataclasses import dataclass
 
 VISUAL_POSITIONS = frozenset({"on", "off"})
-# v1 audio sources. "music" is reserved/deferred (no assets) and intentionally absent.
-AUDIO_SOURCES = frozenset({"off", "soundtrack", "white_noise"})
+# v1 audio sources. The live UI is an Audio on/off toggle (on=soundtrack).
+# "white_noise" and "music" are deferred (no live control) and intentionally absent.
+AUDIO_SOURCES = frozenset({"off", "soundtrack"})
 
 
 @dataclass(frozen=True)
@@ -31,24 +32,22 @@ def resolve_visual(position: str) -> bool:
     return position == "on"
 
 
-def resolve_audio_url(source: str, *, scale_audio: str, noise_url: str) -> str | None:
+def resolve_audio_url(source: str, *, scale_audio: str) -> str | None:
     """The audio url for (source, current altitude): soundtrack → the current
-    scale's asset (or None if none authored); white_noise → the global bed; off →
-    None. `scale_audio` is the ring scale's `audio` path (relative to /media/audio/)."""
+    scale's asset (or None if none authored); off → None. `scale_audio` is the ring
+    scale's `audio` path (relative to /media/audio/)."""
     if source not in AUDIO_SOURCES:
         raise ValueError(
             f"unknown audio source {source!r}; expected one of {sorted(AUDIO_SOURCES)}"
         )
     if source == "off":
         return None
-    if source == "white_noise":
-        return noise_url
     # soundtrack — couple to the current altitude's asset
     return f"/media/audio/{scale_audio}" if scale_audio else None
 
 
-def resolve_audio(source: str, *, scale_audio: str, noise_url: str) -> AudioResolution:
+def resolve_audio(source: str, *, scale_audio: str) -> AudioResolution:
     """The full render.audio view: source, resolved url, and whether it follows the
     Altitude dial (true only for soundtrack)."""
-    url = resolve_audio_url(source, scale_audio=scale_audio, noise_url=noise_url)
+    url = resolve_audio_url(source, scale_audio=scale_audio)
     return AudioResolution(source=source, url=url, altitude_coupled=(source == "soundtrack"))
diff --git a/player/controls.py b/player/controls.py
index 49c43c8..a6e1cbc 100644
--- a/player/controls.py
+++ b/player/controls.py
@@ -2,7 +2,7 @@
 
 This is the serial-contract payload shared with sub-project 4 (firmware). It
 models the full panel from the audio spec §3: a Visual toggle (on/off) + an
-Audio source selector (off/soundtrack/white_noise), the four experience knobs
+Audio source selector (off/soundtrack; white-noise/music deferred), the four experience knobs
 (0..4), and the two intensity levels (volume, brightness). The wire framing
 itself is the separate 3<->4 serial contract; this module is the *decoded* form.
 """
diff --git a/player/state.py b/player/state.py
index d4a70b8..186011c 100644
--- a/player/state.py
+++ b/player/state.py
@@ -36,12 +36,12 @@ class TransitionKind:
 class Playback:
     """What should currently be playing. Visual and audio are orthogonal (audio
     spec §2): `video` is whether the projector shows footage, `audio_source` is
-    the independent audio dial (off / soundtrack / white_noise)."""
+    the independent audio dial (off / soundtrack)."""
 
     clip_id: Optional[str]            # None = black walls
     plan: Optional[RenderPlan]        # None when black
     video: bool                       # whether footage is shown (Visual on/off)
-    audio_source: str                 # the Audio dial source (off/soundtrack/white_noise)
+    audio_source: str                 # the Audio dial source (off/soundtrack)
     volume: int
     brightness: int
 
diff --git a/simulator/app.py b/simulator/app.py
index eaa8e6f..ac55230 100644
--- a/simulator/app.py
+++ b/simulator/app.py
@@ -39,9 +39,6 @@ STATIC_DIR = Path(__file__).parent / "static"
 MEDIA_DIR = Path(__file__).parent / "sample_media"
 DEFAULT_MANIFEST = MEDIA_DIR / "manifest.json"
 
-# The global white-noise bed (audio spec §5.2): synthesized, altitude-independent.
-NOISE_URL = "/media/audio/noise/pink.mp3"
-
 # Per-process boot token: changes on every server restart so the dev live-reload
 # (below) also fires when Python code changes (which needs a restart), not just
 # when a static asset's mtime changes.
@@ -190,7 +187,7 @@ def create_app(manifest_path: Optional[Path] = None) -> FastAPI:
         scale_audio = ""
         if app.state.ring is not None:
             scale_audio = scale_at(app.state.ring, req.altitude_index).audio
-        audio = resolve_audio(c.audio, scale_audio=scale_audio, noise_url=NOISE_URL)
+        audio = resolve_audio(c.audio, scale_audio=scale_audio)
         return {
             "plan": render_plan_to_dict(plan),
             "render": {
diff --git a/simulator/build_audio_media.py b/simulator/build_audio_media.py
index ce3a5c2..4a1a3e0 100644
--- a/simulator/build_audio_media.py
+++ b/simulator/build_audio_media.py
@@ -1,18 +1,22 @@
-"""Production pass for the 5 per-altitude soundtracks + the white-noise bed
-(audio spec §5.3). The audio analogue of build_pool_manifest.py --media: read the
-sourced ambience clips (re-downloadable per docs/audio-candidate-pool.md), make
-each a seamless loudness-normalized loop, and synthesize the pink-noise bed.
+"""Production pass for the 5 per-altitude soundtracks (audio spec §5.3). The audio
+analogue of build_pool_manifest.py --media: read the sourced ambience clips
+(re-downloadable per docs/audio-candidate-pool.md), and make each a seamless
+loudness-normalized loop.
 
 Media is gitignored; this script is the reproducible record. Outputs land under
-simulator/sample_media/audio/<scale>/<name>.loop.mp3 and audio/noise/pink.mp3,
-served at /media/audio/...  Run:  python simulator/build_audio_media.py
+simulator/sample_media/audio/<scale>/<name>.loop.mp3, served at /media/audio/...
+Run:  python simulator/build_audio_media.py
+
+(White-noise is deferred — the live Audio control is a simple on/off soundtrack
+toggle. `tools.pipeline.audio_run.generate_white_noise` remains for when it's
+wanted, but no noise bed is built here.)
 """
 
 from __future__ import annotations
 
 from pathlib import Path
 
-from tools.pipeline.audio_run import generate_white_noise, process_soundtrack
+from tools.pipeline.audio_run import process_soundtrack
 
 AUDIO = Path(__file__).parent / "sample_media" / "audio"
 
@@ -35,8 +39,6 @@ def main() -> None:
             continue
         dst = process_soundtrack(src, AUDIO / scale / out)
         print(f"  produced {dst.relative_to(AUDIO.parent)}")
-    noise = generate_white_noise(AUDIO / "noise" / "pink.mp3")
-    print(f"  produced {noise.relative_to(AUDIO.parent)}")
 
 
 if __name__ == "__main__":
diff --git a/simulator/static/app.js b/simulator/static/app.js
index 82a97d8..b43aabe 100644
--- a/simulator/static/app.js
+++ b/simulator/static/app.js
@@ -495,14 +495,14 @@ function renderScaleReadout() {
 }
 
 function controls() {
-  // Visual (on/off) and Audio (off/soundtrack/white_noise) are orthogonal dials
-  // (audio spec §2). One bipolar Mood dial (-4 dark .. +4 light) maps onto the
-  // engine's two poles. Calibration gains are pinned to 1.0, so the simulator
-  // sends no calibration — the server uses DEFAULT_CALIBRATION.
+  // Video (on/off) and Audio (on/off) are orthogonal toggles (audio spec §2).
+  // Audio on = the per-altitude soundtrack (white-noise is deferred). One bipolar
+  // Mood dial (-4 dark .. +4 light) maps onto the engine's two poles. Calibration
+  // gains are pinned to 1.0, so the simulator sends no calibration.
   const mood = +$("mood").value;
   return {
     visual: $("visual").checked ? "on" : "off",
-    audio: $("audio").value,
+    audio: $("audio").checked ? "soundtrack" : "off",
     left: +$("left").value, right: +$("right").value,
     dark: mood < 0 ? -mood : 0, light: mood > 0 ? mood : 0,
     volume: 2, brightness: 2,
@@ -520,8 +520,17 @@ async function update() {
   const data = await resp.json();
   readout.textContent = JSON.stringify(data, null, 2);
   applyAudio(data.render.audio);                       // reconcile the audio layer
-  if (!data.render.video.shown) { black.style.opacity = "1"; black.classList.remove("hidden"); return; }
+  if (!data.render.video.shown) {
+    // Blank the screen. Cover with #black AND hide the video layers themselves —
+    // the <video>/<canvas> are GPU-composited and can otherwise show through the
+    // overlay on a real GPU (Safari/Chrome).
+    black.style.opacity = "1"; black.classList.remove("hidden");
+    vid.style.opacity = "0"; paint.style.opacity = "0";
+    return;
+  }
   black.classList.add("hidden");
+  vid.style.opacity = ""; paint.style.opacity = "";    // restore the video layers
+
   try {
     ensureClipMedia();
     applyVideoLook(data.plan.grade.tone, data.plan.dream.intensity);
@@ -944,6 +953,13 @@ async function applyAudio(audio) {
   [audActive, audIdle] = [audIdle, audActive];   // swap roles
 }
 
+// The current altitude's soundtrack url (the ring carries each scale's `audio`),
+// resolved client-side so the start gesture can unlock the elements synchronously.
+function soundtrackUrl() {
+  const s = ring && ring.scales[ringIndex];
+  return s && s.audio ? "/media/audio/" + s.audio : null;
+}
+
 // Browsers block autoplay until a user gesture. The renderer is launched
 // full-screen by the operator; a one-time tap unlocks audio, then it follows
 // state (audio spec §8 — the documented launch step).
@@ -953,11 +969,21 @@ function showStartGesture() {
   ov.id = "start-gesture";
   ov.textContent = "▶ tap to start sound";
   ov.addEventListener("click", () => {
-    // A click anywhere on the page grants Chrome's autoplay permission
-    // document-wide for the session, so later programmatic play() is allowed —
-    // no per-element priming needed (priming srcless elements only pollutes state).
     audioReady = true;
     ov.remove();
+    // Safari unlocks an <audio> element ONLY when play() is called inside the
+    // user gesture itself — not in a later async continuation (Chrome is lenient;
+    // Safari/iOS is not). Prime BOTH A/B elements now, synchronously, at volume 0,
+    // so the async applyAudio() crossfades that follow are allowed to play.
+    const url = soundtrackUrl();
+    if (url) for (const el of [audA, audB]) {
+      try {
+        el.src = mediaUrl(url);
+        el.volume = 0;
+        const pr = el.play();
+        if (pr) pr.then(() => el.pause()).catch(() => {});
+      } catch (_) { /* priming is best-effort */ }
+    }
     audUrl = null;                       // force the next applyAudio to (re)load
     update();                            // re-apply current state, now with audio
   }, { once: true });
@@ -973,9 +999,10 @@ async function main() {
   buildDial();                // draw the altitude knob from the ring's scales
   initDev();                  // wire the Dev Mode toggle + pool picker (reads persisted state)
   renderScaleReadout();
-  for (const id of ["visual", "audio", "left", "right", "mood"]) {
-    $(id).addEventListener("input", debounced);
-  }
+  // Sliders stream on "input"; the Video/Audio toggles fire on "change" (matches
+  // the Dev Mode switch and is the reliable checkbox event across browsers).
+  for (const id of ["left", "right", "mood"]) $(id).addEventListener("input", debounced);
+  for (const id of ["visual", "audio"]) $(id).addEventListener("change", debounced);
   showStartGesture();         // one-time tap unlocks audio (browser autoplay policy, §8)
   // Altitude knob: drag to turn (commit detents on release), scroll to step, tap a label to jump.
   dial.addEventListener("pointerdown", onDialDown);
diff --git a/simulator/static/index.html b/simulator/static/index.html
index 4582ef8..649bbf6 100644
--- a/simulator/static/index.html
+++ b/simulator/static/index.html
@@ -24,17 +24,17 @@
 
     <section class="panel">
       <fieldset>
-        <legend>Visual</legend>
-        <label class="toggle"><input type="checkbox" id="visual" checked /> show video</label>
-      </fieldset>
-
-      <fieldset>
-        <legend>Audio</legend>
-        <select id="audio">
-          <option value="off">off (silence)</option>
-          <option value="soundtrack">soundtrack (follows altitude)</option>
-          <option value="white_noise">white noise</option>
-        </select>
+        <legend>Output</legend>
+        <label class="dev-switch" for="visual">
+          <input type="checkbox" id="visual" checked />
+          <span class="dev-switch-track"><span class="dev-switch-thumb"></span></span>
+          <span class="dev-switch-label">Video</span>
+        </label>
+        <label class="dev-switch" for="audio">
+          <input type="checkbox" id="audio" />
+          <span class="dev-switch-track"><span class="dev-switch-thumb"></span></span>
+          <span class="dev-switch-label">Audio</span>
+        </label>
       </fieldset>
 
       <fieldset>
diff --git a/simulator/static/style.css b/simulator/static/style.css
index e615760..9fd6f8a 100644
--- a/simulator/static/style.css
+++ b/simulator/static/style.css
@@ -40,8 +40,15 @@ main { display: flex; gap: 1rem; padding: 1rem; flex-wrap: wrap; align-items: fl
 .hud-chip-text.measure { fill: #ffd79a; }
 .hud-conf { fill: #6cf; opacity: 0.8; }
 .hud-status { fill: #8fdcff; font: 2.4px monospace; opacity: 0.9; letter-spacing: 0.15px; }
-.black { position: absolute; inset: 0; background: #000; opacity: 1; transition: opacity 200ms ease; }
+/* z-index + own compositing layer: the <video> and WebGL <canvas> are GPU-
+   composited layers that can paint ABOVE a plain auto-z sibling (Safari/Chrome
+   with a real GPU) despite DOM order — so the black cover needs an explicit
+   stacking order above them to actually blank the screen. */
+.black { position: absolute; inset: 0; background: #000; opacity: 1;
+         z-index: 50; transform: translateZ(0); transition: opacity 200ms ease; }
 .hidden { display: none; }
+/* Stack the two Output toggles (Video / Audio) with a little breathing room. */
+.dev-switch + .dev-switch { margin-top: 0.45rem; }
 .panel { flex: 0 0 280px; display: flex; flex-direction: column; gap: 0.8rem;
          max-height: calc(100vh - 2rem); overflow-y: auto;
          position: sticky; top: 1rem; }
diff --git a/tests/test_e2e_audio.py b/tests/test_e2e_audio.py
index 7798584..b19d6ce 100644
--- a/tests/test_e2e_audio.py
+++ b/tests/test_e2e_audio.py
@@ -63,36 +63,37 @@ def page(app_url):
         browser.close()
 
 
-def test_white_noise_loads_the_noise_asset(page):
-    page.select_option("#audio", "white_noise")
-    page.wait_for_function(
-        "['audA','audB'].some(id => "
-        "document.getElementById(id).src.includes('/media/audio/noise/pink.mp3'))"
-    )
-
-
-def test_soundtrack_loads_the_current_scale_asset(page):
-    # initial altitude is cosmos (index 0) → soundtrack resolves its scale asset,
-    # not the noise bed (the altitude-coupling itself is covered at the API tier)
-    page.select_option("#audio", "soundtrack")
+def test_audio_toggle_plays_the_current_scale_soundtrack(page):
+    # Audio on (toggle) → the current altitude's soundtrack (cosmos at index 0) plays
+    page.click("label[for='audio'] .dev-switch-track")
     page.wait_for_function(
         "['audA','audB'].some(id => {"
-        "  const s = document.getElementById(id).src;"
-        "  return /\\/media\\/audio\\/.+\\.mp3/.test(s) && !s.includes('noise');"
+        "  const a = document.getElementById(id);"
+        "  return /\\/media\\/audio\\/.+\\.mp3/.test(a.src) && !a.paused;"
         "})"
     )
 
 
-def test_visual_off_keeps_audio_and_fades_video(page):
-    page.select_option("#audio", "white_noise")
+def test_video_toggle_off_blanks_the_screen_and_hides_layers(page):
+    page.click("label[for='visual'] .dev-switch-track")
+    page.wait_for_selector("#black:not(.hidden)")        # black cover shown
+    # the video layers themselves are hidden too (GPU-composite-proof blanking);
+    # wait for the opacity transition to settle to 0
     page.wait_for_function(
-        "['audA','audB'].some(id => "
-        "document.getElementById(id).src.includes('/media/audio/noise/pink.mp3'))"
+        "['vid','paint'].every(id => getComputedStyle(document.getElementById(id)).opacity === '0')"
     )
-    page.uncheck("#visual")
-    page.wait_for_selector("#black:not(.hidden)")       # video faded to black
+
+
+def test_audio_survives_video_off(page):
+    page.click("label[for='audio'] .dev-switch-track")
+    page.wait_for_function(
+        "['audA','audB'].some(id => !document.getElementById(id).paused "
+        "&& document.getElementById(id).src)"
+    )
+    page.click("label[for='visual'] .dev-switch-track")
+    page.wait_for_selector("#black:not(.hidden)")
     playing = page.evaluate(
         "['audA','audB'].some(id => "
         "{const a = document.getElementById(id); return !a.paused && !!a.src;})"
     )
-    assert playing is True                               # audio survives the video fade
+    assert playing is True                               # audio keeps playing with video off
diff --git a/tests/test_player_audio.py b/tests/test_player_audio.py
index c65bc68..692f5f8 100644
--- a/tests/test_player_audio.py
+++ b/tests/test_player_audio.py
@@ -10,9 +10,6 @@ from player.audio import (
     resolve_visual,
 )
 
-NOISE = "/media/audio/noise/pink.mp3"
-
-
 def test_visual_on_off():
     assert resolve_visual("on") is True
     assert resolve_visual("off") is False
@@ -27,37 +24,36 @@ def test_visual_positions_are_on_off():
     assert VISUAL_POSITIONS == frozenset({"on", "off"})
 
 
+def test_audio_sources_are_off_and_soundtrack():
+    assert AUDIO_SOURCES == frozenset({"off", "soundtrack"})
+
+
 def test_soundtrack_resolves_to_the_current_scales_asset():
-    url = resolve_audio_url("soundtrack", scale_audio="coast/waves.loop.mp3", noise_url=NOISE)
+    url = resolve_audio_url("soundtrack", scale_audio="coast/waves.loop.mp3")
     assert url == "/media/audio/coast/waves.loop.mp3"
 
 
-def test_white_noise_resolves_to_the_global_bed_independent_of_altitude():
-    url = resolve_audio_url("white_noise", scale_audio="coast/waves.loop.mp3", noise_url=NOISE)
-    assert url == NOISE
-
-
 def test_off_resolves_to_silence():
-    assert resolve_audio_url("off", scale_audio="coast/waves.loop.mp3", noise_url=NOISE) is None
+    assert resolve_audio_url("off", scale_audio="coast/waves.loop.mp3") is None
 
 
 def test_soundtrack_with_no_scale_asset_is_silent():
-    assert resolve_audio_url("soundtrack", scale_audio="", noise_url=NOISE) is None
+    assert resolve_audio_url("soundtrack", scale_audio="") is None
 
 
 def test_resolve_audio_marks_only_soundtrack_altitude_coupled():
-    r = resolve_audio("soundtrack", scale_audio="reef/soundscape.loop.mp3", noise_url=NOISE)
+    r = resolve_audio("soundtrack", scale_audio="reef/soundscape.loop.mp3")
     assert isinstance(r, AudioResolution)
     assert r.source == "soundtrack" and r.altitude_coupled is True
     assert r.url == "/media/audio/reef/soundscape.loop.mp3"
-    assert resolve_audio("white_noise", scale_audio="x/y.mp3", noise_url=NOISE).altitude_coupled is False
-    assert resolve_audio("off", scale_audio="x/y.mp3", noise_url=NOISE).altitude_coupled is False
+    assert resolve_audio("off", scale_audio="x/y.mp3").altitude_coupled is False
 
 
 def test_resolve_audio_url_rejects_unknown_source():
     with pytest.raises(ValueError):
-        resolve_audio_url("podcast", scale_audio="", noise_url=NOISE)
+        resolve_audio_url("white_noise", scale_audio="")   # deferred, not a v1 source
 
 
-def test_music_is_not_a_v1_source():
+def test_music_and_white_noise_are_not_v1_sources():
     assert "music" not in AUDIO_SOURCES
+    assert "white_noise" not in AUDIO_SOURCES
diff --git a/tests/test_player_controls.py b/tests/test_player_controls.py
index 794723f..e81d3d9 100644
--- a/tests/test_player_controls.py
+++ b/tests/test_player_controls.py
@@ -11,7 +11,7 @@ from player.controls import (
 
 def test_visual_and_audio_enums_are_the_v1_positions():
     assert VISUAL_POSITIONS == frozenset({"on", "off"})
-    assert AUDIO_SOURCES == frozenset({"off", "soundtrack", "white_noise"})
+    assert AUDIO_SOURCES == frozenset({"off", "soundtrack"})
 
 
 def test_valid_controls_pass_validation():
@@ -47,10 +47,10 @@ def test_out_of_range_or_non_int_knob_rejected(field, bad):
 
 def test_parse_controls_from_mapping():
     c = parse_controls(
-        {"visual": "on", "audio": "white_noise", "left": 1, "right": 2, "dark": 3,
+        {"visual": "on", "audio": "soundtrack", "left": 1, "right": 2, "dark": 3,
          "light": 0, "volume": 2, "brightness": 1}
     )
-    assert c == Controls("on", "white_noise", 1, 2, 3, 0, 2, 1)
+    assert c == Controls("on", "soundtrack", 1, 2, 3, 0, 2, 1)
 
 
 def test_parse_controls_rejects_unknown_keys():
diff --git a/tests/test_player_state.py b/tests/test_player_state.py
index 5072352..ad29385 100644
--- a/tests/test_player_state.py
+++ b/tests/test_player_state.py
@@ -38,11 +38,11 @@ def test_visual_off_from_video_fades_to_black():
 
 
 def test_audio_survives_visual_off():
-    # white noise + black is now reachable (the gap the bundled dial omitted)
+    # soundtrack + black is reachable (a gap the bundled dial omitted)
     p = Player(LIB)
-    t = p.update(_controls(visual="off", audio="white_noise"))
+    t = p.update(_controls(visual="off", audio="soundtrack"))
     assert t.playback.video is False
-    assert t.playback.audio_source == "white_noise"
+    assert t.playback.audio_source == "soundtrack"
 
 
 def test_no_change_yields_none_transition():
@@ -90,7 +90,7 @@ def test_volume_only_change_is_a_live_update():
 
 def test_audio_source_change_while_black_is_a_live_update():
     p = Player(LIB)
-    p.update(_controls(visual="off", audio="white_noise"))
+    p.update(_controls(visual="off", audio="off"))
     t = p.update(_controls(visual="off", audio="soundtrack"))
     assert t.kind == TransitionKind.LIVE_UPDATE
     assert t.playback.audio_source == "soundtrack"
diff --git a/tests/test_simulator_api.py b/tests/test_simulator_api.py
index 14f094a..7ebcb7e 100644
--- a/tests/test_simulator_api.py
+++ b/tests/test_simulator_api.py
@@ -56,13 +56,11 @@ def test_alteration_visual_off_hides_video(client):
     assert body["render"]["video"]["shown"] is False
 
 
-def test_alteration_white_noise_is_altitude_independent(ring_client):
-    for idx in (0, 1, 2):
-        body = ring_client.post("/api/alteration", json={
-            "controls": _controls(audio="white_noise"), "altitude_index": idx,
-        }).json()
-        assert body["render"]["audio"]["url"] == "/media/audio/noise/pink.mp3"
-        assert body["render"]["audio"]["altitude_coupled"] is False
+def test_alteration_off_is_silent(ring_client):
+    body = ring_client.post("/api/alteration", json={
+        "controls": _controls(audio="off"), "altitude_index": 0,
+    }).json()
+    assert body["render"]["audio"] == {"source": "off", "url": None, "altitude_coupled": False}
 
 
 def test_alteration_soundtrack_couples_to_the_given_altitude(ring_client):