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/ardour/midi_region.h | |
| 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/ardour/midi_region.h')
| -rw-r--r-- | libs/ardour/ardour/midi_region.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 781f815ec5..356e418fc1 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -48,8 +48,6 @@ template<typename T> class MidiRingBuffer; class MidiRegion : public Region { public: - typedef double TimeType; - ~MidiRegion(); boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const; @@ -58,13 +56,13 @@ class MidiRegion : public Region virtual nframes64_t read (Sample*, nframes64_t pos, nframes64_t cnt, int channel) const { return 0; } virtual nframes64_t readable_length() const { return length(); } - nframes_t read_at (MidiRingBuffer<TimeType>& dst, + nframes_t read_at (MidiRingBuffer<nframes_t>& dst, nframes_t position, nframes_t dur, uint32_t chan_n = 0, NoteMode mode = Sustained) const; - nframes_t master_read_at (MidiRingBuffer<TimeType>& dst, + nframes_t master_read_at (MidiRingBuffer<nframes_t>& dst, nframes_t position, nframes_t dur, uint32_t chan_n = 0, @@ -108,7 +106,7 @@ class MidiRegion : public Region MidiRegion (const SourceList &, const XMLNode&); private: - nframes_t _read_at (const SourceList&, MidiRingBuffer<TimeType>& dst, + nframes_t _read_at (const SourceList&, MidiRingBuffer<nframes_t>& dst, nframes_t position, nframes_t dur, uint32_t chan_n = 0, |