Merge branch 'feature/oss-midi'

8 files changed, 257 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 5de59b9..f323db2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -359,7 +359,44 @@ AS_IF(
      have_input_midifile=no]
   )
 
-  INPUT_PLUGINS="midifile jackmidi dummy test"
+  dnl *** oss
+  case $host_os in
+    freebsd*)
+      enable_oss_midi_value=yes
+      ;;
+    *)
+      enable_oss_midi_value=no
+      ;;
+  esac
+  AC_ARG_ENABLE([input_oss],
+    AS_HELP_STRING(
+      [--disable-input-oss],
+      [Disable input oss plugin [enabled by default on FreeBSD, disabled otherwise]]),,
+    [enable_input_ossmidi=$enable_oss_midi_value]
+  )
+
+  AS_IF(
+    [test "x$enable_input_ossmidi" = "xyes"],
+    [AC_MSG_CHECKING(for OSS in)
+      AC_COMPILE_IFELSE(
+        [AC_LANG_SOURCE([[
+          #include <sys/soundcard.h>
+          #ifndef AFMT_S32_NE
+          # error no oss
+          #endif
+        ]])],
+        [
+          have_input_ossmidi=yes
+          AC_MSG_RESULT(yes)
+        ],
+        [AC_MSG_FAILURE([no OSS headers found])]
+    )],
+
+    [AC_MSG_RESULT([*** input ossmidi plugin disabled per user request ***])
+    have_input_ossmidi=no]
+  )
+
+  INPUT_PLUGINS="midifile jackmidi dummy test ossmidi"
   AC_SUBST(INPUT_PLUGINS)
 
   dnl ***
@@ -441,7 +478,7 @@ AS_IF(
 
   AS_IF(
     [test "x$enable_output_oss" = "xyes"],
-    [AC_MSG_CHECKING(for OSS)
+    [AC_MSG_CHECKING(for OSS out)
       AC_COMPILE_IFELSE(
         [AC_LANG_SOURCE([[
           #include <sys/soundcard.h>
@@ -481,6 +518,7 @@ AM_CONDITIONAL([ENABLE_CLI], [test "x$enable_cli" == "xyes"])
 AM_CONDITIONAL([HAVE_INPUT_DUMMY], [test "x$have_input_dummy" = "xyes"])
 AM_CONDITIONAL([HAVE_INPUT_TEST], [test "x$have_input_test" = "xyes"])
 AM_CONDITIONAL([HAVE_INPUT_JACKMIDI], [test "x$have_input_jackmidi" = "xyes"])
+AM_CONDITIONAL([HAVE_INPUT_OSSMIDI], [test "x$have_input_ossmidi" = "xyes"])
 AM_CONDITIONAL([HAVE_INPUT_MIDIFILE], [test "x$have_input_midifile" = "xyes"])
 AM_CONDITIONAL([HAVE_OUTPUT_DUMMY], [test "x$have_output_dummy" = "xyes"])
 AM_CONDITIONAL([HAVE_OUTPUT_ALSA], [test "x$have_output_alsa" = "xyes"])
diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am
index de5cad6..940630a 100644
--- a/drumgizmo/Makefile.am
+++ b/drumgizmo/Makefile.am
@@ -72,6 +72,11 @@ drumgizmo_SOURCES += output/oss.cc
 drumgizmo_CXXFLAGS += -DHAVE_OUTPUT_OSS
 endif # HAVE_OUTPUT_OSS
 
+if HAVE_INPUT_OSSMIDI
+drumgizmo_SOURCES += input/ossmidi.cc
+drumgizmo_CXXFLAGS += -DHAVE_INPUT_OSSMIDI
+endif # HAVE_INPUT_OSSMIDI
+
 
 # Only compile jackclient.cc if at least one of the jack modules are included.
 if HAVE_OUTPUT_JACKAUDIO
@@ -91,6 +96,7 @@ EXTRA_DIST = \
 	input/test.h \
 	input/jackmidi.h \
 	input/midifile.h \
+	input/ossmidi.h \
 	output/alsa.h \
 	output/jackaudio.h \
 	output/outputdummy.h \
diff --git a/drumgizmo/drumgizmoc.cc b/drumgizmo/drumgizmoc.cc
index ba3abfc..6a2458b 100644
--- a/drumgizmo/drumgizmoc.cc
+++ b/drumgizmo/drumgizmoc.cc
@@ -103,6 +103,7 @@ static std::string usage(std::string name)
 	output << "  midifile:  file=<midifile>, speed=<tempo> (default 1.0),\n";
 	output << "             track=<miditrack> (default -1, all tracks)\n";
 	output << "             midimap=<midimapfile>, loop=<true|false>\n";
+	output << "  ossmidi:   midimap=<midimapfile>, dev=<device> (default '/dev/midi')\n";
 	output << "  test:      p=<hit_propability> (default 0.1)\n";
 	output << "             instr=<instrument> (default -1, random instrument)\n";
 	output << "             len=<seconds> (default -1, forever)\n";
diff --git a/drumgizmo/enginefactory.cc b/drumgizmo/enginefactory.cc
index a1b8a0b..c93607e 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_OSSMIDI
+	if(name == "ossmidi")
+	{
+		return std::make_unique<OSSInputEngine>();
+	}
+#endif
 
 	// todo: add more engines
 
diff --git a/drumgizmo/enginefactory.h b/drumgizmo/enginefactory.h
index 2a1457e..0b37c6e 100644
--- a/drumgizmo/enginefactory.h
+++ b/drumgizmo/enginefactory.h
@@ -53,6 +53,10 @@
 #include "input/jackmidi.h"
 #endif
 
+#ifdef HAVE_INPUT_OSS
+#include "input/ossmidi.h"
+#endif
+
 #ifdef HAVE_OUTPUT_DUMMY
 #include "output/outputdummy.h"
 #endif
@@ -74,6 +78,11 @@
 #endif
 
 
+#ifdef HAVE_INPUT_OSSMIDI
+#include "input/ossmidi.h"
+#endif
+
+
 //! Factory for various input- and output engines
 class EngineFactory
 {
diff --git a/drumgizmo/input/ossmidi.cc b/drumgizmo/input/ossmidi.cc
new file mode 100644
index 0000000..325a83d
--- /dev/null
+++ b/drumgizmo/input/ossmidi.cc
@@ -0,0 +1,132 @@
+/* -*- Mode: c++ -*- */
+/***************************************************************************
+ *            ossmidi.cc
+ *
+ *  Sun May 21 10:52:09 CEST 2017
+ *  Copyright 2017 Goran Mekić
+ *  meka@tilda.center
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DrumGizmo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#include "ossmidi.h"
+#include <sys/soundcard.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+
+
+static int const NOTE_ON = 0x90;
+static int const NOTE_MASK = 0xF0;
+
+
+OSSInputEngine::OSSInputEngine()
+	: AudioInputEngineMidi{}
+	, dev{"/dev/midi"}
+{
+}
+
+
+OSSInputEngine::~OSSInputEngine()
+{
+}
+
+
+bool OSSInputEngine::init(const Instruments& instruments)
+{
+	if(!loadMidiMap(midimap_file, instruments))
+	{
+		std::cerr << "[OSSInputEngine] Failed to parse midimap '"
+		          << midimap_file << std::endl;
+		return false;
+	}
+	if ((fd = open(dev.data(), O_RDONLY | O_NONBLOCK, 0)) == -1)
+	{
+		std::cerr << dev.data() << ' ' << std::strerror(errno) << std::endl;
+		return false;
+	}
+	return true;
+}
+
+
+void OSSInputEngine::setParm(const std::string& parm, const std::string& value)
+{
+	if(parm == "dev")
+	{
+		dev = value;
+	}
+	else if(parm == "midimap")
+	{
+		midimap_file = value;
+	}
+}
+
+
+bool OSSInputEngine::start()
+{
+	return true;
+}
+
+void OSSInputEngine::stop()
+{
+}
+
+
+void OSSInputEngine::pre()
+{
+	events.clear();
+}
+
+
+void OSSInputEngine::run(size_t pos, size_t len, std::vector<event_t>& events)
+{
+	int l;
+	unsigned char buf[128];
+	if ((l = read (fd, buf, sizeof (buf))) != -1)
+	{
+		int masked_note = buf[0] & NOTE_MASK;
+		if (masked_note == NOTE_ON) {
+			int note = buf[1];
+			int velocity = buf[2];
+			event_t event;
+			event.instrument = mmap.lookup(note);
+			if(event.instrument != -1)
+			{
+				event.velocity = velocity / 127.0;
+				event.type = 0;
+				event.offset = 0;
+				events.push_back(event);
+			}
+		}
+	} else if (errno != EAGAIN) {
+		std::cerr << "Error code: " << errno << std::endl;
+		std::cerr << std::strerror(errno) << std::endl;
+	}
+}
+
+
+void OSSInputEngine::post()
+{
+}
+
+
+bool OSSInputEngine::isFreewheeling() const
+{
+	return false;
+}
diff --git a/drumgizmo/input/ossmidi.h b/drumgizmo/input/ossmidi.h
new file mode 100644
index 0000000..c6abacd
--- /dev/null
+++ b/drumgizmo/input/ossmidi.h
@@ -0,0 +1,54 @@
+/* -*- Mode: c++ -*- */
+/***************************************************************************
+ *            ossmidi.h
+ *
+ *  Sun May 21 10:52:09 CEST 2017
+ *  Copyright 2017 Goran Mekić
+ *  meka@tilda.center
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DrumGizmo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#pragma once
+#include "audioinputenginemidi.h"
+
+
+class OSSInputEngine
+	: public AudioInputEngineMidi
+{
+public:
+	OSSInputEngine();
+	~OSSInputEngine();
+
+	// based on AudioInputEngine
+	bool init(const Instruments& instruments) override;
+	void setParm(const std::string& parm, const std::string& value) override;
+	bool start() override;
+	void stop() override;
+	void pre() override;
+	void run(size_t pos, size_t len, std::vector<event_t>& events) override;
+	void post() override;
+	bool isFreewheeling() const override;
+
+private:
+	int fd;
+	std::string dev;
+	std::size_t pos;
+	std::vector<event_t> events;
+	std::string midimap_file;
+};
diff --git a/man/drumgizmo.1 b/man/drumgizmo.1
index beeadf8..f91d33b 100644
--- a/man/drumgizmo.1
+++ b/man/drumgizmo.1
@@ -45,6 +45,12 @@ midimap=<midimapfile>
 .P
 loop=<true|false>
 
+\fBossmidi:\fR
+.P
+midimap=<midimapfile>
+.P
+dev=<device> (default '/dev/midi')
+
 \fBtest:\fR
 .P
 p=<hit_propability> (default 0.1)