summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/index.js5
-rw-r--r--client/lib/sampler.js2
2 files changed, 3 insertions, 4 deletions
diff --git a/client/index.js b/client/index.js
index ca6b3d9..f2f72c0 100644
--- a/client/index.js
+++ b/client/index.js
@@ -22,11 +22,10 @@ const ws = w/s, hs = h/s
let samplers = {}
requestAudioContext( () => {
+ samplers['smash'] = new Sampler('samples/smash/g{}.mp3', 12)
+ // samplers['glass'] = new Sampler('samples/glass/0{}Particle.mp3', 90)
})
-samplers['smash'] = new Sampler('samples/smash/g{}.mp3', 12)
-// samplers['glass'] = new Sampler('samples/glass/0{}Particle.mp3', 90)
-
let last_index = 0
keys.listen(index => {
index = Math.abs(index+10)
diff --git a/client/lib/sampler.js b/client/lib/sampler.js
index b392caf..a3d6bed 100644
--- a/client/lib/sampler.js
+++ b/client/lib/sampler.js
@@ -33,7 +33,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,