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 --- drumgizmo/input/ossmidi.cc | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 drumgizmo/input/ossmidi.cc (limited to 'drumgizmo/input/ossmidi.cc') 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" + -- 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 --- drumgizmo/input/ossmidi.cc | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'drumgizmo/input/ossmidi.cc') 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; +} -- 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/input/ossmidi.cc | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) (limited to 'drumgizmo/input/ossmidi.cc') 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; } - -- 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(-) (limited to 'drumgizmo/input/ossmidi.cc') 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(+) (limited to 'drumgizmo/input/ossmidi.cc') 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(-) (limited to 'drumgizmo/input/ossmidi.cc') 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(-) (limited to 'drumgizmo/input/ossmidi.cc') 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