diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-08-31 22:45:25 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-08-31 23:12:11 +1000 |
| commit | b2190cc4ffeda276eecb569057dc5ef1080836c6 (patch) | |
| tree | ea5b6ea27ab261e5b84d8bc7a468e5231d44897a /libs | |
| parent | e82482e8e9cb091bc38115ee3e6278b6fe6527b5 (diff) | |
TempoMap::pulse_at_frame() handles separated musical sections as per beat_at_frame().
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/tempo.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 2dad0bb354..3a938c54d4 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -1706,6 +1706,10 @@ TempoMap::pulse_at_frame_locked (const Metrics& metrics, const framepos_t& frame if (prev_t && t->frame() > frame) { /*the previous ts is the one containing the frame */ const double ret = prev_t->pulse_at_frame (frame, _frame_rate); + /* audio locked section in new meter*/ + if (t->pulse() < ret) { + return t->pulse(); + } return ret; } prev_t = t; |