diff options
author | nick_m <mainsbridge@gmail.com> | 2016-11-06 05:14:20 +1100 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2016-11-11 03:37:08 +1100 |
commit | 33e95a15778e7fe87c204b0c4f2db039f857b523 (patch) | |
tree | 90678ea8fdf2a8a9532d808fd2efbf5775e5290e /gtk2_ardour/audio_clock.cc | |
parent | e52f90357e79dac10da2bee0e27d51e8b07d5b83 (diff) |
rename Tempo _beats_per_minute to _note_types_per_minute, provide pulse helpers.
- adds quarter_notes_per_minute(), note_divisions_per_minute (double)
pulses_per_minute() and frames_per_quarter_note()
- this should be a no-op except for the use of tempo by
the vst callback which definitely uses quarter notes per minute.
- the XML node for TempoSection named 'beats-per-minute'
has been renamed.
Diffstat (limited to 'gtk2_ardour/audio_clock.cc')
-rw-r--r-- | gtk2_ardour/audio_clock.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 0c05cfd7f9..a657916b6d 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1316,7 +1316,8 @@ AudioClock::set_bbt (framepos_t when, framecnt_t offset, bool /*force*/) TempoMetric m (_session->tempo_map().metric_at (pos)); - sprintf (buf, "%-5.3f", _session->tempo_map().tempo_at_frame (pos).beats_per_minute()); + sprintf (buf, "%-5.3f/%f", _session->tempo_map().tempo_at_frame (pos).note_types_per_minute(), m.tempo().note_type()); + /* XXX this doesn't fit inside the container. */ _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%3</span> <span foreground=\"green\">%2</span></span>", INFO_FONT_SIZE, buf, _("Tempo"))); |