Make reset() a top-level SCPattern function, invoked from APC midi handler, patterns...

diff --git a/DanUtil.pde b/DanUtil.pde
index 4d922940fa907b1e47bd48c0f4060976d2fae5df..30ae8945b7c574238da64e80436ada4fc3788a88 100644 (file)
--- a/DanUtil.pde
+++ b/DanUtil.pde
@@ -150,7 +150,6 @@ public class DPat extends SCPattern
                int row = note.getPitch(), col = note.getChannel();
                for (int i=0; i<picks.size(); i++) if (picks.get(i).set(row, col))                      { presetManager.dirty(this); return true; }
                for (int i=0; i<bools.size(); i++) if (bools.get(i).set(row, col, true))        { presetManager.dirty(this); return true; }
-               if (row == 84 && col==0) { onReset(); return true; }
                println("row: " + row + "  col:   " + col); return false;
        }
 

diff --git a/_MIDI.pde b/_MIDI.pde
index 727742fa53295b71a63463b0bf8c43fce9a08efa..1a43c958b7fcc2aaef8a018d5100d133501a2317 100644 (file)
--- a/_MIDI.pde
+++ b/_MIDI.pde
@@ -498,6 +498,10 @@ public class APC40MidiInput extends GenericDeviceMidiInput {
       effects.flash.trigger();
       return true;
       
+    case 84: // scene 3
+      getTargetPattern().reset();
+      return true;
+      
     case 90:
       // dan's dirty tapping mechanism
       lx.tempo.trigger();

diff --git a/code/GLucose.jar b/code/GLucose.jar
index 8a71ba7f66197f79aff2c798d25c830c442227a4..358d323314816fde8c3ca58182a4dc1779b45827 100755 (executable)
Binary files a/code/GLucose.jar and b/code/GLucose.jar differ