@libraz/libcantus 0.9.3 → 0.9.4

package/src/generate/drums/beat.ts

@@ -1,266 +0,0 @@
-import {
-  getGhostDensity,
-  getGhostProbabilityAtPosition,
-  getGhostVelocity,
-  selectGhostPositions,
-} from './ghost.js';
-import {
-  footHiHatVelocity,
-  type HiHatLevel,
-  hiHatNote,
-  hiHatTypeVelocityMultiplier,
-  hiHatVelocityMultiplier,
-  OHH_VEL_BOOST,
-  roleHiHatInstrument,
-  sectionHiHatType,
-  shouldAddOpenHHAccent,
-  shouldPlayHiHat,
-  shouldUseBridgeCrossStick,
-} from './hihat.js';
-import type { HitList } from './hit.js';
-import type { BackingDensity, DrumRole, DrumStyle, Feel, SectionType } from './internal.js';
-import { EIGHTH, GM, type MoodCategory, SIXTEENTH } from './internal.js';
-import type { KickPattern } from './kick.js';
-import type { DrumRng } from './rng.js';
-import { effectiveSwing, quantizeSwing } from './swing.js';
-
-/** Per-section drum state shared across the bars of a section. */
-export type SectionCtx = {
-  style: DrumStyle;
-  feel: Feel;
-  densityMult: number;
-  backingDensity: BackingDensity;
-  hhLevel: HiHatLevel;
-  useGhostNotes: boolean;
-  ghostBoost: boolean;
-  useRide: boolean;
-  useFootHh: boolean;
-  role: DrumRole;
-  ghostMood: MoodCategory;
-  snareBeat3: boolean;
-};
-
-/** Per-beat context passed to every beat processor. */
-export type BeatCtx = {
-  track: HitList;
-  beatTick: number;
-  beat: number;
-  velocity: number;
-  section: SectionType;
-  bpm: number;
-  bar: number;
-  sectionBars: number;
-  inPrechorusLift: boolean;
-  swingAmount: number;
-  barHasOpenHh: boolean;
-  openHhBeat: number;
-  rng: DrumRng;
-};
-
-function swing16(tick: number, feel: Feel, swingAmount: number): number {
-  return quantizeSwing(tick, effectiveSwing(feel, swingAmount), 'sixteenth');
-}
-
-function hatSwingFactor(style: DrumStyle): number {
-  if (style === 'trap') {
-    return 0;
-  }
-  if (style === 'latin') {
-    return 0.35;
-  }
-  return 0.5;
-}
-
-/** Emit the kick for one beat. */
-export function generateKickForBeat(ctx: BeatCtx, sec: SectionCtx, kick: KickPattern): void {
-  if (ctx.inPrechorusLift) {
-    return;
-  }
-  const on = [kick.beat1, kick.beat2, kick.beat3, kick.beat4][ctx.beat] ?? false;
-  const and = [kick.beat1and, kick.beat2and, kick.beat3and, kick.beat4and][ctx.beat] ?? false;
-
-  if (on) {
-    ctx.track.add(GM.BD, ctx.beatTick, EIGHTH, ctx.velocity);
-  }
-  if (and) {
-    const andTick = swing16(ctx.beatTick + EIGHTH, sec.feel, ctx.swingAmount);
-    ctx.track.add(GM.BD, andTick, EIGHTH, ctx.velocity * 0.85);
-  }
-}
-
-/** Emit the backbeat snare (or side-stick) for one beat. */
-export function generateSnareForBeat(ctx: BeatCtx, sec: SectionCtx, isIntroFirst: boolean): void {
-  if (ctx.inPrechorusLift) {
-    return;
-  }
-  const snareOn = sec.snareBeat3 ? ctx.beat === 2 : ctx.beat === 1 || ctx.beat === 3;
-  if (!snareOn || isIntroFirst) {
-    return;
-  }
-  if (sec.useRide && shouldUseBridgeCrossStick(ctx.section, ctx.beat)) {
-    return;
-  }
-
-  const backbeatVel = Math.min(127, ctx.velocity + 16);
-  const promoteSparseChorus =
-    sec.style === 'sparse' && ctx.section === 'chorus' && sec.role === 'full';
-
-  if (promoteSparseChorus) {
-    ctx.track.add(GM.SD, ctx.beatTick, EIGHTH, backbeatVel);
-  } else if (sec.style === 'sparse' || sec.role === 'ambient') {
-    if (sec.role !== 'fxOnly' && sec.role !== 'minimal') {
-      ctx.track.add(GM.SIDESTICK, ctx.beatTick, EIGHTH, ctx.velocity * 0.8);
-    }
-  } else {
-    ctx.track.add(GM.SD, ctx.beatTick, EIGHTH, backbeatVel);
-  }
-}
-
-/** Emit ghost snares at the "e"/"a" 16ths of beats 1 and 3. */
-export function generateGhostNotesForBeat(ctx: BeatCtx, sec: SectionCtx): void {
-  if (ctx.beat !== 0 && ctx.beat !== 2) {
-    return;
-  }
-  const positions = selectGhostPositions(sec.ghostMood, ctx.rng);
-  let ghostProb = getGhostDensity(sec.ghostMood, ctx.section, sec.backingDensity, ctx.bpm);
-  if (sec.ghostBoost) {
-    ghostProb = Math.min(1, ghostProb * 1.4);
-  }
-
-  for (const pos of positions) {
-    const sixteenthInBeat = pos === 'e' ? 1 : 3;
-    const posProb = getGhostProbabilityAtPosition(ctx.beat, sixteenthInBeat);
-    if (!ctx.rng.prob(ghostProb * posProb)) {
-      continue;
-    }
-    const variation = ctx.rng.float(0.85, 1.15);
-    const ghostBase = getGhostVelocity(ctx.section, ctx.beat / 2, false);
-    let ghostVel = ctx.velocity * ghostBase * variation;
-    if (pos === 'a') {
-      ghostVel *= 0.9;
-    }
-    const offset = pos === 'e' ? SIXTEENTH : 3 * SIXTEENTH;
-    const tick = swing16(ctx.beatTick + offset, sec.feel, ctx.swingAmount);
-    ctx.track.add(GM.SD, tick, SIXTEENTH, ghostVel);
-  }
-}
-
-/** Emit the pre-chorus lift buildup for one beat. */
-export function generatePreChorusBuildup(
-  ctx: BeatCtx,
-  sec: SectionCtx,
-  isSectionLastBar: boolean,
-): void {
-  if (sec.style === 'sparse') {
-    if (isSectionLastBar && ctx.beat === 3) {
-      ctx.track.add(GM.SD, ctx.beatTick, EIGHTH, Math.max(45, ctx.velocity * 0.75));
-      ctx.track.add(GM.CRASH, ctx.beatTick + EIGHTH + SIXTEENTH, SIXTEENTH, ctx.velocity * 0.9);
-    }
-    return;
-  }
-  const barsInLift = 2;
-  const barInLift = ctx.bar - (ctx.sectionBars - barsInLift);
-  const progress = (barInLift * 4 + ctx.beat) / (barsInLift * 4);
-  const buildupVel = ctx.velocity * (0.5 + 0.5 * progress);
-  ctx.track.add(GM.SD, ctx.beatTick, EIGHTH, buildupVel);
-  ctx.track.add(GM.SD, ctx.beatTick + EIGHTH, EIGHTH, buildupVel * 0.85);
-  if (isSectionLastBar && ctx.beat === 3) {
-    ctx.track.add(GM.CRASH, ctx.beatTick + EIGHTH + SIXTEENTH, SIXTEENTH, ctx.velocity * 1.1);
-  }
-}
-
-/** Emit the timekeeping hi-hat (or ride/foot) for one beat. */
-export function generateHiHatForBeat(ctx: BeatCtx, sec: SectionCtx): void {
-  if (!shouldPlayHiHat(sec.role)) {
-    if (sec.useFootHh && (ctx.beat === 0 || ctx.beat === 2)) {
-      ctx.track.add(GM.FHH, ctx.beatTick, EIGHTH, footHiHatVelocity(ctx.rng));
-    }
-    return;
-  }
-
-  const crossStick = sec.useRide && shouldUseBridgeCrossStick(ctx.section, ctx.beat);
-  const hhInstrument = crossStick ? GM.SIDESTICK : roleHiHatInstrument(sec.role, sec.useRide);
-  const hhType = sectionHiHatType(ctx.section, sec.role);
-  const typeMult = hiHatTypeVelocityMultiplier(hhType);
-  const isDynamicOpen = ctx.barHasOpenHh && ctx.beat === ctx.openHhBeat;
-  const dm = sec.densityMult;
-
-  if (sec.hhLevel === 'quarter') {
-    const introRest = ctx.section === 'intro' && ctx.beat !== 0;
-    if (!introRest) {
-      if (isDynamicOpen) {
-        ctx.track.add(
-          GM.OHH,
-          ctx.beatTick,
-          EIGHTH,
-          ctx.velocity * dm * 0.75 * typeMult + OHH_VEL_BOOST,
-        );
-      } else {
-        ctx.track.add(
-          hhInstrument,
-          ctx.beatTick,
-          EIGHTH,
-          Math.max(20, ctx.velocity * dm * 0.75 * typeMult),
-        );
-      }
-    } else if (sec.useFootHh) {
-      ctx.track.add(GM.FHH, ctx.beatTick, EIGHTH, footHiHatVelocity(ctx.rng));
-    }
-    return;
-  }
-
-  if (sec.hhLevel === 'eighth') {
-    for (let eighth = 0; eighth < 2; eighth += 1) {
-      let hhTick = ctx.beatTick + eighth * EIGHTH;
-      if (eighth === 1) {
-        hhTick = swing16(hhTick, sec.feel, ctx.swingAmount);
-      }
-      if (ctx.section === 'intro' && eighth === 1) {
-        if (sec.useFootHh && ctx.beat % 2 === 0) {
-          ctx.track.add(GM.FHH, hhTick, EIGHTH, footHiHatVelocity(ctx.rng));
-        }
-        continue;
-      }
-      const hhVel = Math.max(20, ctx.velocity * dm * typeMult * (eighth === 0 ? 0.9 : 0.65));
-      if (isDynamicOpen && eighth === 0) {
-        ctx.track.add(GM.OHH, hhTick, EIGHTH, hhVel + OHH_VEL_BOOST);
-        continue;
-      }
-      let useOpen = false;
-      if (sec.style === 'fourOnFloor' && eighth === 1) {
-        const openProb = Math.max(0.15, Math.min(0.8, 45 / ctx.bpm));
-        useOpen = (ctx.beat === 1 || ctx.beat === 3) && ctx.rng.prob(openProb);
-      } else if (eighth === 0) {
-        useOpen = shouldAddOpenHHAccent(ctx.section, ctx.beat, ctx.bar, ctx.rng);
-      }
-      if (useOpen) {
-        ctx.track.add(hiHatNote('open'), hhTick, EIGHTH, Math.max(20, hhVel * 1.1));
-      } else {
-        ctx.track.add(hhInstrument, hhTick, EIGHTH / 2, hhVel);
-      }
-    }
-    return;
-  }
-
-  for (let sixteenth = 0; sixteenth < 4; sixteenth += 1) {
-    let hhTick = ctx.beatTick + sixteenth * SIXTEENTH;
-    if (sixteenth === 1 || sixteenth === 3) {
-      const swung = effectiveSwing(sec.feel, ctx.swingAmount) * hatSwingFactor(sec.style);
-      hhTick = quantizeSwing(hhTick, swung, 'sixteenth');
-    }
-    const metricVel = hiHatVelocityMultiplier(sixteenth, ctx.rng);
-    const hhVel = Math.max(20, ctx.velocity * dm * typeMult * metricVel);
-    if (isDynamicOpen && sixteenth === 0) {
-      ctx.track.add(GM.OHH, hhTick, SIXTEENTH, hhVel + OHH_VEL_BOOST);
-      continue;
-    }
-    if (ctx.beat === 3 && sixteenth === 3) {
-      const openProb = Math.max(0.1, Math.min(0.4, 30 / ctx.bpm));
-      if (ctx.rng.prob(openProb)) {
-        ctx.track.add(GM.OHH, hhTick, SIXTEENTH, Math.max(20, hhVel * 1.2));
-        continue;
-      }
-    }
-    ctx.track.add(hhInstrument, hhTick, SIXTEENTH / 2, hhVel);
-  }
-}

package/src/generate/drums/euclid.ts

@@ -1,65 +0,0 @@
-/**
- * Generate a euclidean onset pattern (Bjorklund's algorithm), distributing
- * `pulses` as evenly as possible across `steps`, then rotating.
- *
- * @param pulses Number of onsets, clamped to [0, steps].
- * @param steps Total steps (>= 1).
- * @param rotation Steps to rotate onsets toward later positions.
- * @returns One boolean per step; true marks an onset.
- */
-import {
-  assertGenerationBudget,
-  assertInteger,
-  assertPositiveInt,
-} from '../../core/validation/index.js';
-
-export function euclideanRhythm(pulses: number, steps: number, rotation = 0): boolean[] {
-  assertPositiveInt(steps, 'euclidean steps');
-  assertInteger(pulses, 'euclidean pulses');
-  assertInteger(rotation, 'euclidean rotation');
-  assertGenerationBudget(steps, 'euclidean pattern steps');
-  const p = Math.max(0, Math.min(pulses, steps));
-  const base = bjorklund(p, steps);
-  const shift = ((rotation % steps) + steps) % steps;
-  if (shift === 0) {
-    return base;
-  }
-  return base.map((_, i) => base[(i - shift + steps) % steps] ?? false);
-}
-
-/** True when the 16-step bitmask has an onset at `step`. */
-export function hasHit(mask: number, step: number): boolean {
-  return ((mask >> step) & 1) === 1;
-}
-
-/** Convert a euclidean boolean pattern to a 16-step bitmask (LSB = step 0). */
-export function patternToMask(pattern: boolean[]): number {
-  let mask = 0;
-  for (let i = 0; i < pattern.length; i += 1) {
-    if (pattern[i]) {
-      mask |= 1 << i;
-    }
-  }
-  return mask;
-}
-
-function bjorklund(pulses: number, steps: number): boolean[] {
-  if (pulses === 0) {
-    return Array.from({ length: steps }, () => false);
-  }
-  if (pulses >= steps) {
-    return Array.from({ length: steps }, () => true);
-  }
-  let head: boolean[][] = Array.from({ length: pulses }, () => [true]);
-  let remainder: boolean[][] = Array.from({ length: steps - pulses }, () => [false]);
-  while (remainder.length > 1) {
-    const count = Math.min(head.length, remainder.length);
-    const next: boolean[][] = [];
-    for (let i = 0; i < count; i += 1) {
-      next.push([...(head[i] ?? []), ...(remainder[i] ?? [])]);
-    }
-    remainder = head.length > count ? head.slice(count) : remainder.slice(count);
-    head = next;
-  }
-  return [...head.flat(), ...remainder.flat()];
-}

package/src/generate/drums/fills.ts

@@ -1,356 +0,0 @@
-import type { HitList } from './hit.js';
-import type { DrumStyle, SectionEnergy, SectionType } from './internal.js';
-import { EIGHTH, GM, SIXTEENTH } from './internal.js';
-import type { DrumRng } from './rng.js';
-
-/** The thirteen fill archetypes for section transitions. */
-export type FillType =
-  | 'snareRoll'
-  | 'tomDescend'
-  | 'tomAscend'
-  | 'snareTomCombo'
-  | 'simpleCrash'
-  | 'linearFill'
-  | 'ghostToAccent'
-  | 'bdSnareAlternate'
-  | 'hiHatChoke'
-  | 'tomShuffle'
-  | 'breakdownFill'
-  | 'flamsAndDrags'
-  | 'halfTimeFill';
-
-/** Beat at which a fill begins, widening with section energy. */
-export function getFillStartBeat(energy: SectionEnergy): number {
-  switch (energy) {
-    case 'low':
-      return 3;
-    case 'medium':
-      return 2;
-    case 'high':
-    case 'peak':
-      return 0;
-  }
-}
-
-/**
- * Pick a fill archetype for a section transition.
- *
- * The transition-specific archetypes (into a chorus, out of an intro) are
- * checked before the generic energy fills so every variation stays reachable;
- * with `from === to` the caller effectively asks for a within-section fill.
- *
- * @param from Section the fill leaves.
- * @param to Section the fill leads into.
- * @param style Internal drum style.
- * @param nextEnergy Energy of the section the fill leads into.
- * @param rng Deterministic PRNG.
- */
-export function selectFillType(
-  from: SectionType,
-  to: SectionType,
-  style: DrumStyle,
-  nextEnergy: SectionEnergy,
-  rng: DrumRng,
-): FillType {
-  if (style === 'sparse') {
-    return rng.range(0, 1) === 0 ? 'simpleCrash' : 'breakdownFill';
-  }
-
-  const toChorus = to === 'chorus';
-  const fromIntro = from === 'intro';
-  const highEnergy = style === 'rock' || style === 'fourOnFloor';
-
-  // Dropping into a low-energy section: keep the phrase end gentle.
-  if (nextEnergy === 'low') {
-    switch (rng.range(0, 2)) {
-      case 0:
-        return 'simpleCrash';
-      case 1:
-        return 'breakdownFill';
-      default:
-        return 'halfTimeFill';
-    }
-  }
-
-  // Big lead-ins to a chorus take precedence over the generic energy fills.
-  if (toChorus) {
-    const choice = rng.range(0, 7);
-    if (highEnergy) {
-      switch (choice) {
-        case 0:
-        case 1:
-          return 'tomDescend';
-        case 2:
-          return 'snareRoll';
-        case 3:
-          return 'linearFill';
-        case 4:
-          return 'bdSnareAlternate';
-        case 5:
-          return 'flamsAndDrags';
-        case 6:
-          return 'tomShuffle';
-        default:
-          return 'ghostToAccent';
-      }
-    }
-    switch (choice) {
-      case 0:
-      case 1:
-        return 'snareTomCombo';
-      case 2:
-        return 'tomDescend';
-      case 3:
-        return 'ghostToAccent';
-      case 4:
-        return 'hiHatChoke';
-      case 5:
-        return 'linearFill';
-      default:
-        return 'snareRoll';
-    }
-  }
-
-  // Leaving the intro: lighter, building character.
-  if (fromIntro) {
-    switch (rng.range(0, 5)) {
-      case 0:
-      case 1:
-        return 'snareRoll';
-      case 2:
-        return 'simpleCrash';
-      case 3:
-        return 'ghostToAccent';
-      case 4:
-        return 'breakdownFill';
-      default:
-        return 'halfTimeFill';
-    }
-  }
-
-  // Generic medium/high/peak fills, split by style energy.
-  const choice = rng.range(0, 7);
-  if (highEnergy) {
-    switch (choice) {
-      case 0:
-        return 'tomDescend';
-      case 1:
-        return 'snareRoll';
-      case 2:
-        return 'tomAscend';
-      case 3:
-        return 'snareTomCombo';
-      case 4:
-        return 'linearFill';
-      case 5:
-        return 'bdSnareAlternate';
-      case 6:
-        return 'flamsAndDrags';
-      default:
-        return 'tomShuffle';
-    }
-  }
-
-  switch (choice) {
-    case 0:
-    case 1:
-      return 'snareRoll';
-    case 2:
-      return 'snareTomCombo';
-    case 3:
-      return 'ghostToAccent';
-    case 4:
-      return 'hiHatChoke';
-    case 5:
-      return 'halfTimeFill';
-    default:
-      return 'breakdownFill';
-  }
-}
-
-/**
- * Emit a fill for a single beat of the fill bar.
- *
- * @param track Hit accumulator.
- * @param beatTick Absolute beat position of this beat.
- * @param beat Beat index within the bar (0-3).
- * @param fillType Selected fill archetype.
- * @param velocity Base velocity for the beat.
- */
-export function generateFill(
-  track: HitList,
-  beatTick: number,
-  beat: number,
-  fillType: FillType,
-  velocity: number,
-): void {
-  const fillVel = velocity * 0.9;
-  const accentVel = velocity * 0.95;
-  const S = SIXTEENTH;
-  const E = EIGHTH;
-
-  if (beat === 0) {
-    track.add(GM.BD, beatTick, E, fillVel);
-    track.add(GM.SD, beatTick + E, E, fillVel - 5);
-    return;
-  }
-  if (beat === 1) {
-    track.add(GM.SD, beatTick, E, fillVel);
-    track.add(GM.TOM_H, beatTick + E, E, fillVel - 3);
-    return;
-  }
-
-  switch (fillType) {
-    case 'snareRoll':
-      if (beat === 2) {
-        for (let i = 0; i < 4; i += 1) {
-          track.add(GM.SD, beatTick + i * S, S, fillVel * (0.6 + 0.1 * i));
-        }
-      } else {
-        for (let i = 0; i < 3; i += 1) {
-          track.add(GM.SD, beatTick + i * S, S, fillVel * (0.7 + 0.1 * i));
-        }
-        track.add(GM.SD, beatTick + 3 * S, S, accentVel);
-      }
-      break;
-
-    case 'tomDescend':
-      if (beat === 2) {
-        track.add(GM.SD, beatTick, E, fillVel);
-        track.add(GM.TOM_H, beatTick + E, E, fillVel - 5);
-      } else {
-        track.add(GM.TOM_H, beatTick, S, fillVel);
-        track.add(GM.TOM_M, beatTick + S, S, fillVel - 3);
-        track.add(GM.TOM_M, beatTick + E, S, fillVel - 5);
-        track.add(GM.TOM_L, beatTick + E + S, S, accentVel);
-      }
-      break;
-
-    case 'tomAscend':
-      if (beat === 2) {
-        track.add(GM.SD, beatTick, E, fillVel);
-        track.add(GM.TOM_L, beatTick + E, E, fillVel - 5);
-      } else {
-        track.add(GM.TOM_L, beatTick, S, fillVel);
-        track.add(GM.TOM_M, beatTick + S, S, fillVel + 3);
-        track.add(GM.TOM_M, beatTick + E, S, fillVel + 5);
-        track.add(GM.TOM_H, beatTick + E + S, S, accentVel);
-      }
-      break;
-
-    case 'snareTomCombo':
-      if (beat === 2) {
-        track.add(GM.SD, beatTick, E, fillVel);
-        track.add(GM.SD, beatTick + E, S, fillVel - 5);
-        track.add(GM.TOM_H, beatTick + E + S, S, fillVel);
-      } else {
-        track.add(GM.TOM_M, beatTick, S, fillVel);
-        track.add(GM.SD, beatTick + S, S, fillVel - 3);
-        track.add(GM.TOM_L, beatTick + E, S, fillVel + 2);
-        track.add(GM.BD, beatTick + E + S, S, accentVel);
-      }
-      break;
-
-    case 'simpleCrash':
-      if (beat === 3) {
-        track.add(GM.BD, beatTick + E + S, S, accentVel);
-        track.add(GM.CRASH, beatTick + E + S, E, accentVel);
-      }
-      break;
-
-    case 'linearFill':
-      if (beat === 2) {
-        track.add(GM.BD, beatTick, S, fillVel);
-        track.add(GM.SD, beatTick + S, S, fillVel);
-        track.add(GM.TOM_H, beatTick + 2 * S, S, fillVel);
-        track.add(GM.TOM_M, beatTick + 3 * S, S, fillVel);
-      } else {
-        track.add(GM.TOM_L, beatTick, S, fillVel + 3);
-        track.add(GM.SD, beatTick + S, S, fillVel + 5);
-        track.add(GM.BD, beatTick + 2 * S, S, fillVel + 7);
-        track.add(GM.SD, beatTick + 3 * S, S, accentVel);
-      }
-      break;
-
-    case 'ghostToAccent':
-      if (beat === 2) {
-        const ghost = fillVel * 0.4;
-        track.add(GM.SD, beatTick, S, ghost);
-        track.add(GM.SD, beatTick + S, S, ghost + 10);
-        track.add(GM.SD, beatTick + 2 * S, S, ghost + 20);
-        track.add(GM.SD, beatTick + 3 * S, S, ghost + 30);
-      } else {
-        track.add(GM.SD, beatTick, E, fillVel);
-        track.add(GM.SD, beatTick + E, E, accentVel);
-      }
-      break;
-
-    case 'bdSnareAlternate':
-      if (beat === 2) {
-        track.add(GM.BD, beatTick, S, fillVel);
-        track.add(GM.SD, beatTick + S, S, fillVel);
-        track.add(GM.BD, beatTick + 2 * S, S, fillVel + 3);
-        track.add(GM.SD, beatTick + 3 * S, S, fillVel + 3);
-      } else {
-        track.add(GM.BD, beatTick, S, fillVel + 5);
-        track.add(GM.SD, beatTick + S, S, fillVel + 5);
-        track.add(GM.BD, beatTick + 2 * S, S, accentVel);
-        track.add(GM.SD, beatTick + 3 * S, S, accentVel);
-      }
-      break;
-
-    case 'hiHatChoke':
-      if (beat === 2) {
-        track.add(GM.OHH, beatTick, E, fillVel);
-        track.add(GM.OHH, beatTick + E, E, fillVel + 5);
-      } else {
-        track.add(GM.OHH, beatTick, S, fillVel + 8);
-        track.add(GM.CHH, beatTick + S, S, accentVel);
-        track.add(GM.SD, beatTick + E, E, accentVel);
-      }
-      break;
-
-    case 'tomShuffle':
-      if (beat === 2) {
-        track.add(GM.TOM_H, beatTick, E, fillVel);
-        track.add(GM.TOM_M, beatTick + E + S / 2, S, fillVel - 5);
-      } else {
-        track.add(GM.TOM_M, beatTick, E, fillVel);
-        track.add(GM.TOM_L, beatTick + E + S / 2, S, fillVel + 5);
-      }
-      break;
-
-    case 'breakdownFill':
-      if (beat === 3) {
-        track.add(GM.SD, beatTick + E, S, accentVel);
-      }
-      break;
-
-    case 'flamsAndDrags':
-      if (beat === 2) {
-        track.add(GM.SD, beatTick - S / 4, S / 4, fillVel * 0.5);
-        track.add(GM.SD, beatTick, E, fillVel);
-        track.add(GM.SD, beatTick + E, S / 2, fillVel * 0.6);
-        track.add(GM.SD, beatTick + E + S / 2, S / 2, fillVel * 0.6);
-        track.add(GM.SD, beatTick + E + S, E, fillVel);
-      } else {
-        track.add(GM.SD, beatTick - S / 4, S / 4, fillVel * 0.5);
-        track.add(GM.SD, beatTick, 1, accentVel);
-      }
-      break;
-
-    case 'halfTimeFill':
-      if (beat === 2) {
-        track.add(GM.SD, beatTick, 1, accentVel);
-        track.add(GM.BD, beatTick, 1, fillVel);
-      } else if (beat === 3) {
-        // At low energy the fill spans only beat 3, so this branch keeps the
-        // phrase end from going silent: a broad half-time backbeat snare with a
-        // light pickup into the next section.
-        track.add(GM.SD, beatTick, EIGHTH, accentVel);
-        track.add(GM.SD, beatTick + E, S, fillVel * 0.6);
-        track.add(GM.SD, beatTick + E + S, S, accentVel);
-      }
-      break;
-  }
-}