prepare installer for multiabi bundles

[ardour.git] / gtk2_ardour / return_ui.cc

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 16c4720577579e037514aab841e0e608a0b9dacc..a6b27f7af7eef67a509e97bbd814ec071e80f37c 100644 (file)
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -25,10 +25,10 @@
 
 #include "return_ui.h"
 #include "io_selector.h"
-#include "ardour_ui.h"
 #include "gui_thread.h"
+#include "timers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -38,7 +38,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
        :_return (r)
        , _gpm (session, 250)
 {
-       _gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp());
+       _gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp(), r->gain_control());
 
        _hbox.pack_start (_gpm, true, true);
        set_name (X_("ReturnUIFrame"));
@@ -62,8 +62,8 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
        _gpm.setup_meters ();
        _gpm.set_fader_name (X_("ReturnUIFader"));
 
-       // screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (sigc::mem_fun (*this, &ReturnUI::update));
-       fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun (*this, &ReturnUI::fast_update));
+       // screen_update_connection = Timers::rapid_connect (sigc::mem_fun (*this, &ReturnUI::update));
+       fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun (*this, &ReturnUI::fast_update));
 }
 
 ReturnUI::~ReturnUI ()