From be1005a6031861b91e1a2df33f62e1c5a0a2aeb6 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Mon, 12 Nov 2012 04:49:31 +0000 Subject: Finished Aftertouch controllers Feature: Piano KB / drum list show coloured dots when per-pitch controllers exist / have data. --- muse2/muse/midi.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'muse2/muse/midi.cpp') 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: -- cgit v1.2.3