X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faxis_view.h;h=108d14c1f12f7fb358a5fcedf6bb8e1a89f2d5e5;hb=d1b4599725abda6b8697151fd4a1bd3740ad2f2a;hp=93c4f4870ff3c5bc3abeb3a4f585728b56cb280e;hpb=60f817b0d2411947c257ecbf0b0376589ea77acd;p=ardour.git

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 93c4f4870f..108d14c1f1 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,16 +15,23 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_gtk_axis_view_h__
 #define __ardour_gtk_axis_view_h__
 
 #include <list>
-#include <gtkmm.h>
-#include <pbd/xml++.h>
+
+#include <gtkmm/label.h>
+#include <gdkmm/color.h>
+
+#include "pbd/xml++.h"
+#include "pbd/signals.h"
+
+#include "ardour/session_handle.h"
+
 #include "prompter.h"
+#include "selectable.h"
 
 namespace ARDOUR {
 	class Session;
@@ -34,7 +41,7 @@ namespace ARDOUR {
  * AxisView defines the abstract base class for time-axis trackviews and routes.
  *
  */
-class AxisView : public sigc::trackable
+class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
   public:
 	/**
@@ -44,33 +51,24 @@ class AxisView : public sigc::trackable
 	 */
 	Gdk::Color color() const { return _color; }
 
-	ARDOUR::Session& session() const { return _session; }
+	ARDOUR::Session* session() const { return _session; }
 
-	virtual string name() const = 0;
+	virtual std::string name() const = 0;
 
-	virtual void set_selected (bool yn) {
-		if (yn != _selected) {
-			_selected = yn;
-		}
-	}
-	
 	virtual bool marked_for_display() const { return _marked_for_display; }
-
 	virtual void set_marked_for_display (bool yn) {
-		if (yn != _marked_for_display) {
-			_marked_for_display = yn;
-		}
+		_marked_for_display = yn;
 	}
 	
-	virtual bool selected() const { return _selected; }
 	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.
@@ -80,17 +78,15 @@ class AxisView : public sigc::trackable
 	static Gdk::Color unique_random_color();
 
 
-	ARDOUR::Session& _session;
 	Gdk::Color _color;
 
-	static list<Gdk::Color> used_colors;
+	static std::list<Gdk::Color> used_colors;
 
 	Gtk::Label name_label;
 
-	bool _selected;
-
 	bool _marked_for_display;
-	
+	uint32_t _old_order_key;
+
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */