changes to help strp silence

[ardour.git] / gtk2_ardour / latency_gui.cc

diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index 3b4e3b42226c9b935164efd3cd436330f4aa44d2..849edae767dfa726499e5da887dd0b036083ca2c 100644 (file)
--- a/gtk2_ardour/latency_gui.cc
+++ b/gtk2_ardour/latency_gui.cc
@@ -12,7 +12,6 @@
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
-using namespace sigc;
 using namespace ARDOUR;
 
 
@@ -26,17 +25,17 @@ static const gchar *_unit_strings[] = {
 std::vector<std::string> LatencyGUI::unit_strings;
 
 std::string
-LatencyGUI::get_label (int&)
+LatencyBarController::get_label (int&)
 {
-       double const nframes = adjustment.get_value();
+       double const nframes = _latency_gui->adjustment.get_value();
        std::stringstream s;
 
-       if (nframes < (sample_rate / 1000.0)) {
+       if (nframes < (_latency_gui->sample_rate / 1000.0)) {
                s << ((nframes64_t) rint (nframes)) << " samples";
        } else {
-               s << std::fixed << std::setprecision (2) << (nframes / (sample_rate / 1000.0)) << " msecs";
+               s << std::fixed << std::setprecision (2) << (nframes / (_latency_gui->sample_rate / 1000.0)) << " msecs";
        }
-       
+
        return s.str ();
 }
 
@@ -48,7 +47,7 @@ LatencyGUI::LatencyGUI (Latent& l, nframes64_t sr, nframes64_t psz)
          ignored (new PBD::IgnorableControllable()),
          /* max 1 second, step by frames, page by msecs */
          adjustment (initial_value, 0.0, sample_rate, 1.0, sample_rate / 1000.0f),
-         bc (adjustment, ignored),
+         bc (adjustment, this),
          reset_button (_("Reset"))
 {
        Widget* w;
@@ -57,7 +56,7 @@ LatencyGUI::LatencyGUI (Latent& l, nframes64_t sr, nframes64_t psz)
                unit_strings = I18N (_unit_strings);
        }
 
-       set_popdown_strings (units_combo, unit_strings);        
+       set_popdown_strings (units_combo, unit_strings);
        units_combo.set_active_text (unit_strings.front());
 
        w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
@@ -76,11 +75,11 @@ LatencyGUI::LatencyGUI (Latent& l, nframes64_t sr, nframes64_t psz)
        hbox2.pack_start (plus_button);
        hbox2.pack_start (units_combo, true, true);
 
-       minus_button.signal_clicked().connect (bind (mem_fun (*this, &LatencyGUI::change_latency_from_button), -1));
-       plus_button.signal_clicked().connect (bind (mem_fun (*this, &LatencyGUI::change_latency_from_button), 1));
-       reset_button.signal_clicked().connect (mem_fun (*this, &LatencyGUI::reset));
+       minus_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LatencyGUI::change_latency_from_button), -1));
+       plus_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LatencyGUI::change_latency_from_button), 1));
+       reset_button.signal_clicked().connect (sigc::mem_fun (*this, &LatencyGUI::reset));
 
-       adjustment.signal_value_changed().connect (mem_fun (*this, &LatencyGUI::finish));
+       adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &LatencyGUI::finish));
 
        bc.set_size_request (-1, 25);
        bc.set_style (BarController::LeftToRight);
@@ -144,14 +143,14 @@ LatencyDialog::LatencyDialog (const Glib::ustring& title, Latent& l, nframes64_t
        : 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);
 
        show_all ();
-       
+
        while (true) {
                int ret = run ();