@ugfoundation/swaralipi-js 0.3.4 → 0.5.0

package/dist/player/index.cjs

@@ -99,15 +99,25 @@ function sampleFileName(midi) {
 
 // src/player/schedule.ts
 var isSilent = (n) => n.svara === void 0 && n.rest !== true && n.sustain !== true;
+var SAM_TICK = /^\d+[fF]$/;
 function buildSchedule(doc, opts = {}) {
   const tonicPc = parseTonic(opts.tonic ?? doc.meta.tonic);
   const baseOctave = opts.baseOctave ?? 4;
   const events = [];
   let cursor = 0;
   let lastPitched = -1;
+  let samBeat;
   doc.parts.forEach((part, p) => {
     part.rows.forEach((row, r) => {
       row.notes.forEach((note, i) => {
+        if (samBeat === void 0 && note.above !== void 0) {
+          for (const a of note.above) {
+            if (a.raw !== void 0 && SAM_TICK.test(a.raw)) {
+              samBeat = cursor;
+              break;
+            }
+          }
+        }
         if (note.bar !== void 0 || isSilent(note)) return;
         const path = `${p}.${r}.${i}`;
         const dur = note.durationMatra ?? 1;
@@ -131,11 +141,13 @@ function buildSchedule(doc, opts = {}) {
       });
     });
   });
-  return { events, totalBeats: cursor };
+  const numBeats = doc.meta.taal?.numBeats;
+  const pickupBeats = samBeat !== void 0 && numBeats !== void 0 && numBeats > 0 ? (numBeats - samBeat % numBeats) % numBeats : 0;
+  return { events, totalBeats: cursor, pickupBeats };
 }
 
 // src/player/instruments.ts
-var DEFAULT_SOUNDS_BASE = "https://cdn.daserve.in/swaralipijs-instruments/";
+var DEFAULT_SOUNDS_BASE = "https://bitoron.pages.dev/audio/instruments/";
 var SALAMANDER_BASE = "https://tonejs.github.io/audio/salamander/";
 var TONEJS_INSTRUMENTS_BASE = "https://nbrosowsky.github.io/tonejs-instruments/samples/";
 function keyMap(keys) {
@@ -326,6 +338,13 @@ function tablaUrl(base, taalId, bpm, variation) {
   const seg = tablaSeg(taalId, variation);
   return `${normalizeBase(base)}tabla/${seg}/${seg}${bpm}bpm.mp3`;
 }
+var TABLA_TONIC_SEMITONE = 0;
+function tablaShiftSemitones(tonicSemitone) {
+  const d = ((tonicSemitone - TABLA_TONIC_SEMITONE) % 12 + 12) % 12;
+  return d > 6 ? d - 12 : d;
+}
+var TABLA_GRAIN_SEC = 0.06;
+var TABLA_GRAIN_OVERLAP_SEC = 0.03;
 function metronomeUrl(base) {
   return `${normalizeBase(base)}metronome/metro2.mp3`;
 }
@@ -387,6 +406,13 @@ function midiRange(schedule) {
   }
   return lo <= hi ? { lo, hi } : void 0;
 }
+async function loadedOrWarn(Tone) {
+  try {
+    await Tone.loaded();
+  } catch (err) {
+    console.warn("[swaralipi] some audio samples failed to load; continuing without them", err);
+  }
+}
 var SwaralipiPlayer = class {
   #opts;
   /** Per-song setBpm tweak: beats meta.bpm but is cleared by the next load(). */
@@ -405,6 +431,7 @@ var SwaralipiPlayer = class {
   #tanpura;
   #tanpuraKey = "";
   #metronome;
+  /** The looping tabla — a `GrainPlayer` when the tonic needs it retuned. */
   #tabla;
   #drums;
   #scheduleIds = [];
@@ -757,13 +784,14 @@ var SwaralipiPlayer = class {
     const melody = this.#buildMelody(Tone, this.#effectiveInstrument(), base, range);
     this.#buildRhythm(Tone, transport, base, spb);
     this.#buildTanpura(Tone, transport, base, spb);
-    await Tone.loaded();
+    await loadedOrWarn(Tone);
     if (this.#tabla?.buffer?.loaded) {
       this.#tabla.loopEnd = quantizeLoopEnd(this.#tabla.buffer.duration, spb);
     }
     const draw = Tone.getDraw();
+    const shift = this.#opts.rhythm !== "none" ? schedule.pickupBeats * spb : 0;
     for (const ev of schedule.events) {
-      const at = ev.beat * spb;
+      const at = ev.beat * spb + shift;
       if (ev.midi !== null) {
         const name = midiToSampleName(ev.midi);
         const dur = Math.max(ev.durationBeats * spb, 0.05);
@@ -777,10 +805,10 @@ var SwaralipiPlayer = class {
         draw.schedule(() => this.#emitHighlight(ev.path), time);
       }, at);
     }
-    const endAt = schedule.totalBeats * spb + spb;
+    const endAt = schedule.totalBeats * spb + shift + spb;
     transport.scheduleOnce((time) => {
       draw.schedule(() => this.#emitHighlight(null), time);
-    }, schedule.totalBeats * spb);
+    }, schedule.totalBeats * spb + shift);
     transport.scheduleOnce(() => this.stop(), endAt);
   }
   /** Taal mode: loop one avartan forever (tabla loop / drum sequence via
@@ -800,7 +828,7 @@ var SwaralipiPlayer = class {
     transport.bpm.value = bpm;
     const spb = 60 / bpm;
     this.#buildRhythm(Tone, transport, base, spb);
-    await Tone.loaded();
+    await loadedOrWarn(Tone);
     if (this.#tabla?.buffer?.loaded) {
       this.#tabla.loopEnd = quantizeLoopEnd(this.#tabla.buffer.duration, spb);
     }
@@ -840,14 +868,21 @@ var SwaralipiPlayer = class {
     const wantsTabla = this.#opts.rhythm === "tabla" && taalId !== void 0 && SAMPLED_TAALS.has(taalId) && base !== void 0;
     if (wantsTabla) {
       const url = tablaUrl(base, taalId, nearestTablaBpm(this.bpm, tablaBpms(taalId)), this.#variation());
-      this.#tabla = new Tone.Player({ url, loop: true }).connect(master);
+      const shift = tablaShiftSemitones(this.#tonicSemitone());
+      this.#tabla = (shift === 0 ? new Tone.Player({ url, loop: true }) : new Tone.GrainPlayer({
+        url,
+        loop: true,
+        detune: shift * 100,
+        grainSize: TABLA_GRAIN_SEC,
+        overlap: TABLA_GRAIN_OVERLAP_SEC
+      })).connect(master);
       this.#tabla.sync().start(0);
       return;
     }
     if (this.#opts.rhythm === "drums") {
       this.#drums ??= createDrumKit(Tone).connect(master);
       const drums = this.#drums;
-      const taal = this.#taal ?? (taalId !== void 0 ? TAALS[taalId] : { numBeats: 4, sam: 0 });
+      const taal = this.#taal ?? (taalId !== void 0 ? TAALS[taalId] : this.#doc?.meta.taal) ?? { numBeats: 4, sam: 0 };
       const pattern = drumPattern(taal);
       let beat2 = 0;
       const id2 = transport.scheduleRepeat((time) => {
@@ -861,7 +896,7 @@ var SwaralipiPlayer = class {
     if (this.#opts.rhythm === "none" || base === void 0) return;
     this.#metronome ??= createMetronome(Tone, base).connect(master);
     const metro = this.#metronome;
-    const cycle = this.#taal?.numBeats ?? (taalId !== void 0 ? TAALS[taalId].numBeats : 4);
+    const cycle = this.#taal?.numBeats ?? this.#doc?.meta.taal?.numBeats ?? 4;
     let beat = 0;
     const id = transport.scheduleRepeat((time) => {
       metro.volume.setValueAtTime(beat % cycle === 0 ? 0 : -8, time);
@@ -945,7 +980,8 @@ async function exportAudio(doc, options = {}) {
   const spb = 60 / bpm;
   const id = options.instrument ?? "piano";
   const def = pickDef(id, options);
-  const durationSec = Math.max(schedule.totalBeats * spb + (def.release ?? 1) + fadeOutSec + 0.5, 0.5);
+  const shift = rhythm !== "none" ? schedule.pickupBeats * spb : 0;
+  const durationSec = Math.max(schedule.totalBeats * spb + shift + (def.release ?? 1) + fadeOutSec + 0.5, 0.5);
   const rendered = await Tone.Offline(
     async ({ transport }) => {
       transport.bpm.value = bpm;
@@ -954,7 +990,7 @@ async function exportAudio(doc, options = {}) {
         const sampler = createSampler(Tone, def, base, range).connect(master);
         for (const ev of schedule.events) {
           if (ev.midi === null) continue;
-          const at = ev.beat * spb;
+          const at = ev.beat * spb + shift;
           const dur = Math.max(ev.durationBeats * spb, 0.05);
           if (ev.kan !== null) {
             const name2 = midiToSampleName(ev.kan);
@@ -967,7 +1003,7 @@ async function exportAudio(doc, options = {}) {
       let tabla;
       if (rhythm === "drums" && base) {
         const drums = createDrumKit(Tone).connect(master);
-        const taal = taalId !== void 0 ? TAALS[taalId] : { numBeats: 4, sam: 0 };
+        const taal = taalId !== void 0 ? TAALS[taalId] : doc.meta.taal ?? { numBeats: 4, sam: 0 };
         const pattern = drumPattern(taal);
         let beat = 0;
         transport.scheduleRepeat((time) => {
@@ -978,11 +1014,18 @@ async function exportAudio(doc, options = {}) {
       } else if (rhythm !== "none" && base) {
         if (usesTabla && taalId) {
           const url = tablaUrl(base, taalId, bpm, variation);
-          tabla = new Tone.Player({ url, loop: true }).connect(master);
+          const semis = tablaShiftSemitones(parseTonic(options.tonic ?? doc.meta.tonic));
+          tabla = (semis === 0 ? new Tone.Player({ url, loop: true }) : new Tone.GrainPlayer({
+            url,
+            loop: true,
+            detune: semis * 100,
+            grainSize: TABLA_GRAIN_SEC,
+            overlap: TABLA_GRAIN_OVERLAP_SEC
+          })).connect(master);
           tabla.sync().start(0);
         } else {
           const metro = createMetronome(Tone, base).connect(master);
-          const cycle = taalId !== void 0 ? TAALS[taalId].numBeats : 4;
+          const cycle = taalId !== void 0 ? TAALS[taalId].numBeats : doc.meta.taal?.numBeats ?? 4;
           let beat = 0;
           transport.scheduleRepeat((time) => {
             metro.volume.setValueAtTime(beat % cycle === 0 ? 0 : -8, time);