diff options
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 2 | ||||
| -rw-r--r-- | libs/ardour/tempo.cc | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 092ce27c08..780455ff4b 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -440,7 +440,7 @@ private: double pulse_at_frame_locked (const Metrics& metrics, const framecnt_t& frame) const; framecnt_t frame_at_pulse_locked (const Metrics& metrics, const double& beat) const; - double pulse_offset_at (const Metrics& metrics, const double& pulse) const; + double beat_offset_at (const Metrics& metrics, const double& beat) const; frameoffset_t frame_offset_at (const Metrics& metrics, const framepos_t& frame) const; double beat_at_frame_locked (const Metrics& metrics, const framecnt_t& frame) const; diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index a91b2e91a5..f2c44b2500 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -1834,34 +1834,35 @@ TempoMap::frame_at_pulse_locked (const Metrics& metrics, const double& pulse) co } double -TempoMap::pulse_offset_at (const Metrics& metrics, const double& pulse) const +TempoMap::beat_offset_at (const Metrics& metrics, const double& beat) const { MeterSection* prev_m = 0; - double pulse_off = first_meter().pulse(); + double beat_off = first_meter().pulse(); for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { MeterSection* m = 0; if ((m = dynamic_cast<MeterSection*> (*i)) != 0) { if (prev_m) { - if (m->pulse() > pulse) { + if (m->beat() > beat) { break; } if (m->position_lock_style() == AudioTime) { - pulse_off += (m->pulse() - prev_m->pulse()) - floor (m->pulse() - prev_m->pulse()); + beat_off += ((m->beat() - prev_m->beat()) / prev_m->note_divisor()) - floor (m->pulse() - prev_m->pulse()); } } prev_m = m; } } - return pulse_off; + return beat_off; } frameoffset_t TempoMap::frame_offset_at (const Metrics& metrics, const framepos_t& frame) const { frameoffset_t frame_off = 0; + MeterSection* prev_m = 0; for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { MeterSection* m = 0; @@ -1869,9 +1870,11 @@ TempoMap::frame_offset_at (const Metrics& metrics, const framepos_t& frame) cons if (m->frame() > frame) { break; } - if (m->position_lock_style() == AudioTime) { - frame_off += frame_at_pulse_locked (metrics, m->pulse()) - m->frame(); + if (prev_m && m->position_lock_style() == AudioTime) { + const double pulse = prev_m->pulse() + ((m->beat() - prev_m->beat()) / prev_m->note_divisor()); + frame_off += frame_at_pulse_locked (metrics, pulse) - m->frame(); } + prev_m = m; } } |