diff options
| -rw-r--r-- | muse/muse/midiinport.cpp | 7 | ||||
| -rw-r--r-- | muse/muse/midioutport.cpp | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/muse/muse/midiinport.cpp b/muse/muse/midiinport.cpp index 6fc3288c..8d2db3c9 100644 --- a/muse/muse/midiinport.cpp +++ b/muse/muse/midiinport.cpp @@ -21,6 +21,7 @@ #include "song.h" #include "midiplugin.h" #include "midi.h" +#include "midictrl.h" #include "al/xml.h" #include "driver/mididev.h" #include "driver/audiodev.h" @@ -95,7 +96,6 @@ void MidiInPort::eventReceived(snd_seq_event_t* ev) MidiEvent event; event.setB(0); event.setTime(audioDriver->framePos()); - switch(ev->type) { case SND_SEQ_EVENT_NOTEON: event.setChannel(ev->data.note.channel); @@ -139,8 +139,9 @@ void MidiInPort::eventReceived(snd_seq_event_t* ev) case SND_SEQ_EVENT_PITCHBEND: event.setChannel(ev->data.control.channel); - event.setType(ME_PITCHBEND); - event.setA(ev->data.control.value); + event.setType(ME_CONTROLLER); + event.setA(CTRL_PITCH); + event.setB(ev->data.control.value); break; case SND_SEQ_EVENT_CONTROLLER: diff --git a/muse/muse/midioutport.cpp b/muse/muse/midioutport.cpp index 73351b0c..2496f60a 100644 --- a/muse/muse/midioutport.cpp +++ b/muse/muse/midioutport.cpp @@ -385,6 +385,7 @@ void MidiOutPort::routeEvent(const MidiEvent& event) queueAlsaEvent(event); break; case Route::SYNTIPORT: +printf("queue synti event\n"); ((SynthI*)(r->track))->playEvents()->insert(event); break; case Route::JACKMIDIPORT: |