Date: Fri, 12 May 2017 10:29:27 +0200 From: Hans Petter Selasky <hps@selasky.org> To: =?UTF-8?Q?Goran_Meki=c4=87?= <meka@tilda.center> Cc: "freebsd-multimedia@freebsd.org" <freebsd-multimedia@FreeBSD.org> Subject: Re: Drumgizmo support Message-ID: <804c5840-7b0c-eb56-d47b-c6989401ba9d@selasky.org> In-Reply-To: <20170512080919.bvosxnferttadmen@hal9000.meka.no-ip.org> References: <20170502093135.vofac44yvpa7xo66@hal9000.meka.no-ip.org> <cd99d85c-d917-ff97-2643-9cc6b5f32349@selasky.org> <60d3bc73-dbb3-d701-4b24-061a16ec68d7@selasky.org> <20170512080919.bvosxnferttadmen@hal9000.meka.no-ip.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------6074ADB8A27FBE25B0DD49CC Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit On 05/12/17 10:09, Goran Mekić wrote: > On Fri, May 12, 2017 at 09:59:04AM +0200, Hans Petter Selasky wrote: >> On 05/02/17 11:43, Hans Petter Selasky wrote: >> Hi, >> >> Tried installing the latest .shar and the sommerhack-kit, but the program >> just exists when trying to use it with jack: >> >> jackd -r -d oss >> >> drumgizmo -i jackmidi -I midimap=sommerhack-kit/Midimap_lpd8.xml -o >> jackaudio sommerhack-kit/sommerhack-kit.xml >> >> Looking at the code there appears to be some missing code in main() which >> simply return 0 before the output engine is created. > > That is totally my bug if you're think about > http://cgit.drumgizmo.org/drumgizmo/commit/?id=fc8d2e31e79782e219259a1ab6782a39edc18516 > It's fixed and new version should be released on Sunday afternoon. > >> How did you test it? Is there a git available somewhere to submit patches. I >> also found some MIDI parsing bugs. > > First of all, thank you for the interest. Second, git is at http://git.drumgizmo.org/drumgizmo.git/. Would you consider format-patch as apropriate for the patch? See attachment. --HPS --------------6074ADB8A27FBE25B0DD49CC Content-Type: text/x-patch; name="0001-Use-correct-MIDI-note-ON-mask.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Use-correct-MIDI-note-ON-mask.patch" >From b42e043183fba91dc7fd6940a9c872c8372da8ad Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky <hps@selasky.org> Date: Fri, 12 May 2017 10:28:23 +0200 Subject: [PATCH] Use correct MIDI note ON mask. Signed-off-by: Hans Petter Selasky <hps@selasky.org> --- drumgizmo/input/jackmidi.cc | 3 ++- drumgizmo/input/midifile.cc | 3 ++- test/dgreftest/midiinputengine.cc | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drumgizmo/input/jackmidi.cc b/drumgizmo/input/jackmidi.cc index 7c5cf1c..8f8d5cb 100644 --- a/drumgizmo/input/jackmidi.cc +++ b/drumgizmo/input/jackmidi.cc @@ -31,6 +31,7 @@ #include "jackmidi.h" static int const NOTE_ON = 0x90; +static int const NOTE_MASK = 0xF0; JackMidiInputEngine::JackMidiInputEngine(JackClient& client) : AudioInputEngineMidi{} @@ -122,7 +123,7 @@ void JackMidiInputEngine::process(jack_nframes_t num_frames) { continue; } - if((event.buffer[0] & NOTE_ON) != NOTE_ON) + if((event.buffer[0] & NOTE_MASK) != NOTE_ON) { continue; } diff --git a/drumgizmo/input/midifile.cc b/drumgizmo/input/midifile.cc index 89ffa6b..c3bd8ae 100644 --- a/drumgizmo/input/midifile.cc +++ b/drumgizmo/input/midifile.cc @@ -30,6 +30,7 @@ #include "midifile.h" static int const NOTE_ON = 0x90; +static int const NOTE_MASK = 0xF0; MidifileInputEngine::MidifileInputEngine() : AudioInputEngineMidi{} @@ -147,7 +148,7 @@ void MidifileInputEngine::run(size_t pos, size_t len, std::vector<event_t>& even if(!smf_event_is_metadata(current_event)) { if((current_event->midi_buffer_length == 3) && - ((current_event->midi_buffer[0] & NOTE_ON) == NOTE_ON) && + ((current_event->midi_buffer[0] & NOTE_MASK) == NOTE_ON) && (track == -1 || current_event->track_number == track) && current_event->midi_buffer[2] > 0) { diff --git a/test/dgreftest/midiinputengine.cc b/test/dgreftest/midiinputengine.cc index aba726f..84f4cc6 100644 --- a/test/dgreftest/midiinputengine.cc +++ b/test/dgreftest/midiinputengine.cc @@ -29,6 +29,7 @@ #include <iostream> static int const NOTE_ON = 0x90; +static int const NOTE_MASK = 0xF0; MidifileInputEngine::MidifileInputEngine() : AudioInputEngineMidi{} @@ -147,7 +148,7 @@ void MidifileInputEngine::run(size_t pos, size_t len, std::vector<event_t>& even if(!smf_event_is_metadata(current_event)) { if((current_event->midi_buffer_length == 3) && - ((current_event->midi_buffer[0] & NOTE_ON) == NOTE_ON) && + ((current_event->midi_buffer[0] & NOTE_MASK) == NOTE_ON) && (track == -1 || current_event->track_number == track) && current_event->midi_buffer[2] > 0) { -- 2.12.1 --------------6074ADB8A27FBE25B0DD49CC--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?804c5840-7b0c-eb56-d47b-c6989401ba9d>