clear regions from "other" playlist type in auditioner when starting a new audition

[ardour.git] / gtk2_ardour / latency_gui.cc

diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index 180af93776476b8e482584fb0b642108cfa6d7b2..de7e7b0b57fab5592c95ecfa4a3eb8473dac4f7d 100644 (file)
--- a/gtk2_ardour/latency_gui.cc
+++ b/gtk2_ardour/latency_gui.cc
@@ -18,16 +18,19 @@
 */
 
 #include <inttypes.h>
-
 #include <iomanip>
-#include "ardour/latent.h"
+
+#include <gtkmm/stock.h>
+
 #include "pbd/convert.h"
 #include "pbd/error.h"
-#include <gtkmm2ext/utils.h>
+#include "ardour/latent.h"
+
+#include "gtkmm2ext/utils.h"
 
 #include "latency_gui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace Gtk;
@@ -51,9 +54,10 @@ LatencyBarController::get_label (double&)
        std::stringstream s;
 
        if (nframes < (_latency_gui->sample_rate / 1000.0)) {
-               s << ((framepos_t) rint (nframes)) << " samples";
+               const framepos_t nf = (framepos_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)) << " msecs";
+               s << std::fixed << std::setprecision (2) << (nframes / (_latency_gui->sample_rate / 1000.0)) << " ms";
        }
 
        return s.str ();
@@ -102,9 +106,7 @@ LatencyGUI::LatencyGUI (Latent& l, framepos_t sr, framepos_t psz)
        adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &LatencyGUI::finish));
 
        bc.set_size_request (-1, 25);
-       bc.set_style (BarController::LeftToRight);
-       bc.set_use_parent (true);
-       bc.set_name (X_("PluginSlider"));
+       bc.set_name (X_("ProcessorControlSlider"));
 
        set_spacing (12);
        pack_start (hbox1, true, true);
@@ -149,7 +151,7 @@ LatencyGUI::change_latency_from_button (int dir)
        } else {
                fatal << string_compose (_("programming error: %1 (%2)"), X_("illegal string in latency GUI units combo"), unitstr)
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if (dir > 0) {