Set display mode from APC buttons

diff --git a/_MIDI.pde b/_MIDI.pde
index 5e5236973ce5f501a2b7f3c912816719bb5b79ef..99c60d2bb5efb5a535532df39ee102be1a2e9461 100644 (file)
--- a/_MIDI.pde
+++ b/_MIDI.pde
@@ -513,13 +513,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

diff --git a/_UIImplementation.pde b/_UIImplementation.pde
index bd303ddac38f23581015b264fa9bfef19e0b253f..ac28fd6a9a96d00d333819809d2584cb71616ca9 100644 (file)
--- a/_UIImplementation.pde
+++ b/_UIImplementation.pde
@@ -142,6 +142,11 @@ class UICrossfader extends UIWindow {
     (displayMode = new UIToggleSet(4, titleHeight + 36, w-9, 20)).setOptions(new String[] { "A", "COMP", "B" }).setValue("COMP").addToContainer(this);
   }
   
+  public UICrossfader setDisplayMode(String value) {
+    displayMode.setValue(value);
+    return this;
+  }
+  
   public String getDisplayMode() {
     return displayMode.getValue();
   }