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, 4 insertions, 2 deletions

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 3d2591a977..29f167d85e 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -26,7 +26,7 @@
 #include <gdkmm/color.h>
 
 #include "pbd/xml++.h"
-#include "pbd/destructible.h"
+#include "pbd/signals.h"
 
 #include "ardour/session_handle.h"
 
@@ -41,7 +41,7 @@ namespace ARDOUR {
  * AxisView defines the abstract base class for time-axis trackviews and routes.
  *
  */
-class AxisView : public virtual Selectable, public PBD::Destructible, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
+class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
   public:
 	/**
@@ -59,6 +59,8 @@ class AxisView : public virtual Selectable, public PBD::Destructible, public PBD
 	virtual void set_marked_for_display (bool yn) {
 		_marked_for_display = yn;
 	}
+	
+	static PBD::Signal1<void,AxisView*> CatchDeletion;
 
 	sigc::signal<void> Hiding;