summaryrefslogtreecommitdiff
path: root/drumgizmo/input
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2016-05-14 18:04:56 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2016-05-14 18:04:56 +0200
commit7bbc7520ecb2ff4fc020189c1fdfebd7d3bb8e42 (patch)
treeb7401c8886fd7fc2c8cfe9b83f113add50c20c29 /drumgizmo/input
parent7aff3e6c4736690b9bc3e900a61c8ab8d172bf26 (diff)
Temporary fix for midimap loading in command line tool.
Diffstat (limited to 'drumgizmo/input')
-rw-r--r--drumgizmo/input/jackmidi.cc6
-rw-r--r--drumgizmo/input/jackmidi.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/drumgizmo/input/jackmidi.cc b/drumgizmo/input/jackmidi.cc
index 73098c5..7eeae7d 100644
--- a/drumgizmo/input/jackmidi.cc
+++ b/drumgizmo/input/jackmidi.cc
@@ -50,10 +50,10 @@ JackMidiInputEngine::~JackMidiInputEngine()
bool JackMidiInputEngine::init(const Instruments& instruments)
{
- if(!loadMidiMap(midimap, instruments))
+ if(!loadMidiMap(midimap_file, instruments))
{
std::cerr << "[MidifileInputEngine] Failed to parse midimap '"
- << midimap << "'\n";
+ << midimap_file << "'\n";
return false;
}
port = std::make_unique<JackPort>(client, "drumgizmo_midiin",
@@ -67,7 +67,7 @@ void JackMidiInputEngine::setParm(const std::string& parm, const std::string& va
if(parm == "midimap")
{
// apply midimap filename
- midimap = value;
+ midimap_file = value;
}
else
{
diff --git a/drumgizmo/input/jackmidi.h b/drumgizmo/input/jackmidi.h
index 15707c4..1532b18 100644
--- a/drumgizmo/input/jackmidi.h
+++ b/drumgizmo/input/jackmidi.h
@@ -58,6 +58,7 @@ private:
JackClient& client;
std::unique_ptr<JackPort> port;
+ std::string midimap_file;
std::size_t pos;
std::vector<event_t> events;
};