X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faxis_view.h;h=108d14c1f12f7fb358a5fcedf6bb8e1a89f2d5e5;hb=b15e1cba3b11f73f3155c5dbd8a162c2512f5641;hp=21220d54396336632a9e416a24e36c9380831e87;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 21220d5439..108d14c1f1 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -26,6 +26,10 @@
 #include <gdkmm/color.h>
 
 #include "pbd/xml++.h"
+#include "pbd/signals.h"
+
+#include "ardour/session_handle.h"
+
 #include "prompter.h"
 #include "selectable.h"
 
@@ -37,7 +41,7 @@ namespace ARDOUR {
  * AxisView defines the abstract base class for time-axis trackviews and routes.
  *
  */
-class AxisView : public virtual Selectable
+class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
   public:
 	/**
@@ -47,7 +51,7 @@ class AxisView : public virtual Selectable
 	 */
 	Gdk::Color color() const { return _color; }
 
-	ARDOUR::Session& session() const { return _session; }
+	ARDOUR::Session* session() const { return _session; }
 
 	virtual std::string name() const = 0;
 
@@ -55,19 +59,17 @@ class AxisView : public virtual Selectable
 	virtual void set_marked_for_display (bool yn) {
 		_marked_for_display = yn;
 	}
-
+	
 	sigc::signal<void> Hiding;
-	sigc::signal<void> GoingAway;
 
 	void set_old_order_key (uint32_t ok) { _old_order_key = ok; }
 	uint32_t old_order_key() const { return _old_order_key; }
 
   protected:
 
-	AxisView (ARDOUR::Session& sess);
+	AxisView (ARDOUR::Session* sess);
 	virtual ~AxisView();
 
-
 	/**
 	 * Generate a new random TrackView color, unique from those colors already used.
 	 *
@@ -76,7 +78,6 @@ class AxisView : public virtual Selectable
 	static Gdk::Color unique_random_color();
 
 
-	ARDOUR::Session& _session;
 	Gdk::Color _color;
 
 	static std::list<Gdk::Color> used_colors;