fix continuing SNAFUs with ::set_state() for control protocols and the parent/child...

[ardour.git] / gtk2_ardour / latency_gui.cc

diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index 25c280351af00e35560f77a864da11a84dfaa307..d8cf8d051e8e68ad079e10e22c495aeafe280ac5 100644 (file)
--- 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 ();
@@ -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 ();
 }