From 7bbc7520ecb2ff4fc020189c1fdfebd7d3bb8e42 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Sat, 14 May 2016 18:04:56 +0200
Subject: Temporary fix for midimap loading in command line tool.

---
 drumgizmo/input/jackmidi.cc | 6 +++---
 drumgizmo/input/jackmidi.h  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'drumgizmo')

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;
 };
-- 
cgit v1.2.3