@ugfoundation/swaralipi-js 0.3.2 → 0.3.4

package/dist/player/index.cjs

@@ -17,8 +17,10 @@ var TAALS = {
   teentaal: { id: "teentaal", numBeats: 16, bhaags: [4, 4, 4, 4], sam: 0, khaali: [8] },
   aratheka: { id: "aratheka", numBeats: 16, bhaags: [4, 4, 4, 4], sam: 0, khaali: [8] },
   // আড়াঠেকা
-  jhampak: { id: "jhampak", numBeats: 5, bhaags: [3, 2], sam: 0 }
+  jhampak: { id: "jhampak", numBeats: 5, bhaags: [3, 2], sam: 0 },
   // ঝম্পক
+  dhamaar: { id: "dhamaar", numBeats: 14, bhaags: [5, 2, 3, 4], sam: 0, khaali: [7] }
+  // ধামার
 };
 
 // src/player/pitch.ts
@@ -390,6 +392,9 @@ var SwaralipiPlayer = class {
   /** Per-song setBpm tweak: beats meta.bpm but is cleared by the next load(). */
   #bpmTweak;
   #doc;
+  /** Taal mode (`loadTaal`): loops one avartan of this taal's theka with no
+   * melody. Mutually exclusive with `#doc`. */
+  #taal;
   #state = "idle";
   #tone;
   /** Master bus everything routes through, so stop() can fade it out. */
@@ -418,6 +423,7 @@ var SwaralipiPlayer = class {
       tanpura: options.tanpura ?? true,
       previewLimitSec: options.previewLimitSec ?? Infinity,
       onHighlight: options.onHighlight,
+      onBeat: options.onBeat,
       onState: options.onState,
       onLimit: options.onLimit
     };
@@ -457,6 +463,23 @@ var SwaralipiPlayer = class {
   load(doc) {
     this.#halt();
     this.#doc = doc;
+    this.#taal = void 0;
+    this.#taalOverride = void 0;
+    this.#bpmTweak = void 0;
+    this.#setState("ready");
+  }
+  /**
+   * Taal mode: loop one avartan of a taal's theka (rhythm only, no melody) —
+   * for a standalone theka player. `play()` loops indefinitely (tabla loop /
+   * drum sequence) and fires `onBeat(beatInCycle)` once per matra on the draw
+   * thread so the consumer can highlight the active bol / drum-staff note. The
+   * taal's `id` should be a sampled taal (see `SAMPLED_TAALS`) for tabla audio;
+   * `variation` picks a tabla loop variation. Stops any current playback.
+   */
+  loadTaal(taal) {
+    this.#halt();
+    this.#taal = taal;
+    this.#doc = void 0;
     this.#taalOverride = void 0;
     this.#bpmTweak = void 0;
     this.#setState("ready");
@@ -464,7 +487,7 @@ var SwaralipiPlayer = class {
   /** Start (or resume) playback. Must be triggered from a user gesture so the
    * browser permits `AudioContext` resume. */
   async play() {
-    if (this.#doc === void 0 || this.#state === "playing") return;
+    if (this.#doc === void 0 && this.#taal === void 0 || this.#state === "playing") return;
     const Tone = await this.#ensureTone();
     await Tone.start();
     if (this.#state === "paused") {
@@ -512,7 +535,7 @@ var SwaralipiPlayer = class {
       this.#master.gain.cancelScheduledValues(now);
       this.#master.gain.rampTo(0, STOP_FADE_SEC, now);
       this.#emitHighlight(null);
-      this.#setState(this.#doc ? "ready" : "idle");
+      this.#setState(this.#doc || this.#taal ? "ready" : "idle");
       this.#cancelFadeTimer();
       this.#fadeTimer = setTimeout(() => this.#halt(), STOP_FADE_SEC * 1e3 + 60);
       return;
@@ -534,7 +557,7 @@ var SwaralipiPlayer = class {
     this.#restoreMasterGain();
     this.#scheduleIds = [];
     this.#emitHighlight(null);
-    if (this.#state !== "idle") this.#setState(this.#doc ? "ready" : "idle");
+    if (this.#state !== "idle") this.#setState(this.#doc || this.#taal ? "ready" : "idle");
   }
   #cancelFadeTimer() {
     if (this.#fadeTimer !== void 0) {
@@ -648,15 +671,16 @@ var SwaralipiPlayer = class {
   #emitHighlight(path) {
     this.#opts.onHighlight?.(path);
   }
-  /** The tabla variation to play: the doc's own (in auto mode), else none — an
-   * explicit setTaal override plays the taal's default variation. */
+  /** The tabla variation to play: taal-mode taal's, the doc's own (auto mode),
+   * else none — an explicit setTaal override plays the taal's default variation. */
   #variation() {
+    if (this.#taal !== void 0) return this.#taal.variation;
     return this.#taalAuto ? this.#doc?.meta.taal?.variation : void 0;
   }
-  /** Resolve the active taal: an explicit override, else the doc's. */
+  /** Resolve the active taal id: taal mode's taal, an explicit override, else
+   * the doc's — but only when it names a sampled taal. */
   #taalId() {
-    if (!this.#taalAuto && this.#taalOverride !== void 0) return this.#taalOverride;
-    const id = this.#doc?.meta.taal?.id;
+    const id = this.#taal?.id ?? (!this.#taalAuto && this.#taalOverride !== void 0 ? this.#taalOverride : this.#doc?.meta.taal?.id);
     return id !== void 0 && id in TAALS ? id : void 0;
   }
   /** Resolve an instrument id to its def (custom overrides built-ins; the
@@ -713,6 +737,7 @@ var SwaralipiPlayer = class {
   /** Build the melody instrument(s)/rhythm/drone for the current settings and
    * wait for their buffers, then schedule everything on the Transport. */
   async #arrange(Tone) {
+    if (this.#taal !== void 0) return this.#arrangeTaal(Tone);
     if (this.#doc === void 0) return;
     const base = this.#opts.soundsBaseUrl;
     const transport = Tone.getTransport();
@@ -758,6 +783,40 @@ var SwaralipiPlayer = class {
     }, schedule.totalBeats * spb);
     transport.scheduleOnce(() => this.stop(), endAt);
   }
+  /** Taal mode: loop one avartan forever (tabla loop / drum sequence via
+   * #buildRhythm), firing onBeat + a `String(beatInCycle)` highlight each matra
+   * on the draw thread. No melody, no tanpura, no auto-stop — it plays until
+   * stop(). */
+  async #arrangeTaal(Tone) {
+    if (this.#taal === void 0) return;
+    const base = this.#opts.soundsBaseUrl;
+    const transport = Tone.getTransport();
+    transport.cancel(0);
+    transport.position = 0;
+    this.#scheduleIds = [];
+    this.#ensureMaster(Tone);
+    this.#restoreMasterGain();
+    const bpm = this.#effectiveBpm();
+    transport.bpm.value = bpm;
+    const spb = 60 / bpm;
+    this.#buildRhythm(Tone, transport, base, spb);
+    await Tone.loaded();
+    if (this.#tabla?.buffer?.loaded) {
+      this.#tabla.loopEnd = quantizeLoopEnd(this.#tabla.buffer.duration, spb);
+    }
+    const draw = Tone.getDraw();
+    const n = Math.max(1, this.#taal.numBeats);
+    let beat = 0;
+    const id = transport.scheduleRepeat((time) => {
+      const b = beat % n;
+      draw.schedule(() => {
+        this.#emitHighlight(String(b));
+        this.#opts.onBeat?.(b);
+      }, time);
+      beat += 1;
+    }, spb, 0);
+    this.#scheduleIds.push(id);
+  }
   /** Build (or reuse) the melody sampler for `id`, loading only the samples
    * covering `range`. A cached sampler is reused while it still covers the
    * range; otherwise it's rebuilt (so changing songs/tonic widens it lazily). */
@@ -788,7 +847,7 @@ var SwaralipiPlayer = class {
     if (this.#opts.rhythm === "drums") {
       this.#drums ??= createDrumKit(Tone).connect(master);
       const drums = this.#drums;
-      const taal = taalId !== void 0 ? TAALS[taalId] : { numBeats: 4, sam: 0 };
+      const taal = this.#taal ?? (taalId !== void 0 ? TAALS[taalId] : { numBeats: 4, sam: 0 });
       const pattern = drumPattern(taal);
       let beat2 = 0;
       const id2 = transport.scheduleRepeat((time) => {
@@ -802,7 +861,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 = taalId !== void 0 ? TAALS[taalId].numBeats : 4;
+    const cycle = this.#taal?.numBeats ?? (taalId !== void 0 ? TAALS[taalId].numBeats : 4);
     let beat = 0;
     const id = transport.scheduleRepeat((time) => {
       metro.volume.setValueAtTime(beat % cycle === 0 ? 0 : -8, time);