X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flatency_gui.cc;h=dbb3e08cd7c86e0ee89d8caa146a955b83568159;hb=0e7b9c6a9892a9f80dced00baa52745961f31014;hp=25c280351af00e35560f77a864da11a84dfaa307;hpb=34d6518e239477d4ec4207488a923ae5e62b1749;p=ardour.git

diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index 25c280351a..dbb3e08cd7 100644
--- a/gtk2_ardour/latency_gui.cc
+++ b/gtk2_ardour/latency_gui.cc
@@ -22,11 +22,12 @@
 #include <iomanip>
 #include "ardour/latent.h"
 #include "pbd/convert.h"
+#include "pbd/error.h"
 #include <gtkmm2ext/utils.h>
 
 #include "latency_gui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace Gtk;
@@ -50,9 +51,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 ();
@@ -101,9 +103,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);
@@ -148,7 +148,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) {
@@ -162,29 +162,11 @@ LatencyDialog::LatencyDialog (const std::string& title, Latent& l, framepos_t sr
 	: ArdourDialog (title, false, true),
 	  lwidget (l, sr, psz)
 {
-
 	get_vbox()->pack_start (lwidget);
-	add_button (Stock::CANCEL, RESPONSE_CANCEL);
-	add_button (Stock::APPLY, RESPONSE_REJECT);
-	add_button (Stock::OK, RESPONSE_ACCEPT);
+	add_button (Stock::CLOSE, RESPONSE_CLOSE);
 
 	show_all ();
-
-	while (true) {
-		int ret = run ();
-
-		switch (ret) {
-		case RESPONSE_ACCEPT:
-			return;
-			break;
-
-		case RESPONSE_REJECT:
-			lwidget.finish ();
-			break;
-		default:
-			return;
-		}
-	}
+	run ();
 }