repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'processing-2'
[SugarCubes.git]
/
MIDI.pde
diff --git
a/_MIDI.pde
b/MIDI.pde
similarity index 98%
rename from
_MIDI.pde
rename to
MIDI.pde
index 562aa869a3d3193b1294219ffb84355ac3b47920..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();
}
- register
KeyEvent(this);
+ register
Method("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 = Character.toLowerCase(e.getKeyChar());
+ char c =
0;//0
Character.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);
@@
-523,7
+523,7
@@
public class APC40MidiInput extends GenericDeviceMidiInput {
return true;
case 83: // scene 2
return true;
case 83: // scene 2
- effects.flash.trigger();
+
//
effects.flash.trigger();
return true;
case 84: // scene 3
return true;
case 84: // scene 3