@real-music-packages/web-core 0.12.0 → 0.13.0

package/dist/scene/index.js

@@ -2617,6 +2617,96 @@ registerLayer(circleOfFifthsFactory);
 registerLayer(pitchContourFactory);
 registerLayer(sectionMinimapFactory);
 
+// src/scene/audioLayers.ts
+function countInSchedule(opts) {
+  const beats = opts.beats ?? 4;
+  const accent = opts.accentDownbeat ?? true;
+  const beatSec = 60 / opts.bpm;
+  const events = [];
+  for (let i = 0; i < beats; i++) {
+    const isDownbeat = accent && i === 0;
+    events.push({
+      atSec: i * beatSec,
+      note: isDownbeat ? "C6" : "C5",
+      durSec: 0.05,
+      gain: isDownbeat ? 1 : 0.7,
+      kind: "count"
+    });
+  }
+  return events;
+}
+function countInLeadSec(opts) {
+  return (opts.beats ?? 4) * (60 / opts.bpm);
+}
+function clickTrackSchedule(opts) {
+  const beatSec = 60 / opts.bpm;
+  const bpb = opts.beatsPerBar ?? 4;
+  const start = opts.startSec ?? 0;
+  const events = [];
+  const n = Math.floor(opts.durationSec / beatSec);
+  for (let i = 0; i < n; i++) {
+    const isDownbeat = i % bpb === 0;
+    events.push({
+      atSec: start + i * beatSec,
+      note: isDownbeat ? "C6" : "C5",
+      durSec: 0.03,
+      gain: isDownbeat ? 0.6 : 0.4,
+      kind: "click"
+    });
+  }
+  return events;
+}
+function droneSchedule(opts) {
+  const gain = opts.gain ?? 0.15;
+  const events = [
+    { atSec: 0, note: opts.root, durSec: opts.durationSec, gain, kind: "drone" }
+  ];
+  if (opts.fifth ?? true) {
+    events.push({ atSec: 0, note: transposeFifth(opts.root), durSec: opts.durationSec, gain, kind: "drone" });
+  }
+  return events;
+}
+function transposeFifth(note) {
+  const m = /^([A-G])(#|b)?(\d)$/.exec(note);
+  if (!m) return note;
+  const order = ["C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"];
+  const pcMap = { C: 0, D: 2, E: 4, F: 5, G: 7, A: 9, B: 11 };
+  let pc = pcMap[m[1]] + (m[2] === "#" ? 1 : m[2] === "b" ? -1 : 0);
+  let oct = parseInt(m[3], 10);
+  pc += 7;
+  if (pc >= 12) {
+    pc -= 12;
+    oct += 1;
+  }
+  return `${order[pc]}${oct}`;
+}
+function duckGainAt(windows, tSec, floor = 0.25, rampSec = 0.2) {
+  for (const w of windows) {
+    if (tSec >= w.startSec - rampSec && tSec <= w.endSec + rampSec) {
+      if (tSec < w.startSec) return lerpGain(1, floor, (tSec - (w.startSec - rampSec)) / rampSec);
+      if (tSec > w.endSec) return lerpGain(floor, 1, (tSec - w.endSec) / rampSec);
+      return floor;
+    }
+  }
+  return 1;
+}
+function lerpGain(a, b, t) {
+  const k = t < 0 ? 0 : t > 1 ? 1 : t;
+  return a + (b - a) * k;
+}
+function applySchedule(instrument, schedule, startTime) {
+  for (const ev of schedule) {
+    if (ev.note == null) continue;
+    instrument.triggerAttackRelease(
+      ev.note,
+      ev.durSec ?? 0.05,
+      startTime + ev.atSec,
+      ev.gain ?? 1
+    );
+  }
+  return schedule.length;
+}
+
 // src/scene/camera.ts
 function cameraTransform(cam, W, H) {
   const s = cam.zoom;
@@ -2658,7 +2748,7 @@ function resolveTimeline(spec, totalSec) {
   return spec.timeline.map((seg) => {
     const startSec = resolveAnchor(seg.at[0], totalSec);
     const endSec = resolveAnchor(seg.at[1], totalSec);
-    return { startMs: startSec * 1e3, endMs: endSec * 1e3, layers: seg.layers };
+    return { startMs: startSec * 1e3, endMs: endSec * 1e3, layers: seg.layers, audio: seg.audio };
   });
 }
 function visualTimelineMs(resolved) {
@@ -2734,6 +2824,21 @@ async function buildScene(opts) {
     }
     ctx2d.restore();
   }
+  function scheduleAudio(instrument, baseSec) {
+    let fired = 0;
+    for (const seg of resolved) {
+      if (!seg.audio) continue;
+      const segStartSec = baseSec + seg.startMs / 1e3;
+      if (seg.audio.schedule?.length) {
+        fired += applySchedule(instrument, seg.audio.schedule, segStartSec);
+      }
+      if (seg.audio.onEnter) {
+        const segClock = { nowMs: () => seg.startMs };
+        seg.audio.onEnter(segClock, { instrument, startSec: segStartSec, score });
+      }
+    }
+    return fired;
+  }
   return {
     W,
     H,
@@ -2741,6 +2846,7 @@ async function buildScene(opts) {
     durationMs,
     resolved,
     renderFrame,
+    scheduleAudio,
     dispose() {
       for (const b of bound) b.layer.dispose?.();
     }
@@ -2751,6 +2857,13 @@ async function recordSceneSpec(opts) {
   const record = opts.record ?? recordScenes;
   const composite = {
     durationMs: built.durationMs,
+    // Schedule any per-segment audio against the capture clock exactly when the
+    // first frame is entered, so it's anchored to the same start the recorder
+    // uses. onEnter fires once per Scene (see recordScenes), so this runs once.
+    onEnter: opts.segmentAudio ? () => {
+      const sa = opts.segmentAudio;
+      built.scheduleAudio(sa.instrument, sa.audioNow() + (sa.lookaheadSec ?? 0.1));
+    } : void 0,
     draw: (ctx, t01) => built.renderFrame(ctx, t01 * built.durationMs)
   };
   return record([composite], {
@@ -2763,96 +2876,6 @@ async function recordSceneSpec(opts) {
   });
 }
 
-// src/scene/audioLayers.ts
-function countInSchedule(opts) {
-  const beats = opts.beats ?? 4;
-  const accent = opts.accentDownbeat ?? true;
-  const beatSec = 60 / opts.bpm;
-  const events = [];
-  for (let i = 0; i < beats; i++) {
-    const isDownbeat = accent && i === 0;
-    events.push({
-      atSec: i * beatSec,
-      note: isDownbeat ? "C6" : "C5",
-      durSec: 0.05,
-      gain: isDownbeat ? 1 : 0.7,
-      kind: "count"
-    });
-  }
-  return events;
-}
-function countInLeadSec(opts) {
-  return (opts.beats ?? 4) * (60 / opts.bpm);
-}
-function clickTrackSchedule(opts) {
-  const beatSec = 60 / opts.bpm;
-  const bpb = opts.beatsPerBar ?? 4;
-  const start = opts.startSec ?? 0;
-  const events = [];
-  const n = Math.floor(opts.durationSec / beatSec);
-  for (let i = 0; i < n; i++) {
-    const isDownbeat = i % bpb === 0;
-    events.push({
-      atSec: start + i * beatSec,
-      note: isDownbeat ? "C6" : "C5",
-      durSec: 0.03,
-      gain: isDownbeat ? 0.6 : 0.4,
-      kind: "click"
-    });
-  }
-  return events;
-}
-function droneSchedule(opts) {
-  const gain = opts.gain ?? 0.15;
-  const events = [
-    { atSec: 0, note: opts.root, durSec: opts.durationSec, gain, kind: "drone" }
-  ];
-  if (opts.fifth ?? true) {
-    events.push({ atSec: 0, note: transposeFifth(opts.root), durSec: opts.durationSec, gain, kind: "drone" });
-  }
-  return events;
-}
-function transposeFifth(note) {
-  const m = /^([A-G])(#|b)?(\d)$/.exec(note);
-  if (!m) return note;
-  const order = ["C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"];
-  const pcMap = { C: 0, D: 2, E: 4, F: 5, G: 7, A: 9, B: 11 };
-  let pc = pcMap[m[1]] + (m[2] === "#" ? 1 : m[2] === "b" ? -1 : 0);
-  let oct = parseInt(m[3], 10);
-  pc += 7;
-  if (pc >= 12) {
-    pc -= 12;
-    oct += 1;
-  }
-  return `${order[pc]}${oct}`;
-}
-function duckGainAt(windows, tSec, floor = 0.25, rampSec = 0.2) {
-  for (const w of windows) {
-    if (tSec >= w.startSec - rampSec && tSec <= w.endSec + rampSec) {
-      if (tSec < w.startSec) return lerpGain(1, floor, (tSec - (w.startSec - rampSec)) / rampSec);
-      if (tSec > w.endSec) return lerpGain(floor, 1, (tSec - w.endSec) / rampSec);
-      return floor;
-    }
-  }
-  return 1;
-}
-function lerpGain(a, b, t) {
-  const k = t < 0 ? 0 : t > 1 ? 1 : t;
-  return a + (b - a) * k;
-}
-function applySchedule(instrument, schedule, startTime) {
-  for (const ev of schedule) {
-    if (ev.note == null) continue;
-    instrument.triggerAttackRelease(
-      ev.note,
-      ev.durSec ?? 0.05,
-      startTime + ev.atSec,
-      ev.gain ?? 1
-    );
-  }
-  return schedule.length;
-}
-
 // src/scene/gate.ts
 var AV_TOLERANCE_MS = 60;
 async function runGate(input) {