@dawcore/transport 0.0.5 → 0.0.7

package/dist/index.mjs

@@ -756,28 +756,25 @@ var ClipPlayer = class {
   }
   generate(fromTick, toTick) {
     const events = [];
-    const fromSample = this._sampleTimeline.ticksToSamples(fromTick);
-    const toSample = this._sampleTimeline.ticksToSamples(toTick);
     for (const [trackId, state] of this._tracks) {
       for (const clip of state.clips) {
         if (clip.durationSamples === 0) continue;
         if (!clip.audioBuffer) continue;
-        const clipStartSample = clip.startSample;
-        if (clipStartSample < fromSample) continue;
-        if (clipStartSample >= toSample) continue;
+        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;
         let durationSamples = clip.durationSamples;
-        if (this._loopEnabled && clipStartSample + durationSamples > this._loopEndSamples) {
-          durationSamples = this._loopEndSamples - clipStartSample;
+        if (this._loopEnabled && clip.startSample + durationSamples > this._loopEndSamples) {
+          durationSamples = this._loopEndSamples - clip.startSample;
         }
-        const clipTick = this._sampleTimeline.samplesToTicks(clipStartSample);
         events.push({
           trackId,
           clipId: clip.id,
           audioBuffer: clip.audioBuffer,
           tick: clipTick,
-          startSample: clipStartSample,
+          startSample: clip.startSample,
           offsetSamples: clip.offsetSamples,
           durationSamples,
           gain: clip.gain,
@@ -850,30 +847,30 @@ var ClipPlayer = class {
       for (const clip of state.clips) {
         if (clip.durationSamples === 0) continue;
         if (!clip.audioBuffer) continue;
-        const clipStartSample = clip.startSample;
-        const clipEndSample = clipStartSample + clip.durationSamples;
-        if (clipStartSample <= newSample && clipEndSample > newSample) {
-          const offsetIntoClipSamples = newSample - clipStartSample;
-          const offsetSamples = clip.offsetSamples + offsetIntoClipSamples;
-          let durationSamples = clipEndSample - newSample;
-          if (this._loopEnabled && newSample + durationSamples > this._loopEndSamples) {
-            durationSamples = this._loopEndSamples - newSample;
-          }
-          if (durationSamples <= 0) continue;
-          const fadeOutDurationSamples = clip.fadeOut ? clip.fadeOut.duration ?? 0 : 0;
-          this.consume({
-            trackId,
-            clipId: clip.id,
-            audioBuffer: clip.audioBuffer,
-            tick: newTick,
-            startSample: newSample,
-            offsetSamples,
-            durationSamples,
-            gain: clip.gain,
-            fadeInDurationSamples: 0,
-            fadeOutDurationSamples
-          });
+        const clipTick = clip.startTick !== void 0 ? clip.startTick : this._sampleTimeline.samplesToTicks(clip.startSample);
+        if (clipTick >= newTick) continue;
+        const clipEndSample = clip.startSample + 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;
         }
+        if (durationSamples <= 0) continue;
+        const fadeOutDurationSamples = clip.fadeOut ? clip.fadeOut.duration ?? 0 : 0;
+        this.consume({
+          trackId,
+          clipId: clip.id,
+          audioBuffer: clip.audioBuffer,
+          tick: newTick,
+          startSample: newSample,
+          offsetSamples,
+          durationSamples,
+          gain: clip.gain,
+          fadeInDurationSamples: 0,
+          fadeOutDurationSamples
+        });
       }
     }
   }
@@ -1779,6 +1776,27 @@ var NativePlayoutAdapter = class {
     }
     if (this._audioContext.state === "suspended") {
       await this._audioContext.resume();
+      const MIN_WARMUP = 0.02;
+      const warmupTarget = Math.max(MIN_WARMUP, this._audioContext.outputLatency ?? MIN_WARMUP);
+      if (this._audioContext.currentTime < warmupTarget) {
+        const MAX_WARMUP_MS = 2e3;
+        await new Promise((resolve) => {
+          const startMs = performance.now();
+          const check = () => {
+            if (this._audioContext.currentTime >= warmupTarget) {
+              resolve();
+            } else if (this._audioContext.state === "closed" || performance.now() - startMs > MAX_WARMUP_MS) {
+              console.warn(
+                "[waveform-playlist] AudioContext warmup timed out (currentTime=" + this._audioContext.currentTime + ", target=" + warmupTarget + ", state=" + this._audioContext.state + "). Proceeding without warmup."
+              );
+              resolve();
+            } else {
+              requestAnimationFrame(check);
+            }
+          };
+          requestAnimationFrame(check);
+        });
+      }
     }
   }
   setTracks(tracks) {
@@ -1844,6 +1862,22 @@ var NativePlayoutAdapter = class {
   isCountingIn() {
     return this._transport.isCountingIn();
   }
+  setTempo(bpm, atTick) {
+    this._transport.setTempo(bpm, atTick !== void 0 ? atTick : void 0);
+  }
+  setMeter(numerator, denominator, atTick) {
+    this._transport.setMeter(
+      numerator,
+      denominator,
+      atTick !== void 0 ? atTick : void 0
+    );
+  }
+  ticksToSeconds(tick) {
+    return this._transport.tickToTime(tick);
+  }
+  secondsToTicks(seconds) {
+    return this._transport.timeToTick(seconds);
+  }
   dispose() {
     this._transport.dispose();
   }