4 files changed, 10 insertions, 6 deletions
diff --git a/client/index.js b/client/index.js
index e08aab0..c4fc67d 100644
--- a/client/index.js
+++ b/client/index.js
@@ -28,8 +28,8 @@ let sampler
 
 requestAudioContext( () => {
   // sampler = samplers.misc = new Sampler('samples/misc/glass.mp3', 2)
-  // sampler = samplers.smash = new Sampler('samples/smash/g{}.mp3', 12)
-  sampler = samplers.earth = new Sampler('samples/earth/earth{}.mp3', 20)
+  sampler = samplers.smash = new Sampler('samples/smash/g{}.mp3', 12)
+  // sampler = samplers.earth = new Sampler('samples/earth/earth{}.mp3', 20)
   // sampler = samplers.glass = new Sampler('samples/glass/0{}Particle.mp3', 20)
   // sampler = samplers.bubbles = new Sampler('samples/bubbles/bubbles{}.mp3', 10)
   // sampler = samplers.kalimba = new Sampler('samples/kalimba/380731__cabled-mess__sansula-08-c-raw.wav', 10)
diff --git a/client/lib/kalimba.js b/client/lib/kalimba.js
index bc048ff..63ff26a 100644
--- a/client/lib/kalimba.js
+++ b/client/lib/kalimba.js
@@ -21,7 +21,7 @@ samples.forEach((sample) => {
   for (let i = 0; i < player_count; i++) {
     let fn = sample.fn
     if (window.location.href.match(/asdf.us/)) {
-      fn = 'http://asdf.us/kalimba/' + fn.replace('wav','mp3')
+      fn = '//asdf.us/kalimba/' + fn.replace('wav','mp3')
     }
     let player = new Tone.Player({
       url: fn,
diff --git a/client/lib/sampler.js b/client/lib/sampler.js
index 9a1b1fc..fdca29a 100644
--- a/client/lib/sampler.js
+++ b/client/lib/sampler.js
@@ -22,7 +22,7 @@ export default class Sampler {
       for (let i = 0; i < player_count; i++) {
         let fn = sample.fn
         if (window.location.href.match(/asdf.us/)) {
-          fn = 'http://asdf.us/glass/' + fn.replace('wav','mp3')
+          fn = '//asdf.us/glass/' + fn.replace('wav','mp3')
         }
         let player = new Tone.Player({
           url: fn,
diff --git a/client/lib/spectrum.js b/client/lib/spectrum.js
index 584d8b5..c4e8c1e 100644
--- a/client/lib/spectrum.js
+++ b/client/lib/spectrum.js
@@ -5,7 +5,7 @@ import { shuffle, quantize, mod } from './util'
 import { windows as signalWindows } from 'signal-windows'
 import FFTJS from 'fft.js'
 
-const fft_size = 1024
+const fft_size = 2048
 const fft_overlap = fft_size / 4
 
 const fft = new FFTJS(fft_size)
@@ -67,6 +67,10 @@ function fromSpectrum(spec){
   return audioBuffer
 }
 
+function binToHz(spec, i){
+  return (i / spec.fft_size) * spec.sr
+}
+
 function fadeInOut(pcm, fade_size){
   const pcm_length = pcm.length
   let fade = 0, i
@@ -234,7 +238,7 @@ function reorderBins(spec, order){
 }
 
 export default {
-  toSpectrum, fromSpectrum,
+  toSpectrum, fromSpectrum, binToHz,
   fadeInOut,
   cloneSpectrum,
   reverseSpectrum, shuffleSpectrum, invertSpectrum, rotateSpectrum,