introduce onetwentyeighth notes to BPM

changed DrumPattern to init its BPM to a passed in value instead of hard coding 120bpm updated score files to initialize drum patterns properly
rl337 · Mar 8, 2015 · 8a1927a · 8a1927a
1 parent 96f9a87
commit 8a1927a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/src/DoubleStrokeDrumWarmupScore.ck b/src/DoubleStrokeDrumWarmupScore.ck
@@ -7,10 +7,10 @@ kit.init(audio_dir, 0.9, 0.9, 0.75);
 kit.bus => dac;
 
 DrumPattern left;
-left.init();
+left.init(120);
 
 DrumPattern right;
-right.init();
+right.init(120);
 
 WavFileWriter writer;
 writer.init("a.wav", 1.0);

diff --git a/src/FlamAccentDrumWarmupScore.ck b/src/FlamAccentDrumWarmupScore.ck
@@ -7,10 +7,10 @@ kit.init(audio_dir, 0.9, 0.9, 0.75);
 kit.bus => dac;
 
 DrumPattern left;
-left.init();
+left.init(240);
 
 DrumPattern right;
-right.init();
+right.init(240);
 
 WavFileWriter writer;
 writer.init("a.wav", 1.0);
@@ -21,28 +21,28 @@ left.addRepeated(
     [
         9,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
         0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-        9,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+        6,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
 
-        0,6,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-        9,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+        0,4,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+        6,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
         0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0
     ],
     left.bpm.sixtyfourthNote,
-    4
+    16 
 );
 
 right.addRepeated(
     [
-        0,6,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-        9,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+        0,4,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
+        6,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
         0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
 
         9,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
         0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
-        9,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0
+        6,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0
     ],
     left.bpm.sixtyfourthNote,
-    4
+    16
 );
 
 kit.play(left, right);
diff --git a/src/SingleStrokeDrumWarmupScore.ck b/src/SingleStrokeDrumWarmupScore.ck
@@ -6,10 +6,10 @@ kit.init(audio_dir, 0.9, 0.9, 0.75);
 kit.bus => dac;
 
 DrumPattern left;
-left.init();
+left.init(120);
 
 DrumPattern right;
-right.init();
+right.init(120);
 
 WavFileWriter writer;
 writer.init("a.wav", 1.0);

diff --git a/src/classes/BPM.ck b/src/classes/BPM.ck
@@ -4,6 +4,7 @@ public class BPM {
     static dur sixteenthNote;
     static dur thirtysecondNote;
     static dur sixtyfourthNote;
+    static dur onetwentyeighthNote;
 
     function void tempo(float bpm) {
         60.0 / bpm => float spb;
@@ -13,6 +14,7 @@ public class BPM {
         eighthNote * 0.5 => sixteenthNote;
         sixteenthNote * 0.5 => thirtysecondNote;
         thirtysecondNote * 0.5 => sixtyfourthNote;
+        sixtyfourthNote * 0.5 => onetwentyeighthNote;
     }
 
 }
diff --git a/src/classes/DrumPattern.ck b/src/classes/DrumPattern.ck
@@ -9,12 +9,12 @@ public class DrumPattern {
 
     0 => int REST;
 
-    function void init() {
-        bpm.tempo(120);
+    function void init(int init_bpm) {
+        bpm.tempo(init_bpm);
 
         0 => ptr;
 
-        bpm.sixtyfourthNote / 1.0::second => tempo;
+        bpm.onetwentyeighthNote / 1.0::second => tempo;
 
         int values[0] @=> pattern;
     }