diff options
author | nick_m <mainsbridge@gmail.com> | 2016-10-31 00:01:02 +1100 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2016-11-11 03:37:08 +1100 |
commit | dca96d8b5d6737ec811cf5a46548d39a7912bec8 (patch) | |
tree | 3569c1c42a405bc1b43fc22f30d90bba1dc1fe51 /libs/ardour/ardour/region.h | |
parent | ac23496b40537d97469acdec89f787f056dc3bba (diff) |
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
Diffstat (limited to 'libs/ardour/ardour/region.h')
-rw-r--r-- | libs/ardour/ardour/region.h | 8 |
1 files changed, 5 insertions, 3 deletions
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<framepos_t> _sync_position; - double _pulse; + double _pos_beats; SourceList _sources; /** Used when timefx are applied, so we can always use the original source */ |