@dawcore/transport 0.0.10 → 0.0.11

package/dist/index.d.mts

@@ -142,6 +142,10 @@ declare class TempoMap {
     private _ppqn;
     private _entries;
     constructor(ppqn?: number, initialBpm?: number);
+    /** A non-finite or non-positive BPM silently corrupts the secondsAtTick
+     *  cache (Infinity, or non-monotonic values that break the binary search
+     *  in secondsToTicks) — reject it at the boundary instead. */
+    private static _validateBpm;
     getTempo(atTick?: Tick): number;
     setTempo(bpm: number, atTick?: Tick, options?: SetTempoOptions): void;
     ticksToSeconds(ticks: Tick): number;
@@ -299,17 +303,18 @@ interface ClipEvent extends SchedulerEvent {
     trackId: string;
     clipId: string;
     audioBuffer: AudioBuffer;
-    /** Clip position on timeline (integer samples) */
+    /** Clip position on timeline (integer samples, at the TIMELINE sample rate) */
     startSample: Sample;
-    /** Offset into audioBuffer (integer samples) */
+    /** Offset into audioBuffer (integer samples, at the BUFFER's own sample
+     *  rate — they index the buffer, not the timeline) */
     offsetSamples: Sample;
-    /** Duration to play (integer samples) */
+    /** Duration to play (integer samples, at the BUFFER's own sample rate) */
     durationSamples: Sample;
     /** Clip gain multiplier */
     gain: number;
-    /** Fade in duration (integer samples) */
+    /** Fade in duration (integer samples, at the TIMELINE sample rate) */
     fadeInDurationSamples: Sample;
-    /** Fade out duration (integer samples) */
+    /** Fade out duration (integer samples, at the TIMELINE sample rate) */
     fadeOutDurationSamples: Sample;
 }
 declare class ClipPlayer implements SchedulerListener<ClipEvent> {

package/dist/index.d.ts

@@ -142,6 +142,10 @@ declare class TempoMap {
     private _ppqn;
     private _entries;
     constructor(ppqn?: number, initialBpm?: number);
+    /** A non-finite or non-positive BPM silently corrupts the secondsAtTick
+     *  cache (Infinity, or non-monotonic values that break the binary search
+     *  in secondsToTicks) — reject it at the boundary instead. */
+    private static _validateBpm;
     getTempo(atTick?: Tick): number;
     setTempo(bpm: number, atTick?: Tick, options?: SetTempoOptions): void;
     ticksToSeconds(ticks: Tick): number;
@@ -299,17 +303,18 @@ interface ClipEvent extends SchedulerEvent {
     trackId: string;
     clipId: string;
     audioBuffer: AudioBuffer;
-    /** Clip position on timeline (integer samples) */
+    /** Clip position on timeline (integer samples, at the TIMELINE sample rate) */
     startSample: Sample;
-    /** Offset into audioBuffer (integer samples) */
+    /** Offset into audioBuffer (integer samples, at the BUFFER's own sample
+     *  rate — they index the buffer, not the timeline) */
     offsetSamples: Sample;
-    /** Duration to play (integer samples) */
+    /** Duration to play (integer samples, at the BUFFER's own sample rate) */
     durationSamples: Sample;
     /** Clip gain multiplier */
     gain: number;
-    /** Fade in duration (integer samples) */
+    /** Fade in duration (integer samples, at the TIMELINE sample rate) */
     fadeInDurationSamples: Sample;
-    /** Fade out duration (integer samples) */
+    /** Fade out duration (integer samples, at the TIMELINE sample rate) */
     fadeOutDurationSamples: Sample;
 }
 declare class ClipPlayer implements SchedulerListener<ClipEvent> {

package/dist/index.js

@@ -261,15 +261,27 @@ function curveNormalizedAt(x, slope) {
   const p = Math.max(CURVE_EPSILON, Math.min(1 - CURVE_EPSILON, slope));
   return p * p / (1 - p * 2) * (Math.pow((1 - p) / p, 2 * x) - 1);
 }
-var TempoMap = class {
+var TempoMap = class _TempoMap {
   constructor(ppqn = 960, initialBpm = 120) {
+    _TempoMap._validateBpm(initialBpm);
     this._ppqn = ppqn;
     this._entries = [{ tick: 0, bpm: initialBpm, interpolation: "step", secondsAtTick: 0 }];
   }
+  /** A non-finite or non-positive BPM silently corrupts the secondsAtTick
+   *  cache (Infinity, or non-monotonic values that break the binary search
+   *  in secondsToTicks) — reject it at the boundary instead. */
+  static _validateBpm(bpm) {
+    if (!Number.isFinite(bpm) || bpm <= 0) {
+      throw new Error(
+        "[waveform-playlist] TempoMap: bpm must be a finite positive number, got " + bpm
+      );
+    }
+  }
   getTempo(atTick = 0) {
     return this._getTempoAt(atTick);
   }
   setTempo(bpm, atTick = 0, options) {
+    _TempoMap._validateBpm(bpm);
     const interpolation = options?.interpolation ?? "step";
     if (typeof interpolation === "object" && interpolation.type === "curve") {
       const s = interpolation.slope;
@@ -507,6 +519,7 @@ function isPowerOf2(n) {
 var MeterMap = class {
   constructor(ppqn, numerator = 4, denominator = 4) {
     this._ppqn = ppqn;
+    this._validateMeter(numerator, denominator);
     this._entries = [{ tick: 0, numerator, denominator, barAtTick: 0 }];
   }
   get ppqn() {
@@ -800,11 +813,19 @@ var ClipPlayer = class {
         const clipTick = clip.startTick !== void 0 ? clip.startTick : this._sampleTimeline.samplesToTicks(clip.startSample);
         if (clipTick < fromTick) continue;
         if (clipTick >= toTick) continue;
-        const fadeInDurationSamples = clip.fadeIn ? clip.fadeIn.duration ?? 0 : 0;
-        const fadeOutDurationSamples = clip.fadeOut ? clip.fadeOut.duration ?? 0 : 0;
+        const timelineRate = this._sampleTimeline.sampleRate;
+        const bufferRate = clip.audioBuffer.sampleRate;
+        const fadeInDurationSamples = clip.fadeIn ? Math.round((clip.fadeIn.duration ?? 0) * timelineRate) : 0;
+        const fadeOutDurationSamples = clip.fadeOut ? Math.round((clip.fadeOut.duration ?? 0) * timelineRate) : 0;
         let durationSamples = clip.durationSamples;
-        if (this._loopEnabled && clip.startSample + durationSamples > this._loopEndSamples) {
-          durationSamples = this._loopEndSamples - clip.startSample;
+        if (this._loopEnabled) {
+          const durationTimelineSamples = Math.round(
+            clip.durationSamples / bufferRate * timelineRate
+          );
+          const allowedTimelineSamples = this._loopEndSamples - clip.startSample;
+          if (durationTimelineSamples > allowedTimelineSamples) {
+            durationSamples = Math.round(allowedTimelineSamples / timelineRate * bufferRate);
+          }
         }
         events.push({
           trackId,
@@ -830,9 +851,9 @@ var ClipPlayer = class {
       );
       return;
     }
-    const sampleRate = this._sampleTimeline.sampleRate;
-    const offsetSeconds = event.offsetSamples / sampleRate;
-    const durationSeconds = event.durationSamples / sampleRate;
+    const bufferRate = event.audioBuffer.sampleRate;
+    const offsetSeconds = event.offsetSamples / bufferRate;
+    const durationSeconds = event.durationSamples / bufferRate;
     if (offsetSeconds >= event.audioBuffer.duration) {
       console.warn(
         "[waveform-playlist] ClipPlayer.consume: offset (" + offsetSeconds + "s) exceeds audioBuffer.duration (" + event.audioBuffer.duration + 's) for clipId "' + event.clipId + '" \u2014 clip will not play'
@@ -845,8 +866,9 @@ var ClipPlayer = class {
     const when = this._toAudioTime(transportSeconds);
     const gainNode = this._audioContext.createGain();
     gainNode.gain.value = event.gain;
-    let fadeIn = event.fadeInDurationSamples / sampleRate;
-    let fadeOut = event.fadeOutDurationSamples / sampleRate;
+    const timelineRate = this._sampleTimeline.sampleRate;
+    let fadeIn = event.fadeInDurationSamples / timelineRate;
+    let fadeOut = event.fadeOutDurationSamples / timelineRate;
     if (fadeIn + fadeOut > durationSeconds) {
       const ratio = durationSeconds / (fadeIn + fadeOut);
       fadeIn *= ratio;
@@ -886,16 +908,21 @@ var ClipPlayer = class {
         if (!clip.audioBuffer) continue;
         const clipTick = clip.startTick !== void 0 ? clip.startTick : this._sampleTimeline.samplesToTicks(clip.startSample);
         if (clipTick >= newTick) continue;
-        const clipEndSample = clip.startSample + clip.durationSamples;
+        const timelineRate = this._sampleTimeline.sampleRate;
+        const bufferRate = clip.audioBuffer.sampleRate;
+        const bufToTimeline = (n) => Math.round(n / bufferRate * timelineRate);
+        const timelineToBuf = (n) => Math.round(n / timelineRate * bufferRate);
+        const clipEndSample = clip.startSample + bufToTimeline(clip.durationSamples);
         if (clipEndSample <= newSample) continue;
         const offsetIntoClipSamples = newSample - clip.startSample;
-        const offsetSamples = clip.offsetSamples + offsetIntoClipSamples;
-        let durationSamples = clipEndSample - newSample;
-        if (this._loopEnabled && newSample + durationSamples > this._loopEndSamples) {
-          durationSamples = this._loopEndSamples - newSample;
+        const offsetSamples = clip.offsetSamples + timelineToBuf(offsetIntoClipSamples);
+        let remainingTimelineSamples = clipEndSample - newSample;
+        if (this._loopEnabled && newSample + remainingTimelineSamples > this._loopEndSamples) {
+          remainingTimelineSamples = this._loopEndSamples - newSample;
         }
-        if (durationSamples <= 0) continue;
-        const fadeOutDurationSamples = clip.fadeOut ? clip.fadeOut.duration ?? 0 : 0;
+        if (remainingTimelineSamples <= 0) continue;
+        const durationSamples = timelineToBuf(remainingTimelineSamples);
+        const fadeOutDurationSamples = clip.fadeOut ? Math.round((clip.fadeOut.duration ?? 0) * timelineRate) : 0;
         this.consume({
           trackId,
           clipId: clip.id,