From 41b6ef4642b25c22e47e5f89f113b502d3a4321c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= <cgloeckner@freenet.de>
Date: Mon, 25 Jan 2016 12:32:09 +0100
Subject: added JackMidiInputEngine + additional minor changes

---
 drumgizmo/enginefactory.cc | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'drumgizmo/enginefactory.cc')

diff --git a/drumgizmo/enginefactory.cc b/drumgizmo/enginefactory.cc
index cb332ed..06f8141 100644
--- a/drumgizmo/enginefactory.cc
+++ b/drumgizmo/enginefactory.cc
@@ -26,6 +26,7 @@
  */
 #include <iostream>
 
+#include "cpp11fix.h" // required for c++11
 #include "enginefactory.h"
 
 EngineFactory::EngineFactory()
@@ -42,6 +43,9 @@ EngineFactory::EngineFactory()
 #ifdef HAVE_INPUT_MIDIFILE
 	input.push_back("midifile");
 #endif
+#ifdef HAVE_INPUT_JACKMIDI
+	input.push_back("jackmidi");
+#endif
 	
 	// list available output engines
 #ifdef HAVE_OUTPUT_DUMMY
@@ -85,6 +89,12 @@ std::unique_ptr<AudioInputEngine> EngineFactory::createInput(std::string const &
 		return std::make_unique<MidifileInputEngine>();
 	}
 #endif
+#ifdef HAVE_INPUT_JACKMIDI
+	if (name == "jackmidi") {
+		prepareJack();
+		return std::make_unique<JackMidiInputEngine>(*jack);
+	}
+#endif
 	
 	// todo: add more engines
 	
@@ -111,7 +121,7 @@ std::unique_ptr<AudioOutputEngine> EngineFactory::createOutput(std::string const
 #ifdef HAVE_OUTPUT_JACKAUDIO
 	if (name == "jackaudio") {
 		prepareJack();
-		return std::make_unique<JackaudioOutputEngine>(*jack);
+		return std::make_unique<JackAudioOutputEngine>(*jack);
 	}
 #endif
 	
-- 
cgit v1.2.3