From 24aa61f08c28bc9ad65043a3c253d7dcac10eda3 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 29 Sep 2019 02:43:06 +0200 Subject: [PATCH] Use samples_as_time_string API --- gtk2_ardour/latency_gui.cc | 14 +++----------- gtk2_ardour/plugin_ui.cc | 12 ++---------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc index acfa376892..c417edd5a9 100644 --- a/gtk2_ardour/latency_gui.cc +++ b/gtk2_ardour/latency_gui.cc @@ -33,6 +33,7 @@ #include "gtkmm2ext/utils.h" #include "latency_gui.h" +#include "utils.h" #include "pbd/i18n.h" @@ -54,17 +55,8 @@ std::vector LatencyGUI::unit_strings; std::string LatencyBarController::get_label (double&) { - double const nframes = _latency_gui->adjustment.get_value(); - std::stringstream s; - - if (nframes < (_latency_gui->sample_rate / 1000.0)) { - const samplepos_t nf = (samplepos_t) rint (nframes); - s << string_compose (P_("%1 sample", "%1 samples", nf), nf); - } else { - s << std::fixed << std::setprecision (2) << (nframes / (_latency_gui->sample_rate / 1000.0)) << " ms"; - } - - return s.str (); + return ARDOUR_UI_UTILS::samples_as_time_string ( + _latency_gui->adjustment.get_value(), _latency_gui->sample_rate, true); } LatencyGUI::LatencyGUI (Latent& l, samplepos_t sr, samplepos_t psz) diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index ebea058df4..c60214c5a4 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -582,17 +582,9 @@ void PlugUIBase::set_latency_label () { samplecnt_t const l = insert->effective_latency (); - samplecnt_t const sr = insert->session().sample_rate (); + float const sr = insert->session().sample_rate (); - string t; - - if (l < sr / 1000) { - t = string_compose (P_("%1 sample", "%1 samples", l), l); - } else { - t = string_compose (_("%1 ms"), (float) l / ((float) sr / 1000.0f)); - } - - latency_button.set_text (t); + latency_button.set_text (samples_as_time_string (l, sr, true)); } void