summaryrefslogtreecommitdiff
path: root/libs/ardour/tempo.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-12-22 05:36:40 +1100
committernick_m <mainsbridge@gmail.com>2016-12-22 05:36:40 +1100
commitef8187662a4341b42a4edf726d4ba81712736bed (patch)
tree140757ab00176a8d371ed70b34bf2eadf4059c10 /libs/ardour/tempo.cc
parent05c3850ac197c6a7c5217b060dc596caabdf3c27 (diff)
check audio-locked meter ordering by frame.
Diffstat (limited to 'libs/ardour/tempo.cc')
-rw-r--r--libs/ardour/tempo.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index ab7f459d1e..7c281a3e13 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -2567,10 +2567,10 @@ TempoMap::check_solved (const Metrics& metrics) const
m = static_cast<MeterSection*> (*i);
if (prev_m && m->position_lock_style() == AudioTime) {
const TempoSection* t = &tempo_section_at_minute_locked (metrics, minute_at_frame (m->frame() - 1));
- const double nascent_m_minute = t->minute_at_pulse (m->pulse());
+ const framepos_t nascent_m_frame = frame_at_minute (t->minute_at_pulse (m->pulse()));
/* Here we check that a preceding section of music doesn't overlap a subsequent one.
*/
- if (t && (nascent_m_minute > m->minute() || nascent_m_minute < 0.0)) {
+ if (t && (nascent_m_frame > m->frame() || nascent_m_frame < 0)) {
return false;
}
}