Fix Mixbus action fc83d044f8 & 65bda27d4 rebase ordering

[ardour.git] / gtk2_ardour / send_ui.cc

diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 7e3b0e775a932471c2b33087da5021165c546477..364e44c7b0113b43495830a4a6150a1bff84bd2e 100644 (file)
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -24,13 +24,12 @@
 #include "ardour/send.h"
 #include "ardour/rc_configuration.h"
 
-#include "utils.h"
 #include "send_ui.h"
 #include "io_selector.h"
-#include "ardour_ui.h"
+#include "timers.h"
 #include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -44,7 +43,7 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
        assert (_send);
 
        _panners.set_panner (s->panner_shell(), s->panner());
-       _gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp());
+       _gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp(), s->gain_control());
 
        _hbox.pack_start (_gpm, true, true);
        set_name (X_("SendUIFrame"));
@@ -81,9 +80,9 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
        _gpm.setup_meters ();
        _gpm.set_fader_name (X_("SendUIFader"));
 
-       // screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (
+       // screen_update_connection = Timers::rapid_connect (
        //              sigc::mem_fun (*this, &SendUI::update));
-       fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (
+       fast_screen_update_connection = Timers::super_rapid_connect (
                        sigc::mem_fun (*this, &SendUI::fast_update));
 }