Ignore data presets files

[SugarCubes.git] / _MIDI.pde

diff --git a/_MIDI.pde b/_MIDI.pde
index 40f1c15892890a5b8566d758f746d70f662d90f8..5f25ddad62327f0f10ce797447b8371ae9ba5170 100644 (file)
--- a/_MIDI.pde
+++ b/_MIDI.pde
@@ -332,7 +332,7 @@ public class APC40MidiInput extends GenericDeviceMidiInput {
   private LXEffect releaseEffect = null;
   
   APC40MidiInput(MidiEngine midiEngine, MidiInputDevice d) {
-    super(midiEngine, d);
+    super(midiEngine, d);    
   }
 
   private class GridPosition {
@@ -348,7 +348,6 @@ public class APC40MidiInput extends GenericDeviceMidiInput {
     int pitch = note.getPitch();
     if (channel < 8) {
       if (pitch >= 53 && pitch <=57) return new GridPosition(pitch-53, channel);
-      else if (pitch == 52) return new GridPosition(5, channel);
     }
     return null;
   }
@@ -378,20 +377,20 @@ public class APC40MidiInput extends GenericDeviceMidiInput {
     case 7:
      switch (channel) {
        case 0:
-         EFF_colorFucker.sharp.setValue(value);
+         EFF_colorFucker.hueShift.setValue(value);
          break;
        case 1:
-         EFF_colorFucker.soft.setValue(value);
-         break;       
-       case 5:
+         EFF_colorFucker.desat.setValue(value);
+         break;
+       case 2:
+         EFF_colorFucker.sharp.setValue(value);
+         break;
+       case 3:
          EFF_blur.amount.setValue(value);
          break;
-       case 6:
+       case 4:
          EFF_quantize.amount.setValue(value);
          break;
-       case 7:
-         EFF_colorFucker.desat.setValue(value);
-         break;
      }
      break;
      
@@ -441,9 +440,25 @@ public class APC40MidiInput extends GenericDeviceMidiInput {
     
     case 49: // SOLO/CUE
       switch (nChan) {
+        case 4:
+          EFF_colorFucker.mono.setValue(1);
+          break;
         case 5:
           EFF_colorFucker.invert.setValue(1);
           break;
+        case 6:
+          lx.cycleBaseHue(60000);
+          break;
+      }
+      break;
+      
+    case 52: // CLIP STOP
+      if (nChan < PresetManager.NUM_PRESETS) {
+        if (shiftOn) {
+          presetManager.store(nChan);
+        } else {
+          presetManager.select(nChan);
+        }
       }
       break;
       
@@ -523,9 +538,15 @@ public class APC40MidiInput extends GenericDeviceMidiInput {
       
     case 49: // SOLO/CUE
       switch (nChan) {
+        case 4:
+          EFF_colorFucker.mono.setValue(0);
+          break;
         case 5:
           EFF_colorFucker.invert.setValue(0);
           break;
+        case 6:
+          lx.setBaseHue(lx.getBaseHue());
+          break;
       }
       break;
       
@@ -626,6 +647,15 @@ class APC40MidiOutput implements LXParameter.Listener, GridOutput {
     }
     resetParameters();
     midiEngine.grid.addOutput(this);
+
+    lx.cycleBaseHue(60000);
+    output.sendNoteOn(6, 49, 127);
+    
+    // Turn off the track selection lights
+    for (int i = 0; i < 8; ++i) {
+      output.sendNoteOn(i, 51, 0);
+    }
+    output.sendNoteOn(0, 80, 0);
   }
 
   private void resetParameters() {
@@ -712,9 +742,8 @@ class APC40MidiOutput implements LXParameter.Listener, GridOutput {
   }
   
   public void setGridState(int row, int col, int state) {
-    if (col < 8) {
-      if (row < 5) output.sendNoteOn(col, 53+row, state);
-      else if (row == 6) output.sendNoteOn(col, 52, state);
+    if (col < 8 && row < 5) {
+      output.sendNoteOn(col, 53+row, state);
     }
   }
 }