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

diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index f2f347a076..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
@@ -26,12 +26,11 @@ using namespace ARDOUR;
 using namespace std;
 
 MidiPort::MidiPort (const std::string& name, Flags flags)
-        : Port (name, DataType::MIDI, 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 (1024 * 32);
+	_buffer = new MidiBuffer (raw_buffer_size(0));
 }
 
 MidiPort::~MidiPort()
@@ -39,13 +38,12 @@ MidiPort::~MidiPort()
 	delete _buffer;
 }
 
-
 void
 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));
 	}
@@ -62,34 +60,40 @@ 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 0
+                        if (ev.buffer[0] == 0xfe) {
+                                /* throw away active sensing */
+                                continue;
+                        }
+#endif                       
 			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;
 	}
@@ -97,9 +101,9 @@ MidiPort::get_midi_buffer (nframes_t nframes, nframes_t offset)
 	return *_buffer;
 }
 
-	
+
 void
-MidiPort::cycle_end (nframes_t nframes)
+MidiPort::cycle_end (nframes_t /*nframes*/)
 {
 	_has_been_mixed_down = false;
 }
@@ -111,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;
 
@@ -127,9 +143,27 @@ 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
+{
+	return jack_midi_max_event_size(jack_port_get_buffer(_jack_port, nframes));
+}
+