diff options
author | nick_m <mainsbridge@gmail.com> | 2016-10-10 03:39:57 +1100 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2016-10-10 03:39:57 +1100 |
commit | 4faf44588f806eac46b5c7ae5cc8058fc47da3f1 (patch) | |
tree | 5a54dd61694eb04e7f15650cc592eb54f84458f7 /libs/ardour/ardour/midi_region.h | |
parent | 631c8afc668f8b57af21ca85332ac8f012a3f59e (diff) |
Interpret start & length_beats properties as double rather than Evoral::Beats.
- Evoral::Beats operator!= would prevent an increment
of start_beats by intervals of less than a tick,
so its possible that other subtle problems
existed due to this kind of thing.
Diffstat (limited to 'libs/ardour/ardour/midi_region.h')
-rw-r--r-- | libs/ardour/ardour/midi_region.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 29d3b99d4d..132048a242 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -33,8 +33,8 @@ class XMLNode; namespace ARDOUR { namespace Properties { - LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::Beats> start_beats; - LIBARDOUR_API extern PBD::PropertyDescriptor<Evoral::Beats> length_beats; + LIBARDOUR_API extern PBD::PropertyDescriptor<double> start_beats; + LIBARDOUR_API extern PBD::PropertyDescriptor<double> length_beats; } } @@ -106,8 +106,8 @@ class LIBARDOUR_API MidiRegion : public Region boost::shared_ptr<const MidiModel> model() const; void fix_negative_start (); - Evoral::Beats start_beats () {return _start_beats.val(); } - Evoral::Beats length_beats () {return _length_beats.val(); } + double start_beats () {return _start_beats; } + double length_beats () {return _length_beats; } void clobber_sources (boost::shared_ptr<MidiSource> source); @@ -119,8 +119,8 @@ class LIBARDOUR_API MidiRegion : public Region private: friend class RegionFactory; - PBD::Property<Evoral::Beats> _start_beats; - PBD::Property<Evoral::Beats> _length_beats; + PBD::Property<double> _start_beats; + PBD::Property<double> _length_beats; MidiRegion (const SourceList&); MidiRegion (boost::shared_ptr<const MidiRegion>); |