repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New LX UI
[SugarCubes.git]
/
MIDI.pde
diff --git
a/MIDI.pde
b/MIDI.pde
index 5a198f0e608df954c68058678e480fafcff32998..56ba9b5970aed9f0f7a0bab22becf295e2ea5e2b 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);
}
@@
-115,7
+115,7
@@
public interface SCMidiInputListener {
public void onEnabled(SCMidiInput controller, boolean enabled);
}
public void onEnabled(SCMidiInput controller, boolean enabled);
}
-public abstract class SCMidiInput extends UI
Scroll
List.AbstractItem {
+public abstract class SCMidiInput extends UI
Item
List.AbstractItem {
protected boolean enabled = false;
private final String name;
protected boolean enabled = false;
private final String name;
@@
-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;
}
- }
*/
+ }
}
}
}
}