smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 12:16:30 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Fix occasional MIDI read crash."

Browse source 
This reverts commit ec947ff8fd.
This commit is contained in:
David Robillard 2014-12-30 13:03:22 -05:00
parent 486d47db0e
commit a85827da1c
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/ardour/midi_source.cc
View file

@ -200,10 +200,11 @@ MidiSource::midi_read (const Lock& lm,
if (_model) { if (_model) {
// Find appropriate model iterator // 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) { if (_last_read_end == 0 || start != _last_read_end || !_model_iter_valid) {
// Cached iterator is invalid, search for the first event past start // 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; _last_read_end = start + cnt;
@ -229,8 +230,6 @@ MidiSource::midi_read (const Lock& lm,
break; break;
} }
} }
_model_iter = i;
_model_iter_valid = true;
return cnt; return cnt;
} else { } else {
return read_unlocked (lm, dst, source_start, start, cnt, tracker); return read_unlocked (lm, dst, source_start, start, cnt, tracker);