diff options
| author | David Robillard <d@drobilla.net> | 2009-02-15 01:24:26 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-15 01:24:26 +0000 |
| commit | 5a48f99f72c2e2f3ed313e00446dfdaa05dc5d56 (patch) | |
| tree | c67b0c1a4da8dde5146e21b6699d15f389041e68 /libs/ardour/midi_source.cc | |
| parent | aefa9f0938d287c497878a6e29ce2f9e0bade7c5 (diff) | |
Use nframes_t for timestamps of real (jack) time MIDI events (i.e. in MidiBuffer and MidiRingBuffer).
Use iterator interface of Sequence to read events in a MIDISource rather than Sequence::read, avoiding timestamp confusion.
Disable no longer useful Sequence::read.
git-svn-id: svn://localhost/ardour2/branches/3.0@4570 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_source.cc')
| -rw-r--r-- | libs/ardour/midi_source.cc | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 7adb0f177b..4307749e4a 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -51,6 +51,8 @@ MidiSource::MidiSource (Session& s, string name) , _timeline_position(0) , _model(new MidiModel(this)) , _writing (false) + , _model_iter(*_model.get(), 0.0) + , _last_read_end(0) { _read_data_count = 0; _write_data_count = 0; @@ -61,6 +63,8 @@ MidiSource::MidiSource (Session& s, const XMLNode& node) , _timeline_position(0) , _model(new MidiModel(this)) , _writing (false) + , _model_iter(*_model.get(), 0.0) + , _last_read_end(0) { _read_data_count = 0; _write_data_count = 0; @@ -101,13 +105,29 @@ MidiSource::set_state (const XMLNode& node) } nframes_t -MidiSource::midi_read (MidiRingBuffer<MidiBuffer::TimeType>& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const +MidiSource::midi_read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const { Glib::Mutex::Lock lm (_lock); if (_model) { - //const size_t n_events = - _model->read(dst, start, cnt, stamp_offset - negative_stamp_offset); - //cout << "Read " << n_events << " events from model." << endl; + Evoral::Sequence<double>::const_iterator& i = _model_iter; + + if (_last_read_end == 0 || start != _last_read_end) { + i = _model->begin(); + cerr << "MidiSource::midi_read seeking to " << start << endl; + while (i != _model->end() && i->time() < start) + ++i; + } + + _last_read_end = start + cnt; + + if (i == _model->end()) { + return cnt; + } + + while (i->time() < start + cnt && i != _model->end()) { + dst.write(i->time(), i->event_type(), i->size(), i->buffer()); + ++i; + } return cnt; } else { return read_unlocked (dst, start, cnt, stamp_offset, negative_stamp_offset); @@ -115,7 +135,7 @@ MidiSource::midi_read (MidiRingBuffer<MidiBuffer::TimeType>& dst, nframes_t star } nframes_t -MidiSource::midi_write (MidiRingBuffer<MidiBuffer::TimeType>& dst, nframes_t cnt) +MidiSource::midi_write (MidiRingBuffer<nframes_t>& dst, nframes_t cnt) { Glib::Mutex::Lock lm (_lock); return write_unlocked (dst, cnt); |