diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 18:20:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 18:20:37 +0000 |
| commit | ede4ecbb00ecc866c502454c81e711baea780ccd (patch) | |
| tree | d4a05e59cc96651ddf0eeab929f58fb7a7019fb0 /libs/ardour/ardour/smf_source.h | |
| parent | 10bdce85a0e7381d1b5db38e3640600c6fd3ec79 (diff) | |
megaopus patch #2 for today: remove nframes64_t and sframes_t from source
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/smf_source.h')
| -rw-r--r-- | libs/ardour/ardour/smf_source.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index 165e03e483..bd1428a129 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -52,9 +52,9 @@ public: bool set_name (const std::string& newname) { return (set_source_name(newname, false) == 0); } void append_event_unlocked_beats (const Evoral::Event<Evoral::MusicalTime>& ev); - void append_event_unlocked_frames (const Evoral::Event<nframes_t>& ev, sframes_t source_start); + void append_event_unlocked_frames (const Evoral::Event<nframes_t>& ev, framepos_t source_start); - void mark_streaming_midi_write_started (NoteMode mode, sframes_t start_time); + void mark_streaming_midi_write_started (NoteMode mode, framepos_t start_time); void mark_streaming_write_completed (); XMLNode& get_state (); @@ -74,21 +74,21 @@ public: private: nframes_t read_unlocked (Evoral::EventSink<nframes_t>& dst, - sframes_t position, - sframes_t start, + framepos_t position, + framepos_t start, nframes_t cnt, MidiStateTracker* tracker) const; nframes_t write_unlocked (MidiRingBuffer<nframes_t>& src, - sframes_t position, + framepos_t position, nframes_t cnt); double _last_ev_time_beats; - sframes_t _last_ev_time_frames; + framepos_t _last_ev_time_frames; /** end time (start + duration) of last call to read_unlocked */ - mutable sframes_t _smf_last_read_end; + mutable framepos_t _smf_last_read_end; /** time (in SMF ticks, 1 tick per _ppqn) of the last event read by read_unlocked */ - mutable sframes_t _smf_last_read_time; + mutable framepos_t _smf_last_read_time; }; }; /* namespace ARDOUR */ |