summaryrefslogtreecommitdiff
path: root/gtk2_ardour/audio_clock.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-03-19 23:44:40 +1100
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:11 +1000
commitb415b59f790f049a73464efc7fdf0f2858e1bde8 (patch)
treebfe28234131383e4b2a7417410134ca21e59086c /gtk2_ardour/audio_clock.cc
parenta47359c38280398acc80494cdc72ce129ae0edc3 (diff)
Tempo ramps - respect tempo note type and meter note divisor correctly.
- tempo and meter position is now pulse-based, although meter still has a beat for convenience.
Diffstat (limited to 'gtk2_ardour/audio_clock.cc')
-rw-r--r--gtk2_ardour/audio_clock.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 4afe4a418d..a32ad42908 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -1281,7 +1281,7 @@ AudioClock::set_bbt (framepos_t when, bool /*force*/)
TempoMetric m (_session->tempo_map().metric_at (pos));
- sprintf (buf, "%-5.1f", _session->tempo_map().tempo_at (pos));
+ sprintf (buf, "%-5.1f", _session->tempo_map().tempo_at (pos).beats_per_minute());
_left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%3</span> <span foreground=\"green\">%2</span></span>",
INFO_FONT_SIZE, buf, _("Tempo")));