X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_port.cc;h=6858fd1cbd0e9941a32d768ccf86b180a5c3e399;hb=7ab8dbc2fe679d75821ca585dd7c2663f640116e;hp=23fff7c976291b59baeceecacf88a5dbbb31c8ae;hpb=d6637dad5a239d74038fdf9e5800e5108ba0c44f;p=ardour.git diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc index 23fff7c976..6858fd1cbd 100644 --- a/libs/ardour/midi_port.cc +++ b/libs/ardour/midi_port.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,19 +19,18 @@ #include #include -#include -#include +#include "ardour/midi_port.h" +#include "ardour/data_type.h" using namespace ARDOUR; using namespace std; -MidiPort::MidiPort (const std::string& name, Flags flags, bool ext, nframes_t capacity) - : Port (name, DataType::MIDI, flags, ext) +MidiPort::MidiPort (const std::string& name, Flags flags) + : Port (name, DataType::MIDI, flags) , _has_been_mixed_down (false) + , _resolve_in_process (false) { - // FIXME: size kludge (see BufferSet::ensure_buffers) - // Jack needs to tell us this - _buffer = new MidiBuffer (capacity * 8); + _buffer = new MidiBuffer (raw_buffer_size(0)); } MidiPort::~MidiPort() @@ -39,70 +38,62 @@ MidiPort::~MidiPort() delete _buffer; } - void -MidiPort::cycle_start (nframes_t nframes, nframes_t offset) +MidiPort::cycle_start (nframes_t nframes) { - if (external ()) { - _buffer->clear (); - assert (_buffer->size () == 0); + _buffer->clear (); + assert (_buffer->size () == 0); - if (sends_output ()) { - jack_midi_clear_buffer (jack_port_get_buffer (_jack_port, nframes)); - } + if (sends_output ()) { + jack_midi_clear_buffer (jack_port_get_buffer (_jack_port, nframes)); } } MidiBuffer & -MidiPort::get_midi_buffer( nframes_t nframes, nframes_t offset ) { - +MidiPort::get_midi_buffer (nframes_t nframes, nframes_t offset) +{ if (_has_been_mixed_down) { - return *_buffer; + return *_buffer; } if (receives_input ()) { - - if (external ()) { - - void* jack_buffer = jack_port_get_buffer (_jack_port, nframes); - const nframes_t event_count = jack_midi_get_event_count(jack_buffer); - assert (event_count < _buffer->capacity()); + void* jack_buffer = jack_port_get_buffer (_jack_port, nframes); + const nframes_t event_count = jack_midi_get_event_count(jack_buffer); - jack_midi_event_t ev; + assert (event_count < _buffer->capacity()); - for (nframes_t i = 0; i < event_count; ++i) { + /* suck all relevant MIDI events from the JACK MIDI port buffer + into our MidiBuffer + */ - jack_midi_event_get (&ev, jack_buffer, i); + nframes_t off = offset + _port_offset; - // i guess this should do but i leave it off to test the rest first. - //if (ev.time > offset && ev.time < offset+nframes) - _buffer->push_back (ev); - } + for (nframes_t i = 0; i < event_count; ++i) { - assert(_buffer->size() == event_count); + jack_midi_event_t ev; - if (nframes) { - _has_been_mixed_down = true; - } + jack_midi_event_get (&ev, jack_buffer, i); - if (!_connections.empty()) { - mixdown (nframes, offset, false); +#if 0 + if (ev.buffer[0] == 0xfe) { + /* throw away active sensing */ + continue; + } +#endif + if (ev.time > off && ev.time < off+nframes) { + _buffer->push_back (ev); } + } - } else { - - if (_connections.empty()) { - _buffer->silence (nframes, offset); - } else { - mixdown (nframes, offset, true); - } + if (nframes) { + _has_been_mixed_down = true; } } else { - _buffer->silence (nframes, offset); + _buffer->silence (nframes); } - + if (nframes) { _has_been_mixed_down = true; } @@ -110,69 +101,69 @@ MidiPort::get_midi_buffer( nframes_t nframes, nframes_t offset ) { return *_buffer; } - + void -MidiPort::cycle_end (nframes_t nframes, nframes_t offset) +MidiPort::cycle_end (nframes_t /*nframes*/) { -#if 0 - - if (external () && sends_output ()) { - /* FIXME: offset */ - - // We're an output - copy events from source buffer to Jack buffer - - void* jack_buffer = jack_port_get_buffer (_jack_port, nframes); - - jack_midi_clear_buffer (jack_buffer); - - for (MidiBuffer::iterator i = _buffer->begin(); i != _buffer->end(); ++i) { - const Evoral::Event& ev = *i; - - // event times should be frames, relative to cycle start - assert(ev.time() >= 0); - assert(ev.time() < nframes); - jack_midi_event_write (jack_buffer, (jack_nframes_t) ev.time(), ev.buffer(), ev.size()); - } - } -#endif + _has_been_mixed_down = false; +} +void +MidiPort::cycle_split () +{ _has_been_mixed_down = false; } void -MidiPort::flush_buffers (nframes_t nframes, nframes_t offset) +MidiPort::flush_buffers (nframes_t nframes, nframes64_t time, nframes_t offset) { - /* FIXME: offset */ - - if (external () && sends_output ()) { - + if (sends_output ()) { + void* jack_buffer = jack_port_get_buffer (_jack_port, nframes); + // Feed the data through the MidiStateTracker + bool did_loop; + + _midi_state_tracker.track (_buffer->begin(), _buffer->end(), did_loop); + + if (did_loop || _resolve_in_process) { + /* add necessary note offs */ + _midi_state_tracker.resolve_notes (*_buffer, time); + } + + _resolve_in_process = false; + for (MidiBuffer::iterator i = _buffer->begin(); i != _buffer->end(); ++i) { - const Evoral::Event& ev = *i; - // event times should be frames, relative to cycle start - assert(ev.time() >= 0); - assert(ev.time() < (nframes+offset)); - if (ev.time() >= offset) { - jack_midi_event_write (jack_buffer, (jack_nframes_t) ev.time(), ev.buffer(), ev.size()); - } + const Evoral::Event& ev = *i; + + // event times are in frames, relative to cycle start + + // XXX split cycle start or cycle start? + + assert(ev.time() < (nframes+offset+_port_offset)); + + if (ev.time() >= offset + _port_offset) { + if (jack_midi_event_write (jack_buffer, (jack_nframes_t) ev.time(), ev.buffer(), ev.size()) != 0) { + cerr << "write failed, drop flushed note off on the floor, time " << ev.time() << " > " << offset << " + " << _port_offset + << endl; + } + } else { + cerr << "drop flushed note off on the floor, time " << ev.time() << " > " << offset << " + " << _port_offset + << endl; + } } } } void -MidiPort::mixdown (nframes_t cnt, nframes_t offset, bool first_overwrite) +MidiPort::transport_stopped () { - set::const_iterator p = _connections.begin(); - - if (first_overwrite) { - _buffer->read_from ((dynamic_cast(*p))->get_midi_buffer (cnt, offset), cnt, offset); - p++; - } - - // XXX DAVE: this is just a guess + _resolve_in_process = true; +} - for (; p != _connections.end(); ++p) { - _buffer->merge (*_buffer, (dynamic_cast(*p))->get_midi_buffer (cnt, offset)); - } +size_t +MidiPort::raw_buffer_size (nframes_t nframes) const +{ + return jack_midi_max_event_size(jack_port_get_buffer(_jack_port, nframes)); } +