summaryrefslogtreecommitdiff
path: root/muse2/muse/midi.cpp
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2012-11-12 04:49:31 +0000
committerTim E. Real <termtech@rogers.com>2012-11-12 04:49:31 +0000
commitbe1005a6031861b91e1a2df33f62e1c5a0a2aeb6 (patch)
tree89152909549c7dd624f4748f394c3adbcbf65b86 /muse2/muse/midi.cpp
parent31f618e5461553bd7836677f944acfa233e5ae3c (diff)
Finished Aftertouch controllers
Feature: Piano KB / drum list show coloured dots when per-pitch controllers exist / have data.
Diffstat (limited to 'muse2/muse/midi.cpp')
-rw-r--r--muse2/muse/midi.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/muse2/muse/midi.cpp b/muse2/muse/midi.cpp
index 33b98c00..e5b1c62a 100644
--- a/muse2/muse/midi.cpp
+++ b/muse2/muse/midi.cpp
@@ -280,10 +280,11 @@ void buildMidiEventList(EventList* del, const MPEventList* el, MidiTrack* track,
e.setLenTick(0);
break;
case ME_POLYAFTER:
- e.setType(PAfter);
- e.setA(ev.dataA());
+ e.setType(Controller);
+ e.setA((CTRL_POLYAFTER & ~0xff) | (ev.dataA() & 0x7f));
e.setB(ev.dataB());
break;
+
case ME_CONTROLLER:
{
int val = ev.dataB();
@@ -393,8 +394,9 @@ void buildMidiEventList(EventList* del, const MPEventList* el, MidiTrack* track,
break;
case ME_AFTERTOUCH:
- e.setType(CAfter);
- e.setA(ev.dataA());
+ e.setType(Controller);
+ e.setA(CTRL_AFTERTOUCH);
+ e.setB(ev.dataA());
break;
case ME_PITCHBEND: