From 5f6dacd2acd612c3ec7d069c853f808cfe9e3d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Goran=20Meki=C4=87?= <meka@tilda.center>
Date: Sun, 21 May 2017 11:28:12 +0200
Subject: Add OSS MIDI input

---
 drumgizmo/enginefactory.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'drumgizmo/enginefactory.cc')

diff --git a/drumgizmo/enginefactory.cc b/drumgizmo/enginefactory.cc
index a1b8a0b..d54c3e2 100644
--- a/drumgizmo/enginefactory.cc
+++ b/drumgizmo/enginefactory.cc
@@ -49,6 +49,9 @@ EngineFactory::EngineFactory()
 #ifdef HAVE_INPUT_JACKMIDI
 	input.push_back("jackmidi");
 #endif
+#ifdef HAVE_INPUT_OSS
+	input.push_back("oss");
+#endif
 
 // list available output engines
 #ifdef HAVE_OUTPUT_DUMMY
@@ -115,6 +118,12 @@ std::unique_ptr<AudioInputEngine> EngineFactory::createInput(const std::string&
 		return std::make_unique<JackMidiInputEngine>(*jack);
 	}
 #endif
+#ifdef HAVE_INPUT_OSS
+	if(name == "oss")
+	{
+		return std::make_unique<OssMidiInputEngine>();
+	}
+#endif
 
 	// todo: add more engines
 
-- 
cgit v1.2.3


From a6343737453b34335a7a5494c8ac6b393d15604c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Goran=20Meki=C4=87?= <meka@tilda.center>
Date: Fri, 29 Dec 2017 23:36:55 +0100
Subject: Open midi device in non-blocking mode

---
 drumgizmo/enginefactory.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'drumgizmo/enginefactory.cc')

diff --git a/drumgizmo/enginefactory.cc b/drumgizmo/enginefactory.cc
index d54c3e2..c93607e 100644
--- a/drumgizmo/enginefactory.cc
+++ b/drumgizmo/enginefactory.cc
@@ -118,10 +118,10 @@ std::unique_ptr<AudioInputEngine> EngineFactory::createInput(const std::string&
 		return std::make_unique<JackMidiInputEngine>(*jack);
 	}
 #endif
-#ifdef HAVE_INPUT_OSS
-	if(name == "oss")
+#ifdef HAVE_INPUT_OSSMIDI
+	if(name == "ossmidi")
 	{
-		return std::make_unique<OssMidiInputEngine>();
+		return std::make_unique<OSSInputEngine>();
 	}
 #endif
 
-- 
cgit v1.2.3