allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 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) {
// 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);