From 77b3943b751bed43d230de6db322a750bfd1fc8e Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 4 Apr 2013 21:19:58 +0200 Subject: New message system. New common midi input class. Some compiler warning fixes. New ListBoxBasic class used by both LustBox and ComboBox. New embossed font. --- src/audioinputenginemidi.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/audioinputenginemidi.cc') diff --git a/src/audioinputenginemidi.cc b/src/audioinputenginemidi.cc index 5986471..6aa9d45 100644 --- a/src/audioinputenginemidi.cc +++ b/src/audioinputenginemidi.cc @@ -26,15 +26,23 @@ */ #include "audioinputenginemidi.h" -void InputLV2::loadMidiMap(std::string f) +#include "midimapparser.h" + +#include + +void AudioInputEngineMidi::loadMidiMap(std::string f, Instruments &instruments) { + DEBUG(mmap, "loadMidiMap(%s, i.size() == %d)\n", f.c_str(), + instruments.size()); if(f == "") return; MidiMapParser p(f); if(p.parse()) {/*return false;*/} + + mmap.clear(); mmap.midimap = p.midimap; - for(size_t i = 0; i < instruments->size(); i++) { - mmap.instrmap[(*instruments)[i]->name()] = i; + for(size_t i = 0; i < instruments.size(); i++) { + mmap.instrmap[instruments[i]->name()] = i; } } -- cgit v1.2.3