summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-03-22 02:55:24 +1100
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:12 +1000
commitba3ae54f516fc447ad1828cf99ca22d352189c71 (patch)
treeaf8ff6723a1591e3bd8431bdc467f706ac93a92c
parentcab7335d588031dee6694d5f74ab69386e212be7 (diff)
Tempo ramps - clean up negative beat handling in beats_to_bbt_locked ()
-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 549bac465d..ee66f4015d 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1599,11 +1599,11 @@ TempoMap::beats_to_bbt (const double& beats)
}
Timecode::BBT_Time
-TempoMap::beats_to_bbt_locked (const Metrics& metrics, const double& beats) const
+TempoMap::beats_to_bbt_locked (const Metrics& metrics, const double& b) const
{
/* CALLER HOLDS READ LOCK */
-
MeterSection* prev_ms = 0;
+ const double beats = (b < 0.0) ? 0.0 : b;
uint32_t accumulated_bars = 0;
double accumulated_beats = 0.0;