X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=MIDI.pde;h=56ba9b5970aed9f0f7a0bab22becf295e2ea5e2b;hb=a521a50b10037871a64746a7d5c40ed5f38e59e3;hp=5a198f0e608df954c68058678e480fafcff32998;hpb=7d60f6f6ea82fd5c9794524ce11d40e7d6c00bf7;p=SugarCubes.git

diff --git a/MIDI.pde b/MIDI.pde
index 5a198f0..56ba9b5 100644
--- a/MIDI.pde
+++ b/MIDI.pde
@@ -15,7 +15,7 @@
  * set your SCPattern class to respond to the controllers that you
  * care about.
  */
-
+import processing.event.*;
 interface MidiEngineListener {
   public void onFocusedDeck(int deckIndex);
 }
@@ -115,7 +115,7 @@ public interface SCMidiInputListener {
   public void onEnabled(SCMidiInput controller, boolean enabled);
 }
 
-public abstract class SCMidiInput extends UIScrollList.AbstractItem {
+public abstract class SCMidiInput extends UIItemList.AbstractItem {
 
   protected boolean enabled = false;
   private final String name;
@@ -264,7 +264,7 @@ public class VirtualKeyMidiInput extends SCMidiInput {
     } else {
       mapKeys();
     }
-    //registerKeyEvent(this);    
+    registerMethod("keyEvent",this);
   }
 
   private void mapAPC() {
@@ -321,19 +321,19 @@ public class VirtualKeyMidiInput extends SCMidiInput {
     if (!enabled) {
       return;
     }
-   /* char c = 0;//0Character.toLowerCase(e.getKeyChar());
+    char c = 0;//0Character.toLowerCase(e.getKeyChar());
     NoteMeta nm = keyToNote.get(c);
     if (nm != null) {
-      switch (e.getID()) {
-      case KeyEvent.KEY_PRESSED:
+      switch (e.getKeyCode()) {
+      case KeyEvent.PRESS:
         noteOnReceived(new Note(Note.NOTE_ON, nm.channel, nm.number + octaveShift*12, 127));
         break;
-      case KeyEvent.KEY_RELEASED:
+      case KeyEvent.RELEASE:
         noteOffReceived(new Note(Note.NOTE_OFF, nm.channel, nm.number + octaveShift*12, 0));
         break;
       }
     }
-    if ((mode == KEYS) && (e.getID() == KeyEvent.KEY_PRESSED)) {
+    if ((mode == KEYS) && (e.getKeyCode() == KeyEvent.PRESS)) {
       switch (c) {
       case 'z':
         octaveShift = constrain(octaveShift-1, -4, 4);
@@ -342,7 +342,7 @@ public class VirtualKeyMidiInput extends SCMidiInput {
         octaveShift = constrain(octaveShift+1, -4, 4);
         break;
       }
-    }*/
+    }
   }
 }