X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_port.cc;h=6858fd1cbd0e9941a32d768ccf86b180a5c3e399;hb=7ab8dbc2fe679d75821ca585dd7c2663f640116e;hp=880c1b5474b1e3e0b9d7284e681c628f971ec3e2;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index 880c1b5474..6858fd1cbd 100644
--- a/libs/ardour/midi_port.cc
+++ b/libs/ardour/midi_port.cc
@@ -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));
 }
@@ -74,6 +75,12 @@ MidiPort::get_midi_buffer (nframes_t nframes, nframes_t offset)
 
 			jack_midi_event_get (&ev, jack_buffer, i);
 
+#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);
 			}
@@ -108,12 +115,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;
 
@@ -124,12 +143,24 @@ MidiPort::flush_buffers (nframes_t nframes, nframes_t offset)
 			assert(ev.time() < (nframes+offset+_port_offset));
 
 			if (ev.time() >= offset + _port_offset) {
-				jack_midi_event_write (jack_buffer, (jack_nframes_t) ev.time(), ev.buffer(), ev.size());
-			}
+				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::transport_stopped ()
+{
+	_resolve_in_process = true;
+}
+
 size_t
 MidiPort::raw_buffer_size (nframes_t nframes) const
 {