3 files changed, 68 insertions, 49 deletions
diff --git a/src/lib/instruments.js b/src/lib/instruments.js
new file mode 100644
index 0000000..7bd0230
--- /dev/null
+++ b/src/lib/instruments.js
@@ -0,0 +1,22 @@
+import Sampler from "./sampler";
+
+export const Kalimba = new Sampler({
+  tonal: true,
+  samples: [
+    { root: 226, fn: "samples/380737__cabled-mess__sansula-01-a-raw.mp3" },
+    { root: 267, fn: "samples/380736__cabled-mess__sansula-02-c-raw.mp3" },
+    { root: 340, fn: "samples/380735__cabled-mess__sansula-03-e-raw.mp3" },
+    { root: 452, fn: "samples/380733__cabled-mess__sansula-06-a-02-raw.mp3" },
+  ],
+});
+
+export const Drums = new Sampler({
+  tonal: false,
+  samples: [
+    { fn: "samples/707_bd.mp3" },
+    { fn: "samples/707_clap.mp3" },
+    // { fn: "samples/707_cow.mp3" },
+    { fn: "samples/707_hat.mp3" },
+    { fn: "samples/707_rim.mp3" },
+  ],
+});
diff --git a/src/lib/kalimba.js b/src/lib/kalimba.js
deleted file mode 100644
index a8e0c0e..0000000
--- a/src/lib/kalimba.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import * as Tone from "tone";
-import { choice } from "./util";
-import output from "./output";
-
-const player_count = 4;
-let player_index = 0;
-
-const samples = [
-  { root: 226, fn: "samples/380737__cabled-mess__sansula-01-a-raw.mp3" },
-  { root: 267, fn: "samples/380736__cabled-mess__sansula-02-c-raw.mp3" },
-  { root: 340, fn: "samples/380735__cabled-mess__sansula-03-e-raw.mp3" },
-  { root: 452, fn: "samples/380733__cabled-mess__sansula-06-a-02-raw.mp3" },
-  //  { root: 507, fn: 'samples/380734__cabled-mess__sansula-07-b-h-raw.wav', },
-  //  { root: 535, fn: 'samples/380731__cabled-mess__sansula-08-c-raw.wav', },
-  //  { root: 671, fn: 'samples/380732__cabled-mess__sansula-09-e-raw.wav', },
-];
-
-samples.forEach((sample) => {
-  sample.players = [];
-  sample.index = -1;
-  for (let i = 0; i < player_count; i++) {
-    let fn = sample.fn;
-    if (window.location.href.match(/asdf.us/)) {
-      fn = "//asdf.us/kalimba/" + fn;
-    }
-    let player = new Tone.Player({
-      url: fn,
-      retrigger: true,
-      playbackRate: 1,
-    });
-    player.connect(output);
-    sample.players.push(player);
-  }
-});
-
-function play(freq, time) {
-  const best = choice(samples);
-  best.index = (best.index + 1) % player_count;
-
-  const player = best.players[best.index];
-  player.playbackRate = freq / best.root;
-  player.start(time || 0);
-}
-
-function pause() {
-  // no-op
-}
-
-export default { play, pause };
diff --git a/src/lib/sampler.js b/src/lib/sampler.js
new file mode 100644
index 0000000..0db53e1
--- /dev/null
+++ b/src/lib/sampler.js
@@ -0,0 +1,46 @@
+import * as Tone from "tone";
+import { choice, randrange } from "./util";
+import output from "./output";
+
+const PLAYER_COUNT = 4;
+
+export default class Sampler {
+  constructor({ samples, tonal }) {
+    this.tonal = tonal;
+    this.samples = samples.map(({ ...sample }) => {
+      sample.players = [];
+      sample.index = -1;
+      for (let i = 0; i < PLAYER_COUNT; i++) {
+        let fn = sample.fn;
+        if (window.location.href.match(/asdf.us/)) {
+          fn = "//asdf.us/kalimba/" + fn;
+        }
+        let player = new Tone.Player({
+          url: fn,
+          retrigger: true,
+          playbackRate: 1,
+        });
+        player.connect(output);
+        sample.players.push(player);
+      }
+      return sample;
+    });
+  }
+
+  play(time, options) {
+    const sound = options.index
+      ? this.samples[options.index]
+      : choice(this.samples);
+
+    sound.index = (sound.index + 1) % PLAYER_COUNT;
+
+    const player = sound.players[sound.index];
+
+    if (this.tonal) {
+      player.playbackRate =
+        (options.frequency * choice([0.5, 1]) + randrange(0, 10)) / sound.root;
+    }
+
+    player.start(time || 0);
+  }
+}