repositories
/
SugarCubes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d60f6f
)
move to need keyEvent stuff from processing2
author
Ben Morrow
<childoftv@gmail.com>
Mon, 3 Mar 2014 06:31:10 +0000
(22:31 -0800)
committer
Ben Morrow
<childoftv@gmail.com>
Mon, 3 Mar 2014 06:31:10 +0000
(22:31 -0800)
MIDI.pde
patch
|
blob
|
blame
|
history
diff --git
a/MIDI.pde
b/MIDI.pde
index 5a198f0e608df954c68058678e480fafcff32998..a6183210a85361e85c4939cfe74dc77a722f9dcd 100644
(file)
--- a/
MIDI.pde
+++ b/
MIDI.pde
@@
-15,7
+15,7
@@
* set your SCPattern class to respond to the controllers that you
* care about.
*/
* set your SCPattern class to respond to the controllers that you
* care about.
*/
-
+import processing.event.*;
interface MidiEngineListener {
public void onFocusedDeck(int deckIndex);
}
interface MidiEngineListener {
public void onFocusedDeck(int deckIndex);
}
@@
-264,7
+264,7
@@
public class VirtualKeyMidiInput extends SCMidiInput {
} else {
mapKeys();
}
} else {
mapKeys();
}
- //registerKeyEvent(this);
+ registerMethod("keyEvent",this);
}
private void mapAPC() {
}
private void mapAPC() {
@@
-321,19
+321,19
@@
public class VirtualKeyMidiInput extends SCMidiInput {
if (!enabled) {
return;
}
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) {
NoteMeta nm = keyToNote.get(c);
if (nm != null) {
- switch (e.get
ID
()) {
- case KeyEvent.
KEY_PRESSED
:
+ switch (e.get
KeyCode
()) {
+ case KeyEvent.
PRESS
:
noteOnReceived(new Note(Note.NOTE_ON, nm.channel, nm.number + octaveShift*12, 127));
break;
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;
}
}
noteOffReceived(new Note(Note.NOTE_OFF, nm.channel, nm.number + octaveShift*12, 0));
break;
}
}
- if ((mode == KEYS) && (e.get
ID() == KeyEvent.KEY_PRESSED
)) {
+ if ((mode == KEYS) && (e.get
KeyCode() == KeyEvent.PRESS
)) {
switch (c) {
case 'z':
octaveShift = constrain(octaveShift-1, -4, 4);
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;
}
octaveShift = constrain(octaveShift+1, -4, 4);
break;
}
- }
*/
+ }
}
}
}
}