From f2cf60900b85a167e44e0b91b1036dcb4f86671e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 16 May 2020 23:09:45 +0200 Subject: TMM: Fix BPM display format #8118 --- gtk2_ardour/transport_masters_dialog.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/transport_masters_dialog.cc b/gtk2_ardour/transport_masters_dialog.cc index bf1bb16bf6..9d7a2ae716 100644 --- a/gtk2_ardour/transport_masters_dialog.cc +++ b/gtk2_ardour/transport_masters_dialog.cc @@ -340,6 +340,8 @@ TransportMastersWidget::Row::Row (TransportMastersWidget& p) last_box.modify_bg (Gtk::STATE_NORMAL, bg_color); last.modify_fg (Gtk::STATE_NORMAL, fg_color); + set_size_request_to_display_given_text (format, "999.9 BPM", 0, 0); + } TransportMastersWidget::Row::~Row () @@ -607,8 +609,6 @@ TransportMastersWidget::Row::update (Session* s, samplepos_t now) return; } - static const char *disp_fmt = " %1 "; - string current_str (" --:--:--:--"); string delta_str ("\u0394 ---- "); string age_str (" "); @@ -625,9 +625,10 @@ TransportMastersWidget::Row::update (Session* s, samplepos_t now) AudioEngine::instance()->sample_rate(), 0, false, 0); } else if ((mtm = boost::dynamic_pointer_cast (tm))) { - char buf[8]; - snprintf (buf, sizeof (buf), "%.1fBPM", mtm->bpm()); - format.set_text (string_compose (disp_fmt, buf)); + char buf[16]; + snprintf (buf, sizeof (buf), "%.1f BPM", mtm->bpm()); + buf[15] = '\0'; + format.set_text (buf); s->sample_to_timecode (pos, t, false, false); } else { format.set_text (" - "); @@ -707,7 +708,6 @@ TransportMastersWindow::on_realize () } - void TransportMastersWindow::set_session (ARDOUR::Session* s) { -- cgit v1.2.3