X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Freturn_ui.cc;h=a6b27f7af7eef67a509e97bbd814ec071e80f37c;hb=456596bced4a3647cde4613792002142f9fea4d7;hp=29a8ddc16c9d615f776588c782db20f7d477378c;hpb=35aed0efab378af00031c6a75187c962f05d7bd7;p=ardour.git

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 29a8ddc16c..a6b27f7af7 100644
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -23,13 +23,12 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/return.h"
 
-#include "utils.h"
 #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;
@@ -39,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"));
@@ -49,7 +48,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
 
 	_vbox.pack_start (_hbox, false, false, false);
 
-	io = manage (new IOSelector (parent, session, r->output()));
+	io = Gtk::manage (new IOSelector (parent, session, r->output()));
 
 	pack_start (_vbox, false, false);
 
@@ -63,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 ()