diff options
author | David Robillard <d@drobilla.net> | 2014-12-30 13:03:22 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-12-30 13:03:22 -0500 |
commit | a85827da1c9def35bcb4e43b657cdf0b1d728181 (patch) | |
tree | b5df00d0f349a9dff04076dfc596703d6c85e13c /libs/ardour/midi_source.cc | |
parent | 486d47db0e5c2cc6ac307126155baa20bf8d89a7 (diff) |
Revert "Fix occasional MIDI read crash."
This reverts commit ec947ff8fd2cf229284f757b8bd6b0f96cbd6383.
Diffstat (limited to 'libs/ardour/midi_source.cc')
-rw-r--r-- | libs/ardour/midi_source.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index c63a262a53..1b1cf20c68 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -200,10 +200,11 @@ MidiSource::midi_read (const Lock& lm, if (_model) { // Find appropriate model iterator - Evoral::Sequence<Evoral::MusicalTime>::const_iterator i = _model_iter; + Evoral::Sequence<Evoral::MusicalTime>::const_iterator& i = _model_iter; if (_last_read_end == 0 || start != _last_read_end || !_model_iter_valid) { // Cached iterator is invalid, search for the first event past start - i = _model->begin(converter.from(start), false, filtered); + i = _model->begin(converter.from(start), false, filtered); + _model_iter_valid = true; } _last_read_end = start + cnt; @@ -229,8 +230,6 @@ MidiSource::midi_read (const Lock& lm, break; } } - _model_iter = i; - _model_iter_valid = true; return cnt; } else { return read_unlocked (lm, dst, source_start, start, cnt, tracker); |