@ugfoundation/swaralipi-js 0.14.2 → 0.15.0

package/dist/player/index.d.cts

@@ -1,8 +1,8 @@
-import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-DyL0bMCf.cjs';
-import { a as LaySpeeds, T as TaalId } from '../lay-Bi87MnkT.cjs';
-export { b as LAYS, c as LAY_SPEEDS, L as Lay, p as printedLay, r as resolveLaySpeeds, d as rowLay } from '../lay-Bi87MnkT.cjs';
-import { I as InstrumentId, a as InstrumentDef, E as Excerpt, S as Schedule, D as DrumVoice, T as TempoSegment } from '../instruments-CfHu4bSQ.cjs';
-export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GRACE_STEP, d as GlideLeg, e as INSTRUMENTS, L as Line, f as LyricMap, M as MEEND_HOLD, P as PlayEvent, g as SALAMANDER_BASE, h as SAMPLED_TAALS, i as ScheduleOptions, j as TABLA_BPMS, k as TABLA_VARIATIONS, l as TONEJS_INSTRUMENTS_BASE, m as ToneModule, n as alignLyrics, o as buildSchedule, p as createBuffers, q as drumPattern, r as eventAt, s as glideTargets, t as graceTouches, u as instrumentSampleUrl, v as isArcRaw, w as lyricCues, x as meendContinuations, y as nearestSampleKey, z as nearestTablaBpm, B as normalizeBase, C as probeUrl, F as quantizeLoopEnd, H as santoorUrls, J as scheduleLines, K as subsetUrls, N as tablaBpms, O as tablaUrl, Q as triggerGlide } from '../instruments-CfHu4bSQ.cjs';
+import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-DZag9qkF.cjs';
+import { a as LaySpeeds, T as TaalId } from '../lay-CXhC-HRO.cjs';
+export { b as LAYS, c as LAY_SPEEDS, L as Lay, p as printedLay, r as resolveLaySpeeds, d as rowLay } from '../lay-CXhC-HRO.cjs';
+import { I as InstrumentId, a as InstrumentDef, E as Excerpt, S as Schedule, D as DrumVoice, T as TempoSegment } from '../instruments-C-KtHQiW.cjs';
+export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GRACE_STEP, d as GlideLeg, e as INSTRUMENTS, L as Line, f as LyricMap, M as MEEND_HOLD, P as PlayEvent, g as SALAMANDER_BASE, h as SAMPLED_TAALS, i as ScheduleOptions, j as TABLA_BPMS, k as TABLA_VARIATIONS, l as TONEJS_INSTRUMENTS_BASE, m as ToneModule, n as alignLyrics, o as buildSchedule, p as createBuffers, q as drumPattern, r as eventAt, s as glideTargets, t as graceTouches, u as instrumentSampleUrl, v as isArcRaw, w as lyricCues, x as meendContinuations, y as nearestSampleKey, z as nearestTablaBpm, B as normalizeBase, C as probeUrl, F as quantizeLoopEnd, H as santoorUrls, J as scheduleLines, K as subsetUrls, N as tablaBpms, O as tablaUrl, Q as triggerGlide } from '../instruments-C-KtHQiW.cjs';
 import 'zod';
 import 'tone';
 
@@ -55,6 +55,13 @@ interface PlayerOptions {
      * sam/tali/khaali structure — a genuine "drum atlas"-style translation,
      * not a loop; works for every taal (no per-taal sample requirement). */
     rhythm?: RhythmMode;
+    /** Rhythm first, for a song that opens on a pickup (অনাগত): the tabla /
+     * drums / metronome play the rest of that cycle and the melody comes in on
+     * its own beat — অতীত-গ্রহ, the tāla before the song. Default false: the
+     * melody starts at once and the rhythm comes in on the সম — অনাগত-গ্রহ,
+     * the song before the tāla (Kohala's Tālalakṣaṇa). The tanpura sounds from
+     * the start either way, and a song that opens on sam plays the same. */
+    countIn?: boolean;
     /** Play the tanpura drone. Default true. */
     tanpura?: boolean;
     /** Sing the song's form: each `{ }` twice, `( )` only the first time, the
@@ -140,6 +147,8 @@ declare class SwaralipiPlayer {
     get loop(): LineRange | null;
     /** Whether each repeat is followed by a silent pass for the learner. */
     get echo(): boolean;
+    /** Whether the rhythm leads a pickup in (see PlayerOptions.countIn). */
+    get countIn(): boolean;
     /** Set the document to play. Stops any current playback. With `excerpt`,
      * only the notes singing those stretches of the song's text play, in order
      * (see `alignLyrics`); the length, seeks and repeats all keep to them. */
@@ -204,6 +213,8 @@ declare class SwaralipiPlayer {
     setPreviewLimit(sec: number): void;
     setInstrument(instrument: InstrumentId): void;
     setRhythm(rhythm: RhythmMode): void;
+    /** Rhythm first (true) or the melody first (false) — see PlayerOptions.countIn. */
+    setCountIn(on: boolean): void;
     setTanpura(on: boolean): void;
     /** Override the taal (null restores auto-detection from `meta.taal`). */
     setTaal(id: TaalId | null): void;
@@ -270,6 +281,10 @@ interface AudioExportOptions {
     /** Taal for the rhythm: an explicit id, or `auto` (from `meta.taal`). Default
      * `auto`. Only used when `rhythm` isn't `none`. */
     taal?: TaalId | 'auto';
+    /** Rhythm first for a song that opens on a pickup, as the player's
+     * `countIn`. Default false: the melody starts at once and the rhythm comes
+     * in on the সম. */
+    countIn?: boolean;
     /** Include the tanpura drone. Default false. */
     tanpura?: boolean;
     /** Sing the song's form (repeats, returns to the asthayi), as the player
@@ -368,6 +383,10 @@ interface MidiExportOptions {
     name?: string;
     /** Also export the taal's drumset pattern as a separate GM channel-10 track. */
     drums?: boolean;
+    /** With `drums`, a song that opens on a pickup starts with the drums' count-in
+     * and the melody after it, as the player's `countIn`. Default false: the
+     * melody starts at once and the drums come in on the সম. */
+    countIn?: boolean;
     /** Sing the song's form (repeats, returns to the asthayi), as the player
      * does. Default true; false keeps the written order. */
     repeats?: boolean;
@@ -382,6 +401,7 @@ declare function encodeMidi(schedule: Schedule, opts: {
     bpm: number;
     name?: string;
     drums?: DrumVoice[] | ((seg: TempoSegment) => DrumVoice[] | undefined);
+    countIn?: boolean;
 }): Uint8Array;
 /**
  * Export a swaralipi doc to a `.mid` Blob (melody voice only). No browser APIs

package/dist/player/index.d.ts

@@ -1,8 +1,8 @@
-import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-DyL0bMCf.js';
-import { a as LaySpeeds, T as TaalId } from '../lay-CFLy_wd_.js';
-export { b as LAYS, c as LAY_SPEEDS, L as Lay, p as printedLay, r as resolveLaySpeeds, d as rowLay } from '../lay-CFLy_wd_.js';
-import { I as InstrumentId, a as InstrumentDef, E as Excerpt, S as Schedule, D as DrumVoice, T as TempoSegment } from '../instruments-C3CbtYdm.js';
-export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GRACE_STEP, d as GlideLeg, e as INSTRUMENTS, L as Line, f as LyricMap, M as MEEND_HOLD, P as PlayEvent, g as SALAMANDER_BASE, h as SAMPLED_TAALS, i as ScheduleOptions, j as TABLA_BPMS, k as TABLA_VARIATIONS, l as TONEJS_INSTRUMENTS_BASE, m as ToneModule, n as alignLyrics, o as buildSchedule, p as createBuffers, q as drumPattern, r as eventAt, s as glideTargets, t as graceTouches, u as instrumentSampleUrl, v as isArcRaw, w as lyricCues, x as meendContinuations, y as nearestSampleKey, z as nearestTablaBpm, B as normalizeBase, C as probeUrl, F as quantizeLoopEnd, H as santoorUrls, J as scheduleLines, K as subsetUrls, N as tablaBpms, O as tablaUrl, Q as triggerGlide } from '../instruments-C3CbtYdm.js';
+import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-DZag9qkF.js';
+import { a as LaySpeeds, T as TaalId } from '../lay-CWlEhImP.js';
+export { b as LAYS, c as LAY_SPEEDS, L as Lay, p as printedLay, r as resolveLaySpeeds, d as rowLay } from '../lay-CWlEhImP.js';
+import { I as InstrumentId, a as InstrumentDef, E as Excerpt, S as Schedule, D as DrumVoice, T as TempoSegment } from '../instruments-SoUQBZNd.js';
+export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GRACE_STEP, d as GlideLeg, e as INSTRUMENTS, L as Line, f as LyricMap, M as MEEND_HOLD, P as PlayEvent, g as SALAMANDER_BASE, h as SAMPLED_TAALS, i as ScheduleOptions, j as TABLA_BPMS, k as TABLA_VARIATIONS, l as TONEJS_INSTRUMENTS_BASE, m as ToneModule, n as alignLyrics, o as buildSchedule, p as createBuffers, q as drumPattern, r as eventAt, s as glideTargets, t as graceTouches, u as instrumentSampleUrl, v as isArcRaw, w as lyricCues, x as meendContinuations, y as nearestSampleKey, z as nearestTablaBpm, B as normalizeBase, C as probeUrl, F as quantizeLoopEnd, H as santoorUrls, J as scheduleLines, K as subsetUrls, N as tablaBpms, O as tablaUrl, Q as triggerGlide } from '../instruments-SoUQBZNd.js';
 import 'zod';
 import 'tone';
 
@@ -55,6 +55,13 @@ interface PlayerOptions {
      * sam/tali/khaali structure — a genuine "drum atlas"-style translation,
      * not a loop; works for every taal (no per-taal sample requirement). */
     rhythm?: RhythmMode;
+    /** Rhythm first, for a song that opens on a pickup (অনাগত): the tabla /
+     * drums / metronome play the rest of that cycle and the melody comes in on
+     * its own beat — অতীত-গ্রহ, the tāla before the song. Default false: the
+     * melody starts at once and the rhythm comes in on the সম — অনাগত-গ্রহ,
+     * the song before the tāla (Kohala's Tālalakṣaṇa). The tanpura sounds from
+     * the start either way, and a song that opens on sam plays the same. */
+    countIn?: boolean;
     /** Play the tanpura drone. Default true. */
     tanpura?: boolean;
     /** Sing the song's form: each `{ }` twice, `( )` only the first time, the
@@ -140,6 +147,8 @@ declare class SwaralipiPlayer {
     get loop(): LineRange | null;
     /** Whether each repeat is followed by a silent pass for the learner. */
     get echo(): boolean;
+    /** Whether the rhythm leads a pickup in (see PlayerOptions.countIn). */
+    get countIn(): boolean;
     /** Set the document to play. Stops any current playback. With `excerpt`,
      * only the notes singing those stretches of the song's text play, in order
      * (see `alignLyrics`); the length, seeks and repeats all keep to them. */
@@ -204,6 +213,8 @@ declare class SwaralipiPlayer {
     setPreviewLimit(sec: number): void;
     setInstrument(instrument: InstrumentId): void;
     setRhythm(rhythm: RhythmMode): void;
+    /** Rhythm first (true) or the melody first (false) — see PlayerOptions.countIn. */
+    setCountIn(on: boolean): void;
     setTanpura(on: boolean): void;
     /** Override the taal (null restores auto-detection from `meta.taal`). */
     setTaal(id: TaalId | null): void;
@@ -270,6 +281,10 @@ interface AudioExportOptions {
     /** Taal for the rhythm: an explicit id, or `auto` (from `meta.taal`). Default
      * `auto`. Only used when `rhythm` isn't `none`. */
     taal?: TaalId | 'auto';
+    /** Rhythm first for a song that opens on a pickup, as the player's
+     * `countIn`. Default false: the melody starts at once and the rhythm comes
+     * in on the সম. */
+    countIn?: boolean;
     /** Include the tanpura drone. Default false. */
     tanpura?: boolean;
     /** Sing the song's form (repeats, returns to the asthayi), as the player
@@ -368,6 +383,10 @@ interface MidiExportOptions {
     name?: string;
     /** Also export the taal's drumset pattern as a separate GM channel-10 track. */
     drums?: boolean;
+    /** With `drums`, a song that opens on a pickup starts with the drums' count-in
+     * and the melody after it, as the player's `countIn`. Default false: the
+     * melody starts at once and the drums come in on the সম. */
+    countIn?: boolean;
     /** Sing the song's form (repeats, returns to the asthayi), as the player
      * does. Default true; false keeps the written order. */
     repeats?: boolean;
@@ -382,6 +401,7 @@ declare function encodeMidi(schedule: Schedule, opts: {
     bpm: number;
     name?: string;
     drums?: DrumVoice[] | ((seg: TempoSegment) => DrumVoice[] | undefined);
+    countIn?: boolean;
 }): Uint8Array;
 /**
  * Export a swaralipi doc to a `.mid` Blob (melody voice only). No browser APIs

package/dist/player/index.js

@@ -1,5 +1,5 @@
-import { DEFAULT_SOUNDS_BASE, INSTRUMENTS, SAMPLED_TAALS, buildSchedule, eventAt, lineAt, byRow, lineFor, quantizeLoopEnd, instrumentSampleUrl, probeUrl, scheduleLines, GRACE_STEP, normalizeBase, nearestTablaBpm, tablaBpms, graceTouches, midiToSampleName, glideTargets, triggerGlide, createSampler, createBuffers, tablaShiftSemitones, tablaUrl, TABLA_GRAIN_OVERLAP_SEC, TABLA_GRAIN_SEC, createDrumKit, drumPattern, createMetronome, TANPURA_PCS, createTanpura, parseTonic, lyricCues, alignLyrics, MEEND_HOLD, sCurve } from '../chunk-WEXTZRRB.js';
-export { ARC_RAW_RE, DEFAULT_SOUNDS_BASE, DRUM_KIT_BASE, GRACE_STEP, INSTRUMENTS, MEEND_HOLD, OCTAVE_OFFSET, SALAMANDER_BASE, SAMPLED_TAALS, SHUDDHA, TABLA_BPMS, TABLA_VARIATIONS, TONEJS_INSTRUMENTS_BASE, alignLyrics, buildSchedule, createBuffers, drumPattern, eventAt, glideTargets, graceTouches, instrumentSampleUrl, isArcRaw, lyricCues, meendContinuations, midiToSampleName, nearestSampleKey, nearestTablaBpm, normalizeBase, parseTonic, probeUrl, quantizeLoopEnd, sCurve, sampleFileName, santoorUrls, scheduleLines, subsetUrls, svaraSemitone, svaraToMidi, tablaBpms, tablaUrl, triggerGlide } from '../chunk-WEXTZRRB.js';
+import { DEFAULT_SOUNDS_BASE, INSTRUMENTS, SAMPLED_TAALS, buildSchedule, eventAt, lineAt, byRow, lineFor, quantizeLoopEnd, instrumentSampleUrl, probeUrl, scheduleLines, GRACE_STEP, normalizeBase, nearestTablaBpm, tablaBpms, graceTouches, midiToSampleName, glideTargets, triggerGlide, createSampler, createBuffers, tablaShiftSemitones, tablaUrl, TABLA_GRAIN_OVERLAP_SEC, TABLA_GRAIN_SEC, createDrumKit, drumPattern, createMetronome, TANPURA_PCS, createTanpura, parseTonic, lyricCues, alignLyrics, MEEND_HOLD, sCurve } from '../chunk-SPZO4573.js';
+export { ARC_RAW_RE, DEFAULT_SOUNDS_BASE, DRUM_KIT_BASE, GRACE_STEP, INSTRUMENTS, MEEND_HOLD, OCTAVE_OFFSET, SALAMANDER_BASE, SAMPLED_TAALS, SHUDDHA, TABLA_BPMS, TABLA_VARIATIONS, TONEJS_INSTRUMENTS_BASE, alignLyrics, buildSchedule, createBuffers, drumPattern, eventAt, glideTargets, graceTouches, instrumentSampleUrl, isArcRaw, lyricCues, meendContinuations, midiToSampleName, nearestSampleKey, nearestTablaBpm, normalizeBase, parseTonic, probeUrl, quantizeLoopEnd, sCurve, sampleFileName, santoorUrls, scheduleLines, subsetUrls, svaraSemitone, svaraToMidi, tablaBpms, tablaUrl, triggerGlide } from '../chunk-SPZO4573.js';
 import '../chunk-BSZ3WQUP.js';
 import { TAALS } from '../chunk-K73Y46WU.js';
 export { LAYS, LAY_SPEEDS, printedLay, resolveLaySpeeds, rowLay } from '../chunk-K73Y46WU.js';
@@ -30,8 +30,9 @@ function midiRange(schedule) {
   }
   return lo <= hi ? { lo, hi } : void 0;
 }
-function playDurationSec(schedule, spb, rhythm) {
-  return schedule.totalBeats * spb + (rhythm !== "none" ? schedule.pickupBeats * spb : 0) + spb;
+var leadIn = (schedule, spb, rhythm, countIn) => countIn && rhythm !== "none" ? schedule.pickupBeats * spb : 0;
+function playDurationSec(schedule, spb, rhythm, countIn) {
+  return schedule.totalBeats * spb + leadIn(schedule, spb, rhythm, countIn) + spb;
 }
 async function loadedOrWarn(Tone) {
   try {
@@ -107,6 +108,7 @@ var SwaralipiPlayer = class {
       instrument: options.instrument ?? "piano",
       instruments: options.instruments ?? Object.keys(INSTRUMENTS),
       rhythm: options.rhythm ?? "tabla",
+      countIn: options.countIn ?? false,
       tanpura: options.tanpura ?? true,
       repeats: options.repeats ?? true,
       previewLimitSec: options.previewLimitSec ?? Infinity,
@@ -158,7 +160,12 @@ var SwaralipiPlayer = class {
   get durationSec() {
     if (this.#taal !== void 0) return Infinity;
     if (this.#doc === void 0) return 0;
-    const full = playDurationSec(buildSchedule(this.#doc, this.#scheduleOpts()), 60 / this.#effectiveBpm(), this.#opts.rhythm);
+    const full = playDurationSec(
+      buildSchedule(this.#doc, this.#scheduleOpts()),
+      60 / this.#effectiveBpm(),
+      this.#opts.rhythm,
+      this.#opts.countIn
+    );
     return Math.min(full, this.#opts.previewLimitSec);
   }
   /** Seconds played so far, off the Transport's own clock — so it holds while
@@ -178,6 +185,10 @@ var SwaralipiPlayer = class {
   get echo() {
     return this.#echo;
   }
+  /** Whether the rhythm leads a pickup in (see PlayerOptions.countIn). */
+  get countIn() {
+    return this.#opts.countIn;
+  }
   /* ----------------------------------------------------------------- */
   /* Loading + transport control                                        */
   /* ----------------------------------------------------------------- */
@@ -486,6 +497,11 @@ var SwaralipiPlayer = class {
     this.#opts.rhythm = rhythm;
     this.#reapply();
   }
+  /** Rhythm first (true) or the melody first (false) — see PlayerOptions.countIn. */
+  setCountIn(on) {
+    this.#opts.countIn = on;
+    this.#reapply();
+  }
   setTanpura(on) {
     this.#opts.tanpura = on;
     this.#reapply();
@@ -833,9 +849,10 @@ var SwaralipiPlayer = class {
     const melody = this.#buildMelody(Tone, id, base, range);
     this.#voice = melody;
     const glide = schedule.events.some((ev) => ev.glide === true) ? this.#buildGlide(Tone, id, base, range) : void 0;
-    const shift = this.#opts.rhythm !== "none" ? schedule.pickupBeats * spb : 0;
+    const shift = leadIn(schedule, spb, this.#opts.rhythm, this.#opts.countIn);
+    const entry = this.#opts.countIn ? 0 : schedule.samBeat * spb;
     this.#timeline = { schedule, lines, spb, shift };
-    this.#buildRhythm(Tone, transport, base, spb, schedule.tempo, shift);
+    this.#buildRhythm(Tone, transport, base, spb, schedule.tempo, shift, entry);
     this.#buildTanpura(Tone, transport, base, spb, schedule.tempo, shift);
     await loadedOrWarn(Tone);
     this.#quantizeTablaLoops();
@@ -899,7 +916,7 @@ var SwaralipiPlayer = class {
       }, at);
     });
     this.#applyLoop();
-    const endAt = playDurationSec(schedule, spb, this.#opts.rhythm);
+    const endAt = playDurationSec(schedule, spb, this.#opts.rhythm, this.#opts.countIn);
     transport.scheduleOnce((time) => {
       this.#opts.onEvent?.(null);
       draw.schedule(() => this.#emitHighlight(null), time);
@@ -922,7 +939,7 @@ var SwaralipiPlayer = class {
     const bpm = this.#effectiveBpm();
     transport.bpm.value = bpm;
     const spb = 60 / bpm;
-    this.#buildRhythm(Tone, transport, base, spb, TAAL_MODE_TEMPO, 0);
+    this.#buildRhythm(Tone, transport, base, spb, TAAL_MODE_TEMPO, 0, 0);
     await loadedOrWarn(Tone);
     this.#quantizeTablaLoops();
     const draw = Tone.getDraw();
@@ -975,9 +992,10 @@ var SwaralipiPlayer = class {
    * click / drum / drone patterns re-space their interval. A তালফেরতা swaps the
    * theka the same way: each segment loops its own taal's file (or pattern, or
    * click cycle), and a মুক্তছন্দ segment rests. A document with neither mark
-   * has exactly one segment, so this is the old single-loop path.
+   * has exactly one segment, so this is the old single-loop path. Nothing
+   * sounds before `entry` (transport seconds): the সম a pickup leads into.
    */
-  #buildRhythm(Tone, transport, base, spb, segments, shift) {
+  #buildRhythm(Tone, transport, base, spb, segments, shift, entry) {
     this.#disposeTabla();
     const master = this.#ensureMaster(Tone);
     const rhythm = this.#opts.rhythm;
@@ -986,8 +1004,9 @@ var SwaralipiPlayer = class {
       const own = this.#segmentTaal(seg);
       if (own === null) return;
       const taalId = own !== void 0 && own.id in TAALS ? own.id : void 0;
-      const from = i === 0 ? 0 : seg.beat * spb + shift;
+      const from = Math.max(i === 0 ? 0 : seg.beat * spb + shift, entry);
       const to = i === segments.length - 1 ? Infinity : seg.endBeat * spb + shift;
+      if (from >= to) return;
       const beatSec = spb / seg.scale;
       const span = to === Infinity ? void 0 : to - from;
       const beatAt = (time) => Math.round((transport.getSecondsAtTime(time) - from) / beatSec);
@@ -1176,7 +1195,9 @@ async function exportAudio(doc, options = {}) {
   const spb = 60 / bpm;
   const id = options.instrument ?? "piano";
   const def = pickDef(id, options);
-  const shift = rhythm !== "none" ? schedule.pickupBeats * spb : 0;
+  const countIn = options.countIn ?? false;
+  const shift = countIn && rhythm !== "none" ? schedule.pickupBeats * spb : 0;
+  const entry = countIn ? 0 : schedule.samBeat * spb;
   const durationSec = Math.max(schedule.totalBeats * spb + shift + (def.release ?? 1) + fadeOutSec + 0.5, 0.5);
   const rendered = await renderOffline(
     Tone,
@@ -1229,8 +1250,9 @@ async function exportAudio(doc, options = {}) {
           const own = pinned ?? seg.taal;
           if (own === null) return;
           const segId = own !== void 0 && own.id in TAALS ? own.id : void 0;
-          const from = i === 0 ? 0 : seg.beat * spb + shift;
+          const from = Math.max(i === 0 ? 0 : seg.beat * spb + shift, entry);
           const to = i === schedule.tempo.length - 1 ? Infinity : seg.endBeat * spb + shift;
+          if (from >= to) return;
           const beatSec = spb / seg.scale;
           const span = to === Infinity ? void 0 : to - from;
           if (rhythm === "tabla" && segId !== void 0 && SAMPLED_TAALS.has(segId)) {
@@ -1518,19 +1540,23 @@ function melodyEvents(schedule, offset = 0) {
   });
   return melody;
 }
-function drumEvents(schedule, drums, offset = 0) {
+var leadIn2 = (schedule, countIn) => countIn ? schedule.pickupBeats : 0;
+function drumEvents(schedule, drums, offset = 0, countIn = false) {
   const drum = [];
-  for (const seg of schedule.tempo) {
+  const shift = leadIn2(schedule, countIn);
+  const entry = countIn ? 0 : schedule.samBeat;
+  schedule.tempo.forEach((seg, i) => {
     const pattern = typeof drums === "function" ? drums(seg) : drums;
-    if (!pattern?.length) continue;
-    const end = seg === schedule.tempo[schedule.tempo.length - 1] ? Math.ceil(schedule.totalBeats) : seg.endBeat;
-    for (let k = 0; seg.beat + k / seg.scale < end - 1e-6; k++) {
+    if (!pattern?.length) return;
+    const from = Math.max(i === 0 ? 0 : seg.beat + shift, entry);
+    const end = (i === schedule.tempo.length - 1 ? Math.ceil(schedule.totalBeats) : seg.endBeat) + shift;
+    for (let k = 0; from + k / seg.scale < end - 1e-6; k++) {
       const note = DRUM_NOTE[pattern[k % pattern.length]];
-      const t = Math.round((seg.beat + k / seg.scale) * PPQ) + offset;
+      const t = Math.round((from + k / seg.scale) * PPQ) + offset;
       drum.push({ tick: t, on: true, note, vel: 100, ch: 9 });
       drum.push({ tick: t + Math.round(PPQ / 4), on: false, note, vel: 0, ch: 9 });
     }
-  }
+  });
   return drum;
 }
 function midiFile(chunks) {
@@ -1546,9 +1572,11 @@ function encodeMidi(schedule, opts) {
   const head = [];
   if (opts.name) head.push(...vlq(0), 255, 3, ...vlq(utf8(opts.name).length), ...utf8(opts.name));
   head.push(...vlq(0), 255, 81, 3, usPerBeat >> 16 & 255, usPerBeat >> 8 & 255, usPerBeat & 255);
-  const chunks = [trackChunk(melodyEvents(schedule), head)];
-  if (typeof opts.drums === "function" || opts.drums && opts.drums.length > 0) {
-    const drum = drumEvents(schedule, opts.drums);
+  const withDrums = typeof opts.drums === "function" || opts.drums !== void 0 && opts.drums.length > 0;
+  const lead = withDrums ? leadIn2(schedule, opts.countIn) : 0;
+  const chunks = [trackChunk(melodyEvents(schedule, Math.round(lead * PPQ)), head)];
+  if (withDrums) {
+    const drum = drumEvents(schedule, opts.drums, 0, opts.countIn);
     chunks.push(trackChunk(drum, [...vlq(0), 255, 3, ...vlq(5), 68, 114, 117, 109, 115]));
   }
   return midiFile(chunks);
@@ -1567,7 +1595,12 @@ function safeName2(title) {
 function exportMidi(doc, options = {}) {
   const schedule = exportSchedule(doc, options);
   const bpm = options.bpm ?? doc.meta.bpm ?? 90;
-  const bytes = encodeMidi(schedule, { bpm, name: options.name ?? doc.meta.title, drums: options.drums ? taalDrums : void 0 });
+  const bytes = encodeMidi(schedule, {
+    bpm,
+    name: options.name ?? doc.meta.title,
+    drums: options.drums ? taalDrums : void 0,
+    countIn: options.countIn
+  });
   return {
     blob: new Blob([bytes], { type: "audio/midi" }),
     filename: `${safeName2(doc.meta.title)}.mid`,
@@ -1584,9 +1617,10 @@ function exportMidiSet(items, name) {
     const usPerBeat = Math.round(6e7 / (options.bpm ?? doc.meta.bpm ?? 90));
     const at = (bytes2) => ({ tick, on: false, note: 0, vel: 0, ch: 0, meta: bytes2 });
     melody.push(at(meta(81, [usPerBeat >> 16 & 255, usPerBeat >> 8 & 255, usPerBeat & 255])));
-    melody.push(at(meta(6, utf8(options.name ?? doc.meta.title ?? ""))), ...melodyEvents(schedule, tick));
-    if (options.drums) drum.push(...drumEvents(schedule, taalDrums, tick));
-    beat += Math.ceil(schedule.totalBeats) + 2;
+    const lead = options.drums ? leadIn2(schedule, options.countIn) : 0;
+    melody.push(at(meta(6, utf8(options.name ?? doc.meta.title ?? ""))), ...melodyEvents(schedule, tick + Math.round(lead * PPQ)));
+    if (options.drums) drum.push(...drumEvents(schedule, taalDrums, tick, options.countIn));
+    beat += Math.ceil(schedule.totalBeats + lead) + 2;
   }
   const chunks = [trackChunk(melody, [...vlq(0), ...meta(3, utf8(name))])];
   if (drum.length > 0) chunks.push(trackChunk(drum, [...vlq(0), ...meta(3, utf8("Drums"))]));