assert() to help find some possible causes of #2991. Fix some confusion with GTK...

[ardour.git] / libs / ardour / midi_port.cc

diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index b07eb84f1b227892b8ba5457d71a6c2a75a505e7..8dddc39fe3d2aca0af32e8c66788c1f05df43052 100644 (file)
--- 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
@@ -28,6 +28,7 @@ using namespace std;
 MidiPort::MidiPort (const std::string& name, Flags flags)
        : Port (name, DataType::MIDI, flags)
        , _has_been_mixed_down (false)
+       , _resolve_in_process (false)
 {
        _buffer = new MidiBuffer (raw_buffer_size(0));
 }
@@ -42,7 +43,7 @@ MidiPort::cycle_start (nframes_t nframes)
 {
        _buffer->clear ();
        assert (_buffer->size () == 0);
-       
+
        if (sends_output ()) {
                jack_midi_clear_buffer (jack_port_get_buffer (_jack_port, nframes));
        }
@@ -59,34 +60,34 @@ MidiPort::get_midi_buffer (nframes_t nframes, nframes_t offset)
 
                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());
 
                /* suck all relevant MIDI events from the JACK MIDI port buffer
                   into our MidiBuffer
                */
-               
+
                nframes_t off = offset + _port_offset;
 
                for (nframes_t i = 0; i < event_count; ++i) {
-                       
+
                        jack_midi_event_t ev;
 
                        jack_midi_event_get (&ev, jack_buffer, i);
-                       
+
                        if (ev.time > off && ev.time < off+nframes) {
                                _buffer->push_back (ev);
                        }
                }
-               
+
                if (nframes) {
                        _has_been_mixed_down = true;
                }
-               
+
        } else {
                _buffer->silence (nframes);
        }
-       
+
        if (nframes) {
                _has_been_mixed_down = true;
        }
@@ -94,7 +95,7 @@ MidiPort::get_midi_buffer (nframes_t nframes, nframes_t offset)
        return *_buffer;
 }
 
-       
+
 void
 MidiPort::cycle_end (nframes_t /*nframes*/)
 {
@@ -108,12 +109,24 @@ MidiPort::cycle_split ()
 }
 
 void
-MidiPort::flush_buffers (nframes_t nframes, nframes_t offset)
+MidiPort::flush_buffers (nframes_t nframes, nframes64_t time, nframes_t offset)
 {
        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<nframes_t>& ev = *i;
 
@@ -130,6 +143,12 @@ MidiPort::flush_buffers (nframes_t nframes, nframes_t offset)
        }
 }
 
+void
+MidiPort::transport_stopped ()
+{
+       _resolve_in_process = true;
+}
+
 size_t
 MidiPort::raw_buffer_size (nframes_t nframes) const
 {