Add OSS MIDI input

8 files changed, 82 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 5de59b9..7d67a22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -481,6 +481,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..8bfe2f4 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/dsp')\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..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
 
diff --git a/drumgizmo/enginefactory.h b/drumgizmo/enginefactory.h
index 2a1457e..327c326 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
diff --git a/drumgizmo/input/ossmidi.cc b/drumgizmo/input/ossmidi.cc
new file mode 100644
index 0000000..16c2e2d
--- /dev/null
+++ b/drumgizmo/input/ossmidi.cc
@@ -0,0 +1,28 @@
+/* -*- 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"
+
diff --git a/drumgizmo/input/ossmidi.h b/drumgizmo/input/ossmidi.h
new file mode 100644
index 0000000..a5f64b6
--- /dev/null
+++ b/drumgizmo/input/ossmidi.h
@@ -0,0 +1,27 @@
+/* -*- 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
diff --git a/man/drumgizmo.1 b/man/drumgizmo.1
index beeadf8..9fac8a8 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/dsp')
+
 \fBtest:\fR
 .P
 p=<hit_propability> (default 0.1)