@waveform-playlist/playout 12.2.0 → 12.4.0

package/dist/index.mjs

@@ -1443,7 +1443,7 @@ function extractLoopAndEnvelope(params) {
     releaseVolEnv
   };
 }
-var SoundFontCache = class {
+var SoundFontCache = class _SoundFontCache {
   /**
    * @param context Optional AudioContext for createBuffer(). If omitted, uses
    *   an OfflineAudioContext which doesn't require user gesture — safe to
@@ -1454,6 +1454,17 @@ var SoundFontCache = class {
     this.audioBufferCache = /* @__PURE__ */ new Map();
     this.context = context ?? new OfflineAudioContext(1, 1, 44100);
   }
+  /**
+   * Fetch and parse an SF2 file, resolving only once it's ready to play.
+   * Prefer this over `new SoundFontCache()` + `load()` — the returned cache
+   * is always loaded, so it can't hit the "unloaded cache → PolySynth
+   * fallback" path in createToneAdapter / setSoundFontCache.
+   */
+  static async fromUrl(url, options) {
+    const cache = new _SoundFontCache(options?.context);
+    await cache.load(url, options?.signal);
+    return cache;
+  }
   /**
    * Load and parse an SF2 file from a URL.
    */
@@ -1632,6 +1643,9 @@ import {
   trackChannelCount
 } from "@waveform-playlist/core";
 import { now as now2 } from "tone";
+function isToneAdapter(adapter) {
+  return typeof adapter?.setSoundFontCache === "function";
+}
 function createToneAdapter(options) {
   getGlobalContext();
   let _playoutGeneration = 1;
@@ -1649,85 +1663,98 @@ function createToneAdapter(options) {
   let _pendingInit = null;
   const _ppqn = options?.ppqn ?? 192;
   let _bpm = 120;
-  function addTrackToPlayout(p, track) {
+  let _soundFontCache = options?.soundFontCache;
+  const _currentTracks = /* @__PURE__ */ new Map();
+  const _midiTrackBuild = /* @__PURE__ */ new Map();
+  function midiPlayoutTrackId(track) {
+    const hasAudio = track.clips.some((c) => c.audioBuffer && !c.midiNotes);
+    return hasAudio ? `${track.id}:midi` : track.id;
+  }
+  function addAudioTrackToPlayout(p, track) {
     const audioClips = track.clips.filter((c) => c.audioBuffer && !c.midiNotes);
+    if (audioClips.length === 0) return;
+    const startTime = Math.min(...audioClips.map(clipStartTime));
+    const endTime = Math.max(...audioClips.map(clipEndTime));
+    const trackObj = {
+      id: track.id,
+      name: track.name,
+      gain: track.volume,
+      muted: track.muted,
+      soloed: track.soloed,
+      stereoPan: track.pan,
+      startTime,
+      endTime
+    };
+    const clipInfos = audioClips.map((clip) => ({
+      buffer: clip.audioBuffer,
+      startTime: clipStartTime(clip) - startTime,
+      duration: clipDurationTime(clip),
+      offset: clipOffsetTime(clip),
+      fadeIn: clip.fadeIn,
+      fadeOut: clip.fadeOut,
+      gain: clip.gain
+    }));
+    p.addTrack({
+      clips: clipInfos,
+      track: trackObj,
+      effects: track.effects,
+      channelCount: trackChannelCount(track)
+    });
+  }
+  function addMidiTrackToPlayout(p, track) {
     const midiClips = track.clips.filter((c) => c.midiNotes && c.midiNotes.length > 0);
-    if (audioClips.length > 0) {
-      const startTime = Math.min(...audioClips.map(clipStartTime));
-      const endTime = Math.max(...audioClips.map(clipEndTime));
-      const trackObj = {
-        id: track.id,
-        name: track.name,
-        gain: track.volume,
-        muted: track.muted,
-        soloed: track.soloed,
-        stereoPan: track.pan,
-        startTime,
-        endTime
-      };
-      const clipInfos = audioClips.map((clip) => ({
-        buffer: clip.audioBuffer,
-        startTime: clipStartTime(clip) - startTime,
-        duration: clipDurationTime(clip),
-        offset: clipOffsetTime(clip),
-        fadeIn: clip.fadeIn,
-        fadeOut: clip.fadeOut,
-        gain: clip.gain
-      }));
-      p.addTrack({
-        clips: clipInfos,
+    if (midiClips.length === 0) return;
+    const startTime = Math.min(...midiClips.map(clipStartTime));
+    const endTime = Math.max(...midiClips.map(clipEndTime));
+    const trackId = midiPlayoutTrackId(track);
+    const trackObj = {
+      id: trackId,
+      name: track.name,
+      gain: track.volume,
+      muted: track.muted,
+      soloed: track.soloed,
+      stereoPan: track.pan,
+      startTime,
+      endTime
+    };
+    const midiClipInfos = midiClips.map((clip) => ({
+      notes: clip.midiNotes,
+      startTime: clipStartTime(clip) - startTime,
+      duration: clipDurationTime(clip),
+      offset: clipOffsetTime(clip)
+    }));
+    if (_soundFontCache?.isLoaded) {
+      const firstClip = midiClips[0];
+      const midiChannel = firstClip.midiChannel;
+      const isPercussion = midiChannel === 9;
+      const programNumber = firstClip.midiProgram ?? 0;
+      p.addSoundFontTrack({
+        clips: midiClipInfos,
         track: trackObj,
-        effects: track.effects,
-        channelCount: trackChannelCount(track)
+        soundFontCache: _soundFontCache,
+        programNumber,
+        isPercussion,
+        effects: track.effects
       });
-    }
-    if (midiClips.length > 0) {
-      const startTime = Math.min(...midiClips.map(clipStartTime));
-      const endTime = Math.max(...midiClips.map(clipEndTime));
-      const trackId = audioClips.length > 0 ? `${track.id}:midi` : track.id;
-      const trackObj = {
-        id: trackId,
-        name: track.name,
-        gain: track.volume,
-        muted: track.muted,
-        soloed: track.soloed,
-        stereoPan: track.pan,
-        startTime,
-        endTime
-      };
-      const midiClipInfos = midiClips.map((clip) => ({
-        notes: clip.midiNotes,
-        startTime: clipStartTime(clip) - startTime,
-        duration: clipDurationTime(clip),
-        offset: clipOffsetTime(clip)
-      }));
-      if (options?.soundFontCache?.isLoaded) {
-        const firstClip = midiClips[0];
-        const midiChannel = firstClip.midiChannel;
-        const isPercussion = midiChannel === 9;
-        const programNumber = firstClip.midiProgram ?? 0;
-        p.addSoundFontTrack({
-          clips: midiClipInfos,
-          track: trackObj,
-          soundFontCache: options.soundFontCache,
-          programNumber,
-          isPercussion,
-          effects: track.effects
-        });
-      } else {
-        if (options?.soundFontCache) {
-          console.warn(
-            `[waveform-playlist] SoundFont not loaded for track "${track.name}" \u2014 falling back to PolySynth.`
-          );
-        }
-        p.addMidiTrack({
-          clips: midiClipInfos,
-          track: trackObj,
-          effects: track.effects
-        });
+      _midiTrackBuild.set(trackId, _soundFontCache);
+    } else {
+      if (_soundFontCache) {
+        console.warn(
+          `[waveform-playlist] SoundFont not loaded for track "${track.name}" \u2014 falling back to PolySynth.`
+        );
       }
+      p.addMidiTrack({
+        clips: midiClipInfos,
+        track: trackObj,
+        effects: track.effects
+      });
+      _midiTrackBuild.set(trackId, null);
     }
   }
+  function addTrackToPlayout(p, track) {
+    addAudioTrackToPlayout(p, track);
+    addMidiTrackToPlayout(p, track);
+  }
   function buildPlayout(tracks) {
     if (playout) {
       try {
@@ -1775,6 +1802,11 @@ function createToneAdapter(options) {
       }
     },
     setTracks(tracks) {
+      _currentTracks.clear();
+      _midiTrackBuild.clear();
+      for (const track of tracks) {
+        _currentTracks.set(track.id, track);
+      }
       if (!playout) {
         buildPlayout(tracks);
         return;
@@ -1802,6 +1834,7 @@ function createToneAdapter(options) {
       }
     },
     updateTrack(trackId, track) {
+      _currentTracks.set(trackId, track);
       if (!playout) return;
       const audioClips = track.clips.filter((c) => c.audioBuffer && !c.midiNotes);
       if (audioClips.length > 0) {
@@ -1820,7 +1853,7 @@ function createToneAdapter(options) {
         if (midiClips.length > 0) {
           const midiTrackId = trackId + ":midi";
           playout.removeTrack(midiTrackId);
-          addTrackToPlayout(playout, track);
+          addMidiTrackToPlayout(playout, track);
           if (_isPlaying) {
             playout.resumeTrackMidPlayback(midiTrackId);
           }
@@ -1832,6 +1865,8 @@ function createToneAdapter(options) {
       }
       playout.removeTrack(trackId);
       playout.removeTrack(trackId + ":midi");
+      _midiTrackBuild.delete(trackId);
+      _midiTrackBuild.delete(trackId + ":midi");
       addTrackToPlayout(playout, track);
       playout.applyInitialSoloState();
       if (_isPlaying) {
@@ -1840,6 +1875,7 @@ function createToneAdapter(options) {
       }
     },
     addTrack(track) {
+      _currentTracks.set(track.id, track);
       if (!playout) {
         console.warn(
           "[waveform-playlist] adapter.addTrack() called but playout is not available (adapter may have been disposed)."
@@ -1850,8 +1886,12 @@ function createToneAdapter(options) {
       playout.applyInitialSoloState();
     },
     removeTrack(trackId) {
+      _currentTracks.delete(trackId);
+      _midiTrackBuild.delete(trackId);
+      _midiTrackBuild.delete(trackId + ":midi");
       if (!playout) return;
       playout.removeTrack(trackId);
+      playout.removeTrack(trackId + ":midi");
       playout.applyInitialSoloState();
     },
     play(startTime, endTime) {
@@ -1886,15 +1926,23 @@ function createToneAdapter(options) {
       playout?.setMasterGain(volume);
     },
     setTrackVolume(trackId, volume) {
+      const existing = _currentTracks.get(trackId);
+      if (existing) _currentTracks.set(trackId, { ...existing, volume });
       playout?.getTrack(trackId)?.setVolume(volume);
     },
     setTrackMute(trackId, muted) {
+      const existing = _currentTracks.get(trackId);
+      if (existing) _currentTracks.set(trackId, { ...existing, muted });
       playout?.setMute(trackId, muted);
     },
     setTrackSolo(trackId, soloed) {
+      const existing = _currentTracks.get(trackId);
+      if (existing) _currentTracks.set(trackId, { ...existing, soloed });
       playout?.setSolo(trackId, soloed);
     },
     setTrackPan(trackId, pan) {
+      const existing = _currentTracks.get(trackId);
+      if (existing) _currentTracks.set(trackId, { ...existing, pan });
       playout?.getTrack(trackId)?.setPan(pan);
     },
     setLoop(enabled, start2, end) {
@@ -1906,6 +1954,9 @@ function createToneAdapter(options) {
     get audioContext() {
       return getGlobalAudioContext();
     },
+    get lookAhead() {
+      return getGlobalContext().lookAhead ?? 0;
+    },
     get ppqn() {
       return _ppqn;
     },
@@ -1950,6 +2001,38 @@ function createToneAdapter(options) {
       }
       return playout.masterOutputNode;
     },
+    setSoundFontCache(cache) {
+      _soundFontCache = cache;
+      if (cache && !cache.isLoaded) {
+        console.warn(
+          "[waveform-playlist] setSoundFontCache called with a SoundFontCache that is not loaded \u2014 MIDI tracks remain on PolySynth. Await cache.load() and call again."
+        );
+      }
+      if (!playout) return;
+      const effective = cache?.isLoaded ? cache : null;
+      let changed = false;
+      for (const track of _currentTracks.values()) {
+        const hasMidi = track.clips.some((c) => c.midiNotes && c.midiNotes.length > 0);
+        if (!hasMidi) continue;
+        const midiTrackId = midiPlayoutTrackId(track);
+        if (_midiTrackBuild.get(midiTrackId) === effective) continue;
+        try {
+          playout.removeTrack(midiTrackId);
+          addMidiTrackToPlayout(playout, track);
+          if (_isPlaying) {
+            playout.resumeTrackMidPlayback(midiTrackId);
+          }
+          changed = true;
+        } catch (err) {
+          console.warn(
+            `[waveform-playlist] SoundFont swap failed for track "${track.name}": ` + String(err)
+          );
+        }
+      }
+      if (changed) {
+        playout.applyInitialSoloState();
+      }
+    },
     dispose() {
       try {
         playout?.dispose();
@@ -1958,6 +2041,8 @@ function createToneAdapter(options) {
       }
       playout = null;
       _isPlaying = false;
+      _currentTracks.clear();
+      _midiTrackBuild.clear();
     }
   };
 }
@@ -1981,6 +2066,7 @@ export {
   getUnderlyingAudioParam,
   hasMediaStreamSource,
   int16ToFloat32,
+  isToneAdapter,
   releaseMediaStreamSource,
   resumeGlobalAudioContext,
   timecentsToSeconds