Playback from MIDI model, playback of clicked-in events.

Note the diskstream chunk size affects reading of clicked-in, so you may need to seek away and back again to have new events read (this will be fixed).


git-svn-id: svn://localhost/ardour2/trunk@2183 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 1 deletions

diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc
index 5376886a5d..5b7c789ba0 100644
--- a/libs/ardour/midi_buffer.cc
+++ b/libs/ardour/midi_buffer.cc
@@ -91,7 +91,10 @@ MidiBuffer::read_from(const Buffer& src, nframes_t nframes, nframes_t offset)
 	for (size_t i=0; i < src.size(); ++i) {
 		const MidiEvent& ev = msrc[i];
 		if (ev.time >= offset && ev.time < offset+nframes) {
+			//cerr << "MidiBuffer::read_from got event, " << ev.time << endl;
 			push_back(ev);
+		} else {
+			//cerr << "MidiBuffer event out of range, " << ev.time << endl;
 		}
 	}
 
@@ -166,7 +169,7 @@ MidiBuffer::push_back(const jack_midi_event_t& ev)
 Byte*
 MidiBuffer::reserve(double time, size_t size)
 {
-	assert(size < MAX_EVENT_SIZE);
+	assert(size <= MAX_EVENT_SIZE);
 
 	if (_size == _capacity)
 		return NULL;