summaryrefslogtreecommitdiff
path: root/libs/ardour/tempo.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-12-16 01:04:22 +1100
committernick_m <mainsbridge@gmail.com>2016-12-16 01:04:22 +1100
commit2a79bcd6b223231dce189e94f0d3e7a57bf0f993 (patch)
tree8d52b7c665bef0f26819a2dfa674a8b797d0445e /libs/ardour/tempo.cc
parentc9444e048e379596ff280abe566801aa612c5a3d (diff)
fix thinko in TempoMap::framepos_plus_qn.
- affects region relative time conversion when initial meter is non-zero.
Diffstat (limited to 'libs/ardour/tempo.cc')
-rw-r--r--libs/ardour/tempo.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 30b10ad8bf..0390ee33c0 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -4381,7 +4381,7 @@ framepos_t
TempoMap::framepos_plus_qn (framepos_t frame, Evoral::Beats beats) const
{
Glib::Threads::RWLock::ReaderLock lm (lock);
- const double frame_qn = quarter_notes_between_frames_locked (_metrics, 0, frame);
+ const double frame_qn = quarter_note_at_minute_locked (_metrics, minute_at_frame (frame));
return frame_at_minute (minute_at_quarter_note_locked (_metrics, frame_qn + beats.to_double()));
}