X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Freturn_ui.cc;h=a6b27f7af7eef67a509e97bbd814ec071e80f37c;hb=73c0f9e529657d67177376b8a0a14080c009350c;hp=92846af4697522dc4cbc36b7f7b5ba07f462b7a1;hpb=d89573f8e73ee7f0c28a6b9a8b8ba0f8e78c69aa;p=ardour.git

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 92846af469..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 ()
@@ -110,19 +109,9 @@ ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
 
 	set_name ("ReturnUIWindow");
 
-	r->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&ReturnUIWindow::return_going_away, this), gui_context());
 }
 
 ReturnUIWindow::~ReturnUIWindow ()
 {
 	delete ui;
 }
-
-void
-ReturnUIWindow::return_going_away ()
-{
-	ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
-	going_away_connection.disconnect ();
-	delete_when_idle (this);
-}
-