X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flatency_gui.cc;h=d8cf8d051e8e68ad079e10e22c495aeafe280ac5;hb=f250d16487ba747be0276ebd15b240ddd07da132;hp=8d2dd3f1c6037e6a8f18c357b6f1283c2fbd43f3;hpb=fee370943854ff99aba1794382b6700b9feeb751;p=ardour.git

diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index 8d2dd3f1c6..d8cf8d051e 100644
--- a/gtk2_ardour/latency_gui.cc
+++ b/gtk2_ardour/latency_gui.cc
@@ -22,6 +22,7 @@
 #include <iomanip>
 #include "ardour/latent.h"
 #include "pbd/convert.h"
+#include "pbd/error.h"
 #include <gtkmm2ext/utils.h>
 
 #include "latency_gui.h"
@@ -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 ();
@@ -60,7 +62,7 @@ LatencyBarController::get_label (double&)
 
 LatencyGUI::LatencyGUI (Latent& l, framepos_t sr, framepos_t psz)
 	: _latent (l),
-	  initial_value (_latent.signal_latency()),
+	  initial_value (_latent.user_latency()),
 	  sample_rate (sr),
 	  period_size (psz),
 	  ignored (new PBD::IgnorableControllable()),
@@ -162,29 +164,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 ();
 }