diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
| commit | 73192bc1a7ea55fa1864dc3826845b15c00dd2ec (patch) | |
| tree | c0039f3f5a848aed6e880abf11519dad855fa899 /libs/ardour/ardour/midi_source.h | |
| parent | 74b4a3c77b08dc1e58274875604eb73e8492fa93 (diff) | |
Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/midi_source.h')
| -rw-r--r-- | libs/ardour/ardour/midi_source.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 0c2759b96d..e40ccff291 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -58,19 +58,19 @@ class MidiSource : virtual public Source * \param cnt Length of range to be read (in audio frames) * \param tracker an optional pointer to MidiStateTracker object, for note on/off tracking */ - virtual nframes_t midi_read (Evoral::EventSink<nframes_t>& dst, - framepos_t source_start, - framepos_t start, nframes_t cnt, - MidiStateTracker*, - std::set<Evoral::Parameter> const &) const; + virtual framecnt_t midi_read (Evoral::EventSink<framepos_t>& dst, + framepos_t source_start, + framepos_t start, framecnt_t cnt, + MidiStateTracker*, + std::set<Evoral::Parameter> const &) const; - virtual nframes_t midi_write (MidiRingBuffer<nframes_t>& src, - framepos_t source_start, - nframes_t cnt); + virtual framecnt_t midi_write (MidiRingBuffer<framepos_t>& src, + framepos_t source_start, + framecnt_t cnt); virtual void append_event_unlocked_beats(const Evoral::Event<Evoral::MusicalTime>& ev) = 0; - virtual void append_event_unlocked_frames(const Evoral::Event<nframes_t>& ev, + virtual void append_event_unlocked_frames(const Evoral::Event<framepos_t>& ev, framepos_t source_start) = 0; virtual bool empty () const; @@ -130,14 +130,14 @@ class MidiSource : virtual public Source protected: virtual void flush_midi() = 0; - virtual nframes_t read_unlocked (Evoral::EventSink<nframes_t>& dst, - framepos_t position, - framepos_t start, nframes_t cnt, - MidiStateTracker* tracker) const = 0; + virtual framepos_t read_unlocked (Evoral::EventSink<framepos_t>& dst, + framepos_t position, + framepos_t start, framecnt_t cnt, + MidiStateTracker* tracker) const = 0; - virtual nframes_t write_unlocked (MidiRingBuffer<nframes_t>& dst, - framepos_t position, - nframes_t cnt) = 0; + virtual framepos_t write_unlocked (MidiRingBuffer<framepos_t>& dst, + framepos_t position, + framecnt_t cnt) = 0; std::string _captured_for; mutable uint32_t _read_data_count; ///< modified in read() |