From 5357c6ef27c536f15fea6870ad2f98c2fd705e1d Mon Sep 17 00:00:00 2001 From: ben Date: Thu, 26 Oct 2017 15:48:41 +0200 Subject: [PATCH] fixes --- src/core/MidiIO.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/core/MidiIO.cpp b/src/core/MidiIO.cpp index fb501e9d..42d74a9e 100644 --- a/src/core/MidiIO.cpp +++ b/src/core/MidiIO.cpp @@ -56,16 +56,12 @@ std::vector MidiIO::getDevices() { return names; } - RtMidiIn *m = NULL; - if (midiInMap.empty()) { - try { - m = new RtMidiIn(); - } catch (RtMidiError &error) { - fprintf(stderr, "Failed to create RtMidiIn: %s\n", error.getMessage().c_str()); - return names; - } - } else { - m = midiInMap.begin()->second; + RtMidiIn *m; + try { + m = new RtMidiIn(); + } catch (RtMidiError &error) { + fprintf(stderr, "Failed to create RtMidiIn: %s\n", error.getMessage().c_str()); + return names; } for (unsigned int i = 0; i < m->getPortCount(); i++) { @@ -152,7 +148,7 @@ double MidiIO::getMessage(std::vector *msg) { return 0; } - next_msg.timeStamp = midiInMap[deviceName]->getMessage(&next_msg.bytes); + next_msg.timeStamp = mw->getMessage(&next_msg.bytes); if (next_msg.bytes.size() > 0) { for (auto &kv : mw->idMessagesMap) {