summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-10-01 10:19:38 +1000
committernick_m <mainsbridge@gmail.com>2016-10-01 10:19:38 +1000
commitc26636b0ec3be23a0784727b23da5586df10144d (patch)
treee3028bf0922fc3fccc4f32e7c137cba8b9467c8d
parentc742596024e387c08a0f3afe1c453a62064ab2b4 (diff)
Fix locking bug in tempo map.
-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 bd6ada7714..6379472b2d 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -3167,7 +3167,7 @@ TempoMap::exact_qn_at_frame_locked (const Metrics& metrics, const framepos_t& fr
qn = floor (qn) + (floor (((qn - floor (qn)) * (double) sub_num) + 0.5) / sub_num);
} else if (sub_num == 1) {
/* the gui requested exact musical (BBT) beat */
- qn = quarter_note_at_beat (floor (beat_at_frame_locked (metrics, frame) + 0.5));
+ qn = quarter_note_at_beat_locked (metrics, floor (beat_at_frame_locked (metrics, frame) + 0.5));
} else if (sub_num == -1) {
/* snap to bar */
Timecode::BBT_Time bbt = bbt_at_pulse_locked (metrics, qn / 4.0);