Skip to content

Commit

Permalink
Refactored the BeatTimer out to its own file, changed some class names.
Browse files Browse the repository at this point in the history
  • Loading branch information
Remy Porter committed Jun 10, 2015
1 parent 66d3421 commit a3c87a2
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 28 deletions.
6 changes: 6 additions & 0 deletions beatDetectTester.ck
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ Event e;

spork ~ beater.listen(e);
1::samp => now;

OscOut osc;
("localhost", 8000) => osc.dest;
osc.start("/takeoff").send();
osc.start("/move").add(0.0).add(0.0).add(3.0).add(2).send();

while(true) {
e => now;
1.0 => imp.next;
Expand Down
29 changes: 1 addition & 28 deletions beatTap.ck
Original file line number Diff line number Diff line change
@@ -1,34 +1,7 @@
class BeatDetector {
time events[];
int n;
int currentEvent;
fun void windowSize(int count) {
new time[count] @=> events;
for (0 => int i; i < count; i++) {
now => events[i];
}
count => n;
0 => currentEvent;
}
fun void event() {
now => events[currentEvent % n];
currentEvent++;
}
fun dur interval() {
dur diffs;
for (currentEvent => int i; i < currentEvent + n - 1; i++) {
i % n => int e0;
(i + 1) % n => int e1;
events[e1] - events[e0] +=> diffs;
}
return diffs / n;
}
}

public class BeatTapper {
Hid kbd;
HidMsg msg;
BeatDetector bd;
BeatTimer bd;
fun void listen(int device) {
kbd.openKeyboard(device);
5 => bd.windowSize;
Expand Down
26 changes: 26 additions & 0 deletions beatTimer.ck
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
public class BeatTimer {
time events[];
int n;
int currentEvent;
fun void windowSize(int count) {
new time[count] @=> events;
for (0 => int i; i < count; i++) {
now => events[i];
}
count => n;
0 => currentEvent;
}
fun void event() {
now => events[currentEvent % n];
currentEvent++;
}
fun dur interval() {
dur diffs;
for (currentEvent => int i; i < currentEvent + n - 1; i++) {
i % n => int e0;
(i + 1) % n => int e1;
events[e1] - events[e0] +=> diffs;
}
return diffs / n;
}
}
1 change: 1 addition & 0 deletions runtap.ck
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Machine.add(me.dir() + "/beatTimer.ck");
Machine.add(me.dir() + "/beatTap.ck");
Machine.add(me.dir() + "/tapTester.ck");

0 comments on commit a3c87a2

Please sign in to comment.