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/session_export.cc b/libs/ardour/session_export.cc
index 8b56271e42..1bd0c2e7c7 100644
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -91,8 +91,8 @@ Session::pre_export ()
 
 	_exporting = true;
 	export_status->running = true;
-	scoped_connect (export_status->Aborting, boost::bind (&Session::stop_audio_export, this));
-	scoped_connect (export_status->Finished, boost::bind (&Session::finalize_audio_export, this));
+	export_status->Aborting.connect (*this, boost::bind (&Session::stop_audio_export, this));
+	export_status->Finished.connect (*this, boost::bind (&Session::finalize_audio_export, this));
 
 	return 0;
 }
@@ -150,7 +150,7 @@ Session::start_audio_export (nframes_t position, bool realtime)
 		last_process_function = process_function;
 		process_function = &Session::process_export;
 	} else {
-		export_freewheel_connection = _engine.Freewheel.connect (boost::bind (&Session::process_export_fw, this, _1));
+		_engine.Freewheel.connect (export_freewheel_connection, boost::bind (&Session::process_export_fw, this, _1));
 		return _engine.freewheel (true);
 	}