diff options
| author | Christian Glöckner <cgloeckner@freenet.de> | 2016-01-25 16:20:30 +0100 |
|---|---|---|
| committer | André Nusser <andre.nusser@googlemail.com> | 2016-02-09 09:03:17 +0100 |
| commit | c9edca027eb2d2e257ff4a13fc257385d7c64d39 (patch) | |
| tree | f2f003225fc5177fa45bb61e8058aa5acb3be798 /src/audioinputenginemidi.cc | |
| parent | d3554736c13531898fb720b34772a595620e661a (diff) | |
Base Midi-Engines on Midi-Engine Base Class (+ Minor Renaming)
Diffstat (limited to 'src/audioinputenginemidi.cc')
| -rw-r--r-- | src/audioinputenginemidi.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/audioinputenginemidi.cc b/src/audioinputenginemidi.cc index 7c1e13d..d8e3366 100644 --- a/src/audioinputenginemidi.cc +++ b/src/audioinputenginemidi.cc @@ -38,19 +38,19 @@ AudioInputEngineMidi::AudioInputEngineMidi() is_valid = false; } -bool AudioInputEngineMidi::loadMidiMap(std::string _f, Instruments &instruments) +bool AudioInputEngineMidi::loadMidiMap(std::string file, Instruments &instruments) { - std::string f = _f; + std::string f = file; if(refs.load()) { - if(_f.size() > 1 && _f[0] == '@') { - f = refs.getValue(_f.substr(1)); + if(file.size() > 1 && file[0] == '@') { + f = refs.getValue(file.substr(1)); } } else { ERR(drumkitparser, "Error reading refs.conf"); } - file = ""; + midimap = ""; is_valid = false; DEBUG(mmap, "loadMidiMap(%s, i.size() == %d)\n", f.c_str(), @@ -70,7 +70,7 @@ bool AudioInputEngineMidi::loadMidiMap(std::string _f, Instruments &instruments) mmap.instrmap[instruments[i]->name()] = i; } - file = _f; + midimap = file; is_valid = true; return true; @@ -78,7 +78,7 @@ bool AudioInputEngineMidi::loadMidiMap(std::string _f, Instruments &instruments) std::string AudioInputEngineMidi::midimapFile() { - return file; + return midimap; } bool AudioInputEngineMidi::isValid() |