From 5cc5fb8de49d4c570f5cc7f1731f99b99018965c Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 16 Sep 2009 17:53:04 +0000
Subject: [PATCH] remove existing attempts at optimizing MIDI event reading, to
 try to fix bugs that may be connected with it

git-svn-id: svn://localhost/ardour2/branches/3.0@5667 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/midi_source.cc | 4 ++--
 libs/ardour/smf_source.cc  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 4da2dbb845..28184f874e 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -138,13 +138,13 @@ MidiSource::midi_read (MidiRingBuffer<nframes_t>& dst, sframes_t source_start,
 
 		Evoral::Sequence<double>::const_iterator& i = _model_iter;
 
-		if (_last_read_end == 0 || start != _last_read_end || !i.valid()) {
+//		if (_last_read_end == 0 || start != _last_read_end || !i.valid()) {
 			for (i = _model->begin(); i != _model->end(); ++i) {
 				if (BEATS_TO_FRAMES(i->time()) >= start) {
 					break;
 				}
 			}
-		}
+//		}
 
 		_last_read_end = start + cnt;
 
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 7fbc8b0287..65759e7037 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -118,7 +118,7 @@ SMFSource::read_unlocked (MidiRingBuffer<nframes_t>& destination, sframes_t sour
 
 	const uint64_t start_ticks = (uint64_t)(converter.from(start) * ppqn());
 
-	if (_smf_last_read_end == 0 || start != _smf_last_read_end) {
+//	if (_smf_last_read_end == 0 || start != _smf_last_read_end) {
 		//cerr << "SMFSource::read_unlocked seeking to " << start << endl;
 		Evoral::SMF::seek_to_start();
 		while (time < start_ticks) {
@@ -129,7 +129,7 @@ SMFSource::read_unlocked (MidiRingBuffer<nframes_t>& destination, sframes_t sour
 			}
 			time += ev_delta_t; // accumulate delta time
 		}
-	}
+//	}
 	
 	_smf_last_read_end = start + duration;