X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_MIDI.pde;h=b75556c8bba2a92dd7032c8b0c213e6422afabc7;hb=7b2fadedce316c1ea8c654ab18809ea5fb8efbe9;hp=5e5236973ce5f501a2b7f3c912816719bb5b79ef;hpb=d93c968f7b60cee84b7082e3e469a4c4309e6eda;p=SugarCubes.git

diff --git a/_MIDI.pde b/_MIDI.pde
index 5e52369..b75556c 100644
--- a/_MIDI.pde
+++ b/_MIDI.pde
@@ -411,7 +411,7 @@ public class APC40MidiInput extends GenericDeviceMidiInput {
     case 7:
      switch (channel) {
        case 0:
-         effects.colorFucker.hueShift.setValue(value);
+         uiSpeed.speed.setValue(0.5 - value*0.5);
          return true;
        case 1:
          effects.colorFucker.desat.setValue(value);
@@ -437,6 +437,19 @@ public class APC40MidiInput extends GenericDeviceMidiInput {
     case 15:
       lx.engine.getDeck(GLucose.RIGHT_DECK).getFader().setValue(value);
       return true;
+      
+    // Cue level
+    case 47:
+      float val = effects.colorFucker.hueShift.getValuef();
+      int cv = cc.getValue();
+      if (cv < 64) {
+        cv = 64 + cv;
+      } else {
+        cv = cv - 64;
+      }
+      val += (cv - 64) / 500.;
+      effects.colorFucker.hueShift.setValue((val+1) % 1);
+      return true;
     }
     
     int parameterIndex = -1;
@@ -513,13 +526,23 @@ public class APC40MidiInput extends GenericDeviceMidiInput {
       return true;
 
     case 91: // play
-    case 97: // left bank
-      midiEngine.setFocusedDeck(0);
+      if (shiftOn) {
+        midiEngine.setFocusedDeck(GLucose.LEFT_DECK);
+      } else {
+        uiCrossfader.setDisplayMode("A");
+      }
       return true;
-
+      
+    case 92: // stop
+      uiCrossfader.setDisplayMode("COMP");
+      return true;
+      
     case 93: // rec
-    case 96: // right bank
-      midiEngine.setFocusedDeck(1);
+      if (shiftOn) {
+        midiEngine.setFocusedDeck(GLucose.RIGHT_DECK);
+      } else {
+        uiCrossfader.setDisplayMode("B");
+      }
       return true;
 
     case 94: // up bank
@@ -883,6 +906,12 @@ class ArturiaMinilabMidiInput extends GenericDeviceMidiInput {
       case 18:  parameterIndex = 5; break;
       case 19:  parameterIndex = 6; break;
       case 16:  parameterIndex = 7; break;
+      
+      case 75:
+        float val = effects.colorFucker.hueShift.getValuef();
+        val += (cc.getValue() - 64) / 256.;
+        effects.colorFucker.hueShift.setValue((val+1) % 1);
+        break;
     }
     if (parameterIndex >= 0) {
       List<LXParameter> parameters = midiEngine.getFocusedPattern().getParameters();