cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropReferences & Destroyed in libardour ; CatchDeletion in the GTK UI); clarify ownership of objects (session no longer pays attention to DropReferences for objects that it is considered to own, such as routes, sources, etc); fix up MIDI parsing and a couple of other places by correcting syntax for return of values from a boost::signals2::signal (possible danger elsewhere to be checked)

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

1 files changed, 3 insertions, 3 deletions

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index edba77140d..b2cb88a008 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -210,7 +210,7 @@ Selection::toggle (TimeAxisView* track)
 
 	if ((i = find (tracks.begin(), tracks.end(), track)) == tracks.end()) {
 		void (Selection::*pmf)(TimeAxisView*) = &Selection::remove;
-		track->GoingAway.connect (*this, boost::bind (pmf, this, track), gui_context());
+		track->CatchDeletion.connect (*this, boost::bind (pmf, this, track), gui_context());
 		tracks.push_back (track);
 	} else {
 		tracks.erase (i);
@@ -339,7 +339,7 @@ Selection::add (const TrackViewList& track_list)
 
 	for (list<TimeAxisView*>::const_iterator i = added.begin(); i != added.end(); ++i) {
 		void (Selection::*pmf)(TimeAxisView*) = &Selection::remove;
-		(*i)->GoingAway.connect (*this, boost::bind (pmf, this, (*i)), gui_context());
+		(*i)->CatchDeletion.connect (*this, boost::bind (pmf, this, (*i)), gui_context());
 	}
 
 	if (!added.empty()) {
@@ -950,7 +950,7 @@ Selection::add (Marker* m)
 
 		void (Selection::*pmf)(Marker*) = &Selection::remove;
 
-		m->GoingAway.connect (*this, boost::bind (pmf, this, m), gui_context());
+		m->CatchDeletion.connect (*this, boost::bind (pmf, this, _1), gui_context());
 
 		markers.push_back (m);
 		MarkersChanged();