smplr 0.16.2 → 0.16.4

package/dist/index.js

@@ -589,11 +589,20 @@ function loadAudioBuffer(context, url, storage) {
     }
   });
 }
+function isSafari() {
+  if (typeof navigator === "undefined") return false;
+  const ua = navigator.userAgent;
+  return ua.includes("Safari") && !ua.includes("Chrome") && !ua.includes("Chromium");
+}
 function findFirstSupportedFormat(formats) {
   if (typeof document === "undefined") return null;
+  const skipOgg = isSafari();
   const audio = document.createElement("audio");
   for (let i = 0; i < formats.length; i++) {
     const format = formats[i];
+    if (skipOgg && format === "ogg") {
+      continue;
+    }
     const canPlay = audio.canPlayType(`audio/${format}`);
     if (canPlay === "probably" || canPlay === "maybe") {
       return format;
@@ -1800,6 +1809,7 @@ var Smolken = class {
 function gleitzKitUrl(name, kit) {
   var _a;
   const format = (_a = findFirstSupportedFormat(["ogg", "mp3"])) != null ? _a : "mp3";
+  console.debug(`Soundfont: using ${format} format for ${name}`);
   return `https://gleitz.github.io/midi-js-soundfonts/${kit}/${name}-${format}.js`;
 }
 function soundfontInstrumentLoader(url, buffers, group) {
@@ -1811,15 +1821,22 @@ function soundfontInstrumentLoader(url, buffers, group) {
       noteNames.map((noteName) => __async(this, null, function* () {
         const midi = toMidi(noteName);
         if (!midi) return;
-        const audioData = base64ToArrayBuffer(
-          removeBase64Prefix(json[noteName])
-        );
-        const buffer = yield context.decodeAudioData(audioData);
-        buffers[noteName] = buffer;
-        group.regions.push({
-          sampleName: noteName,
-          midiPitch: midi
-        });
+        try {
+          const audioData = base64ToArrayBuffer(
+            removeBase64Prefix(json[noteName])
+          );
+          const buffer = yield context.decodeAudioData(audioData);
+          buffers[noteName] = buffer;
+          group.regions.push({
+            sampleName: noteName,
+            midiPitch: midi
+          });
+        } catch (error) {
+          console.warn(
+            `Soundfont: failed to decode note ${noteName}`,
+            error instanceof Error ? error.message : error
+          );
+        }
       }))
     );
     spreadRegions(group.regions);
@@ -1845,6 +1862,7 @@ function base64ToArrayBuffer(base64) {
   return bytes.buffer;
 }
 var SOUNDFONT_KITS = ["MusyngKite", "FluidR3_GM"];
+var DEFAULT_SOUNDFONT_KIT = SOUNDFONT_KITS[0];
 var SOUNDFONT_INSTRUMENTS = [
   "accordion",
   "acoustic_bass",
@@ -2084,19 +2102,19 @@ function soundfontLoader(url, loopsUrl, buffers, group) {
   });
 }
 function getSoundfontConfig(options) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   if (!options.instrument && !options.instrumentUrl) {
     throw Error("Soundfont: instrument or instrumentUrl is required");
   }
   const config = {
-    kit: "MusyngKite",
+    kit: (_a = options.kit) != null ? _a : DEFAULT_SOUNDFONT_KIT,
     instrument: options.instrument,
-    storage: (_a = options.storage) != null ? _a : HttpStorage,
+    storage: (_b = options.storage) != null ? _b : HttpStorage,
     // This is to compensate the low volume of the original samples
-    extraGain: (_b = options.extraGain) != null ? _b : 5,
-    loadLoopData: (_c = options.loadLoopData) != null ? _c : false,
+    extraGain: (_c = options.extraGain) != null ? _c : 5,
+    loadLoopData: (_d = options.loadLoopData) != null ? _d : false,
     loopDataUrl: options.loopDataUrl,
-    instrumentUrl: (_d = options.instrumentUrl) != null ? _d : ""
+    instrumentUrl: (_e = options.instrumentUrl) != null ? _e : ""
   };
   if (config.instrument && config.instrument.startsWith("http")) {
     console.warn(
@@ -2114,7 +2132,7 @@ function getSoundfontConfig(options) {
       );
     }
   } else {
-    if (config.kit || config.instrument) {
+    if (config.kit !== DEFAULT_SOUNDFONT_KIT || config.instrument) {
       console.warn(
         "Soundfont: 'kit' and 'instrument' config parameters are ignored because 'instrumentUrl' is explicitly set."
       );