diff options
author | David Robillard <d@drobilla.net> | 2015-01-07 00:12:07 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2015-01-07 00:12:07 -0500 |
commit | 2a251b457069ffb4b744fbd0dd7aca7acb31f381 (patch) | |
tree | 4311e63fe7ef1b5d7a5b841a4dd0eb7b26b324a7 /libs/ardour/ardour/smf_source.h | |
parent | 4d202d9157bef5b6325fe54b7874080952f86a37 (diff) |
MusicalTime => Beats.
Diffstat (limited to 'libs/ardour/ardour/smf_source.h')
-rw-r--r-- | libs/ardour/ardour/smf_source.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index d93fdb8506..29c6403694 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -51,14 +51,14 @@ public: return safe_midi_file_extension(path); } - void append_event_beats (const Lock& lock, const Evoral::Event<Evoral::MusicalTime>& ev); + void append_event_beats (const Lock& lock, const Evoral::Event<Evoral::Beats>& ev); void append_event_frames (const Lock& lock, const Evoral::Event<framepos_t>& ev, framepos_t source_start); void mark_streaming_midi_write_started (const Lock& lock, NoteMode mode); void mark_streaming_write_completed (const Lock& lock); void mark_midi_streaming_write_completed (const Lock& lock, - Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption, - Evoral::MusicalTime when = Evoral::MusicalTime()); + Evoral::Sequence<Evoral::Beats>::StuckNoteOption, + Evoral::Beats when = Evoral::Beats()); XMLNode& get_state (); int set_state (const XMLNode&, int version); @@ -77,7 +77,7 @@ public: private: bool _open; - Evoral::MusicalTime _last_ev_time_beats; + Evoral::Beats _last_ev_time_beats; framepos_t _last_ev_time_frames; /** end time (start + duration) of last call to read_unlocked */ mutable framepos_t _smf_last_read_end; |