From 4faf44588f806eac46b5c7ae5cc8058fc47da3f1 Mon Sep 17 00:00:00 2001 From: nick_m Date: Mon, 10 Oct 2016 03:39:57 +1100 Subject: 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. --- libs/ardour/ardour/midi_region.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libs/ardour/ardour') 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 start_beats; - LIBARDOUR_API extern PBD::PropertyDescriptor length_beats; + LIBARDOUR_API extern PBD::PropertyDescriptor start_beats; + LIBARDOUR_API extern PBD::PropertyDescriptor length_beats; } } @@ -106,8 +106,8 @@ class LIBARDOUR_API MidiRegion : public Region boost::shared_ptr 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 source); @@ -119,8 +119,8 @@ class LIBARDOUR_API MidiRegion : public Region private: friend class RegionFactory; - PBD::Property _start_beats; - PBD::Property _length_beats; + PBD::Property _start_beats; + PBD::Property _length_beats; MidiRegion (const SourceList&); MidiRegion (boost::shared_ptr); -- cgit v1.2.3