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_playlist.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_playlist.cc')
-rw-r--r-- | libs/ardour/midi_playlist.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 7139447a19..6105e6cfa2 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -124,8 +124,7 @@ struct RegionSortByLayer { /** Returns the number of frames in time duration read (eg could be large when 0 events are read) */ nframes_t -MidiPlaylist::read (MidiRingBuffer<MidiBuffer::TimeType>& dst, nframes_t start, - nframes_t dur, unsigned chan_n) +MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t dur, unsigned chan_n) { /* this function is never called from a realtime thread, so its OK to block (for short intervals). |