@waveform-playlist/playout 12.0.0 → 12.2.0

package/dist/index.d.mts

@@ -425,6 +425,7 @@ interface TonePlayoutOptions {
 declare class TonePlayout {
     private tracks;
     private masterVolume;
+    private _masterTap;
     private isInitialized;
     private soloedTracks;
     private manualMuteState;
@@ -464,6 +465,10 @@ declare class TonePlayout {
     pause(): void;
     stop(): void;
     setMasterGain(gain: number): void;
+    /** The master output tap node. In the signal chain: masterVolume → tap → destination.
+     *  Connect analyzers/effects/recorders here — parallel or serial.
+     *  The tap's native GainNode is on the same standardized-audio-context as adapter.audioContext. */
+    get masterOutputNode(): GainNode;
     setSolo(trackId: string, soloed: boolean): void;
     private updateSoloMuting;
     setMute(trackId: string, muted: boolean): void;
@@ -602,6 +607,8 @@ interface ToneAdapterOptions {
     effects?: EffectsFunction;
     /** When provided, MIDI clips use SoundFont sample playback instead of PolySynth */
     soundFontCache?: SoundFontCache;
+    /** Pulses per quarter note. Defaults to 192 (Tone.js native). */
+    ppqn?: number;
 }
 declare function createToneAdapter(options?: ToneAdapterOptions): PlayoutAdapter;
 

package/dist/index.d.ts

@@ -425,6 +425,7 @@ interface TonePlayoutOptions {
 declare class TonePlayout {
     private tracks;
     private masterVolume;
+    private _masterTap;
     private isInitialized;
     private soloedTracks;
     private manualMuteState;
@@ -464,6 +465,10 @@ declare class TonePlayout {
     pause(): void;
     stop(): void;
     setMasterGain(gain: number): void;
+    /** The master output tap node. In the signal chain: masterVolume → tap → destination.
+     *  Connect analyzers/effects/recorders here — parallel or serial.
+     *  The tap's native GainNode is on the same standardized-audio-context as adapter.audioContext. */
+    get masterOutputNode(): GainNode;
     setSolo(trackId: string, soloed: boolean): void;
     private updateSoloMuting;
     setMute(trackId: string, muted: boolean): void;
@@ -602,6 +607,8 @@ interface ToneAdapterOptions {
     effects?: EffectsFunction;
     /** When provided, MIDI clips use SoundFont sample playback instead of PolySynth */
     soundFontCache?: SoundFontCache;
+    /** Pulses per quarter note. Defaults to 192 (Tone.js native). */
+    ppqn?: number;
 }
 declare function createToneAdapter(options?: ToneAdapterOptions): PlayoutAdapter;
 

package/dist/index.js

@@ -1060,13 +1060,15 @@ var TonePlayout = class {
     this._loopStart = 0;
     this._loopEnd = 0;
     this.masterVolume = new import_tone4.Volume((0, import_core5.gainToDb)(options.masterGain ?? 1));
+    this._masterTap = new import_tone4.Gain(1);
     if (options.effects) {
-      const cleanup = options.effects(this.masterVolume, (0, import_tone4.getDestination)(), false);
+      const cleanup = options.effects(this.masterVolume, this._masterTap, false);
       if (cleanup) {
         this.effectsCleanup = cleanup;
       }
+      this._masterTap.connect((0, import_tone4.getDestination)());
     } else {
-      this.masterVolume.toDestination();
+      this.masterVolume.chain(this._masterTap, (0, import_tone4.getDestination)());
     }
     if (options.tracks) {
       options.tracks.forEach((track) => {
@@ -1271,6 +1273,12 @@ var TonePlayout = class {
   setMasterGain(gain) {
     this.masterVolume.volume.value = (0, import_core5.gainToDb)(gain);
   }
+  /** The master output tap node. In the signal chain: masterVolume → tap → destination.
+   *  Connect analyzers/effects/recorders here — parallel or serial.
+   *  The tap's native GainNode is on the same standardized-audio-context as adapter.audioContext. */
+  get masterOutputNode() {
+    return this._masterTap.input;
+  }
   setSolo(trackId, soloed) {
     const track = this.tracks.get(trackId);
     if (track) {
@@ -1370,10 +1378,15 @@ var TonePlayout = class {
         console.warn("[waveform-playlist] Error during master effects cleanup:", err);
       }
     }
+    try {
+      this._masterTap.dispose();
+    } catch (err) {
+      console.warn("[waveform-playlist] Error disposing master tap: " + String(err));
+    }
     try {
       this.masterVolume.dispose();
     } catch (err) {
-      console.warn("[waveform-playlist] Error disposing master volume:", err);
+      console.warn("[waveform-playlist] Error disposing master volume: " + String(err));
     }
   }
   get context() {
@@ -1626,14 +1639,22 @@ function hasMediaStreamSource(stream) {
 var import_core6 = require("@waveform-playlist/core");
 var import_tone7 = require("tone");
 function createToneAdapter(options) {
-  let playout = null;
+  getGlobalContext();
+  let _playoutGeneration = 1;
+  let playout = new TonePlayout({ effects: options?.effects });
+  playout.setOnPlaybackComplete(() => {
+    if (_playoutGeneration === 1) {
+      _isPlaying = false;
+    }
+  });
   let _isPlaying = false;
-  let _playoutGeneration = 0;
   let _loopEnabled = false;
   let _loopStart = 0;
   let _loopEnd = 0;
   let _audioInitialized = false;
   let _pendingInit = null;
+  const _ppqn = options?.ppqn ?? 192;
+  let _bpm = 120;
   function addTrackToPlayout(p, track) {
     const audioClips = track.clips.filter((c) => c.audioBuffer && !c.midiNotes);
     const midiClips = track.clips.filter((c) => c.midiNotes && c.midiNotes.length > 0);
@@ -1826,9 +1847,10 @@ function createToneAdapter(options) {
     },
     addTrack(track) {
       if (!playout) {
-        throw new Error(
-          "[waveform-playlist] adapter.addTrack() called but no playout exists. Call setTracks() first to initialize the playout."
+        console.warn(
+          "[waveform-playlist] adapter.addTrack() called but playout is not available (adapter may have been disposed)."
         );
+        return;
       }
       addTrackToPlayout(playout, track);
       playout.applyInitialSoloState();
@@ -1887,11 +1909,58 @@ function createToneAdapter(options) {
       _loopEnd = end;
       playout?.setLoop(enabled, start2, end);
     },
+    get audioContext() {
+      return getGlobalAudioContext();
+    },
+    get ppqn() {
+      return _ppqn;
+    },
+    setTempo(bpm, atTick) {
+      if (atTick !== void 0) {
+        throw new Error(
+          "Multiple tempo changes not supported by TonePlayoutAdapter. Use NativePlayoutAdapter from @dawcore/transport for multi-tempo support."
+        );
+      }
+      _bpm = bpm;
+    },
+    setMeter(_numerator, _denominator, atTick) {
+      if (atTick !== void 0) {
+        throw new Error(
+          "Multiple meter changes not supported by TonePlayoutAdapter. Use NativePlayoutAdapter from @dawcore/transport for multi-meter support."
+        );
+      }
+    },
+    ticksToSeconds(tick) {
+      return tick * 60 / (_bpm * _ppqn);
+    },
+    secondsToTicks(seconds) {
+      return seconds * _bpm * _ppqn / 60;
+    },
+    // --- Cross-context worklet support ---
+    // Tone.js wraps standardized-audio-context. Native AudioWorkletNode constructor
+    // rejects it ("parameter 1 is not of type 'BaseAudioContext'").
+    // These methods use Tone.js Context wrappers that handle both context types.
+    // Note: addWorkletModule is NOT needed — rawContext.audioWorklet.addModule() works
+    // identically for both native and standardized contexts. Only node/source creation differs.
+    createAudioWorkletNode(name, options2) {
+      return getGlobalContext().createAudioWorkletNode(name, options2);
+    },
+    createMediaStreamSource(stream) {
+      return getGlobalContext().createMediaStreamSource(stream);
+    },
+    get masterOutputNode() {
+      if (!playout) {
+        throw new Error(
+          "[waveform-playlist] adapter.masterOutputNode accessed after dispose. Disconnect your analyzer before disposing the adapter."
+        );
+      }
+      return playout.masterOutputNode;
+    },
     dispose() {
       try {
         playout?.dispose();
       } catch (err) {
-        console.warn("[waveform-playlist] Error disposing playout:", err);
+        console.warn("[waveform-playlist] Error disposing playout: " + String(err));
       }
       playout = null;
       _isPlaying = false;