use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters

git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 2 insertions, 2 deletions

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 8a12a3ece9..fe1593a4aa 100644
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -57,7 +57,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
 	show_all ();
 
 	_return->set_metering (true);
-	_return->input()->changed.connect (sigc::mem_fun (*this, &ReturnUI::ins_changed));
+	_return->input()->changed.connect (input_change_connection, boost::bind (&ReturnUI::ins_changed, this, _1, _2));
 
 	_gpm.setup_meters ();
 	_gpm.set_fader_name ("ReturnUIFrame");
@@ -110,7 +110,7 @@ ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
 
 	set_name ("ReturnUIWindow");
 
-	going_away_connection = r->GoingAway.connect (sigc::mem_fun (*this, &ReturnUIWindow::return_going_away));
+	r->GoingAway.connect (going_away_connection, boost::bind (&ReturnUIWindow::return_going_away, this));
 	signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
 }