diff --git a/Processing/Sampler/Sampler.pde b/Processing/Sampler/Sampler.pde index d23063c..202e4cd 100644 --- a/Processing/Sampler/Sampler.pde +++ b/Processing/Sampler/Sampler.pde @@ -15,9 +15,7 @@ boolean[][] samples; void setup() { size(640, 460); background(255); - loadData(); - } void draw() { diff --git a/Processing/Sampler/SetBeat.pde b/Processing/Sampler/SetBeat.pde index 9056f5b..51b8f6d 100644 --- a/Processing/Sampler/SetBeat.pde +++ b/Processing/Sampler/SetBeat.pde @@ -1,6 +1,7 @@ int ereaseRow = 0; boolean doErease = false; boolean doRec = false; +boolean chooseBank = false; void setBeat(int index, int sample) { samples[sample][index] = true; @@ -8,9 +9,15 @@ void setBeat(int index, int sample) { void keyPressed() { println(keyCode); - if(keyCode >= 48 && keyCode < 57) { // From 0 to 9 - ereaseRow = keyCode-48; - } else if(keyCode >= 74) { // From P to Z + if(keyCode >= 64 && keyCode <= 88) { // From A to Z + println(key); + //ereaseRow = keyCode-48; + + if(key == 'b') { + chooseBank = true; + controller[0] = "STOP"; + controller[2] = "CHOOSE..."; + } if(key == 'p') { controller[0] = controller[0] == "PLAY" ? "STOP" : "PLAY"; beat=0; @@ -22,13 +29,18 @@ void keyPressed() { if(key == 'x') { controller[1] = "EREASE"; } - } else { // From A to O - int sample = keyCode-65; - ereaseRow = controller[1] == "EREASE" ? keyCode-64 : 0; + } else if(keyCode >= 48 && keyCode < 57) { // From 1 to 9 + int code = keyCode-49; + ereaseRow = controller[1] == "EREASE" ? keyCode-48 : 0; doErease = ereaseRow>0; - if(sample >= 0 && sample < numSounds && !doErease) { - if(controller[1] != "EREASE" && controller[1] != "UNSET") { - setBeat(beat, sample); + + if(code >= 0 && code < numSounds && !doErease) { + if(chooseBank) { + controller[2] = "BANK" + (code+1); + loadData(); + chooseBank = false; + } else if(controller[1] != "EREASE" && controller[1] != "UNSET") { + setBeat(beat, code); } } } diff --git a/Processing/Sampler/data/BANK1/1.wav b/Processing/Sampler/data/BANK1/1.wav index 35c8175..dcb8553 100644 Binary files a/Processing/Sampler/data/BANK1/1.wav and b/Processing/Sampler/data/BANK1/1.wav differ diff --git a/Processing/Sampler/data/BANK1/10.wav b/Processing/Sampler/data/BANK1/10.wav deleted file mode 100644 index 5ca2202..0000000 Binary files a/Processing/Sampler/data/BANK1/10.wav and /dev/null differ diff --git a/Processing/Sampler/data/BANK1/11.wav b/Processing/Sampler/data/BANK1/11.wav deleted file mode 100644 index 2a93d79..0000000 Binary files a/Processing/Sampler/data/BANK1/11.wav and /dev/null differ diff --git a/Processing/Sampler/data/BANK1/2.aiff b/Processing/Sampler/data/BANK1/2.aiff deleted file mode 100644 index 00f2e48..0000000 Binary files a/Processing/Sampler/data/BANK1/2.aiff and /dev/null differ diff --git a/Processing/Sampler/data/BANK1/2.wav b/Processing/Sampler/data/BANK1/2.wav index 32bd834..72a4822 100644 Binary files a/Processing/Sampler/data/BANK1/2.wav and b/Processing/Sampler/data/BANK1/2.wav differ diff --git a/Processing/Sampler/data/BANK1/3.wav b/Processing/Sampler/data/BANK1/3.wav index 101c110..dcdf716 100644 Binary files a/Processing/Sampler/data/BANK1/3.wav and b/Processing/Sampler/data/BANK1/3.wav differ diff --git a/Processing/Sampler/data/BANK1/4.wav b/Processing/Sampler/data/BANK1/4.wav index f997096..88f21f3 100644 Binary files a/Processing/Sampler/data/BANK1/4.wav and b/Processing/Sampler/data/BANK1/4.wav differ diff --git a/Processing/Sampler/data/BANK1/5.wav b/Processing/Sampler/data/BANK1/5.wav index 6641aed..5ca2202 100644 Binary files a/Processing/Sampler/data/BANK1/5.wav and b/Processing/Sampler/data/BANK1/5.wav differ diff --git a/Processing/Sampler/data/BANK1/6.wav b/Processing/Sampler/data/BANK1/6.wav index dcb8553..2a93d79 100644 Binary files a/Processing/Sampler/data/BANK1/6.wav and b/Processing/Sampler/data/BANK1/6.wav differ diff --git a/Processing/Sampler/data/BANK1/7.wav b/Processing/Sampler/data/BANK1/7.wav deleted file mode 100644 index 72a4822..0000000 Binary files a/Processing/Sampler/data/BANK1/7.wav and /dev/null differ diff --git a/Processing/Sampler/data/BANK1/8.wav b/Processing/Sampler/data/BANK1/8.wav deleted file mode 100644 index dcdf716..0000000 Binary files a/Processing/Sampler/data/BANK1/8.wav and /dev/null differ diff --git a/Processing/Sampler/data/BANK1/9.wav b/Processing/Sampler/data/BANK1/9.wav deleted file mode 100644 index 88f21f3..0000000 Binary files a/Processing/Sampler/data/BANK1/9.wav and /dev/null differ diff --git a/Processing/Sampler/data/bank1/1.wav b/Processing/Sampler/data/BANK2/1.wav similarity index 100% rename from Processing/Sampler/data/bank1/1.wav rename to Processing/Sampler/data/BANK2/1.wav diff --git a/Processing/Sampler/data/bank1/2.wav b/Processing/Sampler/data/BANK2/2.wav similarity index 100% rename from Processing/Sampler/data/bank1/2.wav rename to Processing/Sampler/data/BANK2/2.wav diff --git a/Processing/Sampler/data/bank1/3.wav b/Processing/Sampler/data/BANK2/3.wav similarity index 100% rename from Processing/Sampler/data/bank1/3.wav rename to Processing/Sampler/data/BANK2/3.wav diff --git a/Processing/Sampler/data/bank1/4.wav b/Processing/Sampler/data/BANK2/4.wav similarity index 100% rename from Processing/Sampler/data/bank1/4.wav rename to Processing/Sampler/data/BANK2/4.wav diff --git a/Processing/Sampler/data/bank1/5.wav b/Processing/Sampler/data/BANK2/5.wav similarity index 100% rename from Processing/Sampler/data/bank1/5.wav rename to Processing/Sampler/data/BANK2/5.wav diff --git a/Processing/Sampler/data/bank1/10.wav b/Processing/Sampler/data/bank1/10.wav deleted file mode 100644 index 5ca2202..0000000 Binary files a/Processing/Sampler/data/bank1/10.wav and /dev/null differ diff --git a/Processing/Sampler/data/bank1/11.wav b/Processing/Sampler/data/bank1/11.wav deleted file mode 100644 index 2a93d79..0000000 Binary files a/Processing/Sampler/data/bank1/11.wav and /dev/null differ diff --git a/Processing/Sampler/data/bank1/2.aiff b/Processing/Sampler/data/bank1/2.aiff deleted file mode 100644 index 00f2e48..0000000 Binary files a/Processing/Sampler/data/bank1/2.aiff and /dev/null differ diff --git a/Processing/Sampler/data/bank1/6.wav b/Processing/Sampler/data/bank1/6.wav deleted file mode 100644 index dcb8553..0000000 Binary files a/Processing/Sampler/data/bank1/6.wav and /dev/null differ diff --git a/Processing/Sampler/data/bank1/7.wav b/Processing/Sampler/data/bank1/7.wav deleted file mode 100644 index 72a4822..0000000 Binary files a/Processing/Sampler/data/bank1/7.wav and /dev/null differ diff --git a/Processing/Sampler/data/bank1/8.wav b/Processing/Sampler/data/bank1/8.wav deleted file mode 100644 index dcdf716..0000000 Binary files a/Processing/Sampler/data/bank1/8.wav and /dev/null differ diff --git a/Processing/Sampler/data/bank1/9.wav b/Processing/Sampler/data/bank1/9.wav deleted file mode 100644 index 88f21f3..0000000 Binary files a/Processing/Sampler/data/bank1/9.wav and /dev/null differ diff --git a/Processing/Sampler/loadData.pde b/Processing/Sampler/loadData.pde index cc694ff..a984c86 100644 --- a/Processing/Sampler/loadData.pde +++ b/Processing/Sampler/loadData.pde @@ -1,7 +1,7 @@ void loadData() { - numSounds = 10; - numTracks = numSounds;//4; + numSounds = 5; + numTracks = numSounds; bpm = 280; divider = 16; duration = int((60/float(bpm))*1000);