diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-22 20:14:47 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-22 20:14:47 +0000 |
| commit | ed2beaffeef72ddce8ac628cced672851ec5668d (patch) | |
| tree | bdb318ac3bbfd06b8804e686db19b99ef5297d89 /libs/ardour/midi_source.cc | |
| parent | 2449a787c59b383912115421fdcd7ad4cca2a581 (diff) | |
main fix: when transport stops, clear per-region per-playlist note trackers even if there is no capture data to process; side effects: remove unused MidiBuffer::merge() and add DEBUG::MidiTrackers as well as more and better MIDI debug tracing facilities
git-svn-id: svn://localhost/ardour2/branches/3.0@11057 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_source.cc')
| -rw-r--r-- | libs/ardour/midi_source.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index bddb392221..ad07269b6c 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -199,8 +199,8 @@ MidiSource::midi_read (Evoral::EventSink<framepos_t>& dst, framepos_t source_sta BeatsFramesConverter converter(_session.tempo_map(), source_start); - DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("MidiSource::midi-read() sstart %1 start %2 cnt %3 tracker %4\n", - source_start, start, cnt, tracker)); + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("MidiSource::midi-read() %5 sstart %1 start %2 cnt %3 tracker %4\n", + source_start, start, cnt, tracker, name())); if (_model) { Evoral::Sequence<double>::const_iterator& i = _model_iter; @@ -210,6 +210,7 @@ MidiSource::midi_read (Evoral::EventSink<framepos_t>& dst, framepos_t source_sta DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("*** %1 search for relevant iterator for %1 / %2\n", _name, source_start, start)); for (i = _model->begin(0, false, filtered); i != _model->end(); ++i) { if (converter.to(i->time()) >= start) { + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("***\tstop iterator search @ %1\n", i->time())); break; } } |