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, 3 insertions, 3 deletions

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index d6489f8f49..7fc2efe9b9 100644
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -43,8 +43,8 @@ InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, boost:
 
 	set_name (sendto->name());
 
-	scoped_connect (_send_to->GoingAway, boost::bind (&InternalSend::send_to_going_away, this));
-	scoped_connect (_send_to->NameChanged, boost::bind (&InternalSend::send_to_name_changed, this));
+	_send_to->GoingAway.connect (*this, boost::bind (&InternalSend::send_to_going_away, this));
+	_send_to->NameChanged.connect (*this, boost::bind (&InternalSend::send_to_name_changed, this));
 }
 
 InternalSend::InternalSend (Session& s, boost::shared_ptr<MuteMaster> mm, const XMLNode& node)
@@ -187,7 +187,7 @@ InternalSend::set_our_state (const XMLNode& node, int version)
 		*/
 
 		if (!IO::connecting_legal) {
-			connect_c = IO::ConnectingLegal.connect (boost::bind (&InternalSend::connect_when_legal, this));
+			IO::ConnectingLegal.connect (connect_c, boost::bind (&InternalSend::connect_when_legal, this));
 		} else {
 			connect_when_legal ();
 		}