From 5f6dacd2acd612c3ec7d069c853f808cfe9e3d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Sun, 21 May 2017 11:28:12 +0200 Subject: Add OSS MIDI input --- configure.ac | 1 + drumgizmo/Makefile.am | 6 ++++++ drumgizmo/drumgizmoc.cc | 1 + drumgizmo/enginefactory.cc | 9 +++++++++ drumgizmo/enginefactory.h | 4 ++++ drumgizmo/input/ossmidi.cc | 28 ++++++++++++++++++++++++++++ drumgizmo/input/ossmidi.h | 27 +++++++++++++++++++++++++++ man/drumgizmo.1 | 6 ++++++ 8 files changed, 82 insertions(+) create mode 100644 drumgizmo/input/ossmidi.cc create mode 100644 drumgizmo/input/ossmidi.h 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=, speed= (default 1.0),\n"; output << " track= (default -1, all tracks)\n"; output << " midimap=, loop=\n"; + output << " ossmidi: midimap=, dev= (default '/dev/dsp')\n"; output << " test: p= (default 0.1)\n"; output << " instr= (default -1, random instrument)\n"; output << " len= (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 EngineFactory::createInput(const std::string& return std::make_unique(*jack); } #endif +#ifdef HAVE_INPUT_OSS + if(name == "oss") + { + return std::make_unique(); + } +#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= .P loop= +\fBossmidi:\fR +.P +midimap= +.P +dev= (default '/dev/dsp') + \fBtest:\fR .P p= (default 0.1) -- cgit v1.2.3 From 5f293e314659f86e53870cf8666cda27512ba18e Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 5 Nov 2017 15:19:04 +0100 Subject: Fix predeclaration type. --- src/powerlist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/powerlist.h b/src/powerlist.h index b0938af..c00136a 100644 --- a/src/powerlist.h +++ b/src/powerlist.h @@ -31,7 +31,7 @@ #include "sample.h" class Random; -class Settings; +struct Settings; class PowerList { -- cgit v1.2.3 From 476a82d1c431c26f71286a2d904144bfa5468101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Fri, 29 Dec 2017 21:52:17 +0100 Subject: Enable OSS midi in --- configure.ac | 41 +++++++++++++++++++++++++++++++++++-- drumgizmo/input/ossmidi.cc | 50 ++++++++++++++++++++++++++++++++++++++++++++++ drumgizmo/input/ossmidi.h | 25 +++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7d67a22..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 + #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 diff --git a/drumgizmo/input/ossmidi.cc b/drumgizmo/input/ossmidi.cc index 16c2e2d..024415e 100644 --- a/drumgizmo/input/ossmidi.cc +++ b/drumgizmo/input/ossmidi.cc @@ -25,4 +25,54 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #include "ossmidi.h" +#include + + +OSSInputEngine::OSSInputEngine() +{ +} + +OSSInputEngine::~OSSInputEngine() +{ +} + +bool OSSInputEngine::init(const Instruments& instruments) +{ + return true; +} + +void OSSInputEngine::setParm(const std::string& parm, const std::string& value) +{ + if(parm == "dev") + { + dev = value; + std::cout << "dev = " << dev << std::endl; + } +} + +bool OSSInputEngine::start() +{ + return true; +} + +void OSSInputEngine::stop() +{ +} + +void OSSInputEngine::pre() +{ +} + +void OSSInputEngine::run(size_t pos, size_t len, std::vector& events) +{ +} + +void OSSInputEngine::post() +{ +} + +bool OSSInputEngine::isFreewheeling() const +{ + return false; +} diff --git a/drumgizmo/input/ossmidi.h b/drumgizmo/input/ossmidi.h index a5f64b6..41cfb2b 100644 --- a/drumgizmo/input/ossmidi.h +++ b/drumgizmo/input/ossmidi.h @@ -25,3 +25,28 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #pragma once +#include + +class OSSInputEngine + : public AudioInputEngine +{ +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& events) override; + void post() override; + bool isFreewheeling() const override; + +private: + std::string dev; + int fd; + std::size_t pos; + std::vector events; +}; -- cgit v1.2.3 From a6343737453b34335a7a5494c8ac6b393d15604c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Fri, 29 Dec 2017 23:36:55 +0100 Subject: Open midi device in non-blocking mode --- drumgizmo/drumgizmoc.cc | 2 +- drumgizmo/enginefactory.cc | 6 +++--- drumgizmo/enginefactory.h | 5 +++++ drumgizmo/input/ossmidi.cc | 45 +++++++++++++++++++++++++++++++++++++++++++-- drumgizmo/input/ossmidi.h | 8 +++++--- man/drumgizmo.1 | 2 +- 6 files changed, 58 insertions(+), 10 deletions(-) diff --git a/drumgizmo/drumgizmoc.cc b/drumgizmo/drumgizmoc.cc index 8bfe2f4..6a2458b 100644 --- a/drumgizmo/drumgizmoc.cc +++ b/drumgizmo/drumgizmoc.cc @@ -103,7 +103,7 @@ static std::string usage(std::string name) output << " midifile: file=, speed= (default 1.0),\n"; output << " track= (default -1, all tracks)\n"; output << " midimap=, loop=\n"; - output << " ossmidi: midimap=, dev= (default '/dev/dsp')\n"; + output << " ossmidi: midimap=, dev= (default '/dev/midi')\n"; output << " test: p= (default 0.1)\n"; output << " instr= (default -1, random instrument)\n"; output << " len= (default -1, forever)\n"; 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 EngineFactory::createInput(const std::string& return std::make_unique(*jack); } #endif -#ifdef HAVE_INPUT_OSS - if(name == "oss") +#ifdef HAVE_INPUT_OSSMIDI + if(name == "ossmidi") { - return std::make_unique(); + return std::make_unique(); } #endif diff --git a/drumgizmo/enginefactory.h b/drumgizmo/enginefactory.h index 327c326..0b37c6e 100644 --- a/drumgizmo/enginefactory.h +++ b/drumgizmo/enginefactory.h @@ -78,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 index 024415e..56d77f0 100644 --- a/drumgizmo/input/ossmidi.cc +++ b/drumgizmo/input/ossmidi.cc @@ -25,31 +25,55 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #include "ossmidi.h" +#include +#include +#include +#include #include 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; - std::cout << "dev = " << dev << std::endl; + } + else if(parm == "midimap") + { + midimap_file = value; } } + bool OSSInputEngine::start() { return true; @@ -59,20 +83,37 @@ void OSSInputEngine::stop() { } + void OSSInputEngine::pre() { } + void OSSInputEngine::run(size_t pos, size_t len, std::vector& events) { + int l; + unsigned char buf[128]; + if ((l = read (fd, buf, sizeof (buf))) != -1) + { + for (int i = 0; i < l; i++) + { + if (buf[i] & 0x80) /* Status byte */ + { + std::cout << std::endl; + } + std::cout << buf[i]; + } + std::cout << std::flush; + } } + void OSSInputEngine::post() { } + bool OSSInputEngine::isFreewheeling() const { return false; } - diff --git a/drumgizmo/input/ossmidi.h b/drumgizmo/input/ossmidi.h index 41cfb2b..c6abacd 100644 --- a/drumgizmo/input/ossmidi.h +++ b/drumgizmo/input/ossmidi.h @@ -25,10 +25,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #pragma once -#include +#include "audioinputenginemidi.h" + class OSSInputEngine - : public AudioInputEngine + : public AudioInputEngineMidi { public: OSSInputEngine(); @@ -45,8 +46,9 @@ public: bool isFreewheeling() const override; private: - std::string dev; int fd; + std::string dev; std::size_t pos; std::vector events; + std::string midimap_file; }; diff --git a/man/drumgizmo.1 b/man/drumgizmo.1 index 9fac8a8..f91d33b 100644 --- a/man/drumgizmo.1 +++ b/man/drumgizmo.1 @@ -49,7 +49,7 @@ loop= .P midimap= .P -dev= (default '/dev/dsp') +dev= (default '/dev/midi') \fBtest:\fR .P -- cgit v1.2.3 From 5bdf69cb2748ce9c83de3d9d45bea67d096fe04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Sat, 30 Dec 2017 00:45:28 +0100 Subject: Get note and velocity --- drumgizmo/input/ossmidi.cc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drumgizmo/input/ossmidi.cc b/drumgizmo/input/ossmidi.cc index 56d77f0..4473557 100644 --- a/drumgizmo/input/ossmidi.cc +++ b/drumgizmo/input/ossmidi.cc @@ -32,6 +32,10 @@ #include +static int const NOTE_ON = 0x90; +static int const NOTE_MASK = 0xF0; + + OSSInputEngine::OSSInputEngine() : AudioInputEngineMidi{} , dev{"/dev/midi"} @@ -95,15 +99,15 @@ void OSSInputEngine::run(size_t pos, size_t len, std::vector& events) unsigned char buf[128]; if ((l = read (fd, buf, sizeof (buf))) != -1) { - for (int i = 0; i < l; i++) - { - if (buf[i] & 0x80) /* Status byte */ - { - std::cout << std::endl; - } - std::cout << buf[i]; + int masked_note = buf[0] & NOTE_MASK; + if (masked_note == NOTE_ON) { + int note = buf[1]; + int velocity = buf[2]; + std::cout << "note = " << note << ", velocity = " << velocity << std::endl; } - std::cout << std::flush; + } else if (errno != EAGAIN) { + std::cerr << "Error code: " << errno << std::endl; + std::cerr << std::strerror(errno) << std::endl; } } -- cgit v1.2.3 From 17220d8e06998160ba0f8678649e62872fda9727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Sat, 30 Dec 2017 01:14:35 +0100 Subject: Hardcode instrument, otherwise play notes --- drumgizmo/input/ossmidi.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drumgizmo/input/ossmidi.cc b/drumgizmo/input/ossmidi.cc index 4473557..03e8481 100644 --- a/drumgizmo/input/ossmidi.cc +++ b/drumgizmo/input/ossmidi.cc @@ -90,6 +90,7 @@ void OSSInputEngine::stop() void OSSInputEngine::pre() { + events.clear(); } @@ -103,6 +104,12 @@ void OSSInputEngine::run(size_t pos, size_t len, std::vector& events) if (masked_note == NOTE_ON) { int note = buf[1]; int velocity = buf[2]; + event_t event; + event.type = 0; + event.offset = 0; + event.velocity = velocity / 127.0; + event.instrument = 12; + events.push_back(event); std::cout << "note = " << note << ", velocity = " << velocity << std::endl; } } else if (errno != EAGAIN) { -- cgit v1.2.3 From f0f2899bc811fcd2fcbb116198ac2eab241dc254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Sat, 30 Dec 2017 01:20:48 +0100 Subject: Calculate instrument properly --- drumgizmo/input/ossmidi.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drumgizmo/input/ossmidi.cc b/drumgizmo/input/ossmidi.cc index 03e8481..c504781 100644 --- a/drumgizmo/input/ossmidi.cc +++ b/drumgizmo/input/ossmidi.cc @@ -107,8 +107,12 @@ void OSSInputEngine::run(size_t pos, size_t len, std::vector& events) event_t event; event.type = 0; event.offset = 0; - event.velocity = velocity / 127.0; - event.instrument = 12; + int i = mmap.lookup(note); + if(i != -1) + { + event.instrument = i; + event.velocity = velocity / 127.0; + } events.push_back(event); std::cout << "note = " << note << ", velocity = " << velocity << std::endl; } -- cgit v1.2.3 From 74f18e24e100b487184e3dd7a57fe1609f645654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Sat, 30 Dec 2017 01:52:00 +0100 Subject: Remove extra code --- drumgizmo/input/ossmidi.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drumgizmo/input/ossmidi.cc b/drumgizmo/input/ossmidi.cc index c504781..325a83d 100644 --- a/drumgizmo/input/ossmidi.cc +++ b/drumgizmo/input/ossmidi.cc @@ -105,16 +105,14 @@ void OSSInputEngine::run(size_t pos, size_t len, std::vector& events) int note = buf[1]; int velocity = buf[2]; event_t event; - event.type = 0; - event.offset = 0; - int i = mmap.lookup(note); - if(i != -1) + event.instrument = mmap.lookup(note); + if(event.instrument != -1) { - event.instrument = i; event.velocity = velocity / 127.0; + event.type = 0; + event.offset = 0; + events.push_back(event); } - events.push_back(event); - std::cout << "note = " << note << ", velocity = " << velocity << std::endl; } } else if (errno != EAGAIN) { std::cerr << "Error code: " << errno << std::endl; -- cgit v1.2.3