summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--public/js/grid.js23
-rw-r--r--views/grid.ejs12
2 files changed, 26 insertions, 9 deletions
diff --git a/public/js/grid.js b/public/js/grid.js
index e23c0e6..a646192 100644
--- a/public/js/grid.js
+++ b/public/js/grid.js
@@ -1,8 +1,26 @@
+
+
+var bufferSize = 65536 / 2;
+var sampleRate = 44100;
+var latency = 1000 * bufferSize / sampleRate;
+var audioletReady = false;
+
+var samples = [
+ 'KickDrum0001.wav', 'Closed Hihat0001.wav', 'Open Hihat0001.wav', 'Clap.wav'
+ 'Clav.wav', 'Mid Tom0001.wav', 'Rimshot.wav', 'SnareDrum0001.wav'
+];
+
+function AudioletApp () {
+ this.audiolet = new Audiolet(sampleRate, 2, bufferSize);
+ this.audiolet.scheduler.setTempo(90);
+
+}
+
+
function Grid (app){
var base = this;
function setNote (data) {
- console.log(data.step, data.channel, data.state, pattern[data.step]);
pattern[data.step][data.channel] = data.state;
drawNote(data.step, data.channel);
};
@@ -14,6 +32,9 @@ function Grid (app){
}
base.toggle = toggle;
+
+ var Audio = new AudioletApp();
+
var tog = 0;
var playing = false;
var playingInterval = false;
diff --git a/views/grid.ejs b/views/grid.ejs
index e6ed17f..d15c9a4 100644
--- a/views/grid.ejs
+++ b/views/grid.ejs
@@ -1,3 +1,4 @@
+<script type="text/javascript" src="/js/vendor/Audiolet.js"></script>
<script type="text/javascript" src="/js/mouse.js"></script>
<script type="text/javascript" src="/js/chat.js"></script>
<script type="text/javascript" src="/js/grid.js"></script>
@@ -49,8 +50,10 @@
<span id="alertDisp"></span>
</header>
+
<section id="content">
<canvas id='canvas' height='400' width='594'></canvas>
+<!--
<audio id='sound0' title='KickDrum' autobuffer src='/wav/KickDrum0001.wav'></audio>
<audio id='sound1' title='ClosedHihat' autobuffer src='/wav/Closed Hihat0001.wav'></audio>
<audio id='sound2' title='OpenHihat' autobuffer src='/wav/Open Hihat0001.wav'></audio>
@@ -67,14 +70,7 @@
<audio id='sound5a' title='MidTom' autobuffer src='/wav/Mid Tom0001.wav'></audio>
<audio id='sound6a' title='Rimshot' autobuffer src='/wav/Rimshot.wav'></audio>
<audio id='sound7a' title='SnareDrum' autobuffer src='/wav/SnareDrum0001.wav'></audio>
- <audio id='sound0a' title='KickDrum' autobuffer src='/wav/KickDrum0001.wav'></audio>
- <audio id='sound1a' title='ClosedHihat' autobuffer src='/wav/Closed Hihat0001.wav'></audio>
- <audio id='sound2a' title='OpenHihat' autobuffer src='/wav/Open Hihat0001.wav'></audio>
- <audio id='sound3a' title='Clap' autobuffer src='/wav/Clap.wav'></audio>
- <audio id='sound4a' title='Clav' autobuffer src='/wav/Clav.wav'></audio>
- <audio id='sound5a' title='MidTom' autobuffer src='/wav/Mid Tom0001.wav'></audio>
- <audio id='sound6a' title='Rimshot' autobuffer src='/wav/Rimshot.wav'></audio>
- <audio id='sound7a' title='SnareDrum' autobuffer src='/wav/SnareDrum0001.wav'></audio>
+-->
</section>
<div id="chat">