From dca96d8b5d6737ec811cf5a46548d39a7912bec8 Mon Sep 17 00:00:00 2001 From: nick_m Date: Mon, 31 Oct 2016 00:01:02 +1100 Subject: rename Region pulse to pos_beats. use new beat distance api where required. - add more debugging output detecting regions whose beat and frame position do not align on a playlist. this is required as a check as we have never used frame rounding on constant tempi before 8884a5723dc --- libs/ardour/ardour/region.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libs/ardour/ardour/region.h') diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index fc14e98cb8..866f489037 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -175,10 +175,12 @@ class LIBARDOUR_API Region void set_position_lock_style (PositionLockStyle ps); void recompute_position_from_lock_style (const int32_t sub_num); + /* meter-based beat at the region position */ double beat () const { return _beat; } void set_beat (double beat) { _beat = beat; } - double pulse () const { return _pulse; } - void set_pulse (double pulse) { _pulse = pulse; } + /* quarter-note beats at the region position (for use with Evoral::Beats) */ + double pos_beats () const { return _pos_beats; } + void set_pos_beats (double pb) { _pos_beats = pb; } void suspend_property_changes (); @@ -380,7 +382,7 @@ class LIBARDOUR_API Region /** Sync position relative to the start of our file */ PBD::Property _sync_position; - double _pulse; + double _pos_beats; SourceList _sources; /** Used when timefx are applied, so we can always use the original source */ -- cgit v1.2.3