diff options
Diffstat (limited to 'libs/ardour/ardour/note_fixer.h')
| -rw-r--r-- | libs/ardour/ardour/note_fixer.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/ardour/note_fixer.h b/libs/ardour/ardour/note_fixer.h index 09f45cdec7..34582497d0 100644 --- a/libs/ardour/ardour/note_fixer.h +++ b/libs/ardour/ardour/note_fixer.h @@ -33,7 +33,7 @@ namespace Evoral { template<typename Time> class EventSink; } namespace ARDOUR { -class BeatsFramesConverter; +class BeatsSamplesConverter; class MidiStateTracker; class TempoMap; @@ -65,8 +65,8 @@ public: */ void prepare(TempoMap& tempo_map, const MidiModel::NoteDiffCommand* cmd, - framepos_t origin, - framepos_t pos, + samplepos_t origin, + samplepos_t pos, std::set< boost::weak_ptr<Note> >& active_notes); /** Emit any pending edit compensation events. @@ -76,21 +76,21 @@ public: * the read block immediately following any calls to prepare(). * @param tracker Tracker to update with emitted events. */ - void emit(Evoral::EventSink<framepos_t>& dst, - framepos_t pos, + void emit(Evoral::EventSink<samplepos_t>& dst, + samplepos_t pos, MidiStateTracker& tracker); private: - typedef Evoral::Event<framepos_t> Event; + typedef Evoral::Event<samplepos_t> Event; typedef std::list<Event*> Events; - /** Copy a beats event to a frames event with the given time stamp. */ - Event* copy_event(framepos_t time, const Evoral::Event<Evoral::Beats>& ev); + /** Copy a beats event to a samples event with the given time stamp. */ + Event* copy_event(samplepos_t time, const Evoral::Event<Evoral::Beats>& ev); /** Return true iff `note` is active at `pos`. */ - bool note_is_active(const BeatsFramesConverter& converter, + bool note_is_active(const BeatsSamplesConverter& converter, boost::shared_ptr<Note> note, - framepos_t pos); + samplepos_t pos); Events _events; }; |