X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Faxis_view.h;h=2a7c3781978d92d8ea5e959c4ed794a2a9fe3cf5;hb=9436d0cb867e4a923cb5a8bc459fe62cb4d3a70e;hp=b47ca9816311df91c660caea938a2d4b5b99fda4;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index b47ca98163..2a7c378197 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -37,26 +37,26 @@
 
 namespace ARDOUR {
 	class Session;
+	class Stripable;
+	class PresentationInfo;
 }
 
 /**
- * AxisView defines the abstract base class for time-axis trackviews and routes.
+ * AxisView defines the abstract base class for horizontal and vertical
+ * presentations of Stripables.
  *
  */
-class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
+class AxisView : public virtual PBD::ScopedConnectionList, public virtual ARDOUR::SessionHandlePtr, public virtual Selectable
 {
   public:
-	/** @return the track's own color */
-	Gdk::Color color () const { return _color; }
-
 	ARDOUR::Session* session() const { return _session; }
 
 	virtual std::string name() const = 0;
+	virtual Gdk::Color color() const = 0;
 
 	sigc::signal<void> Hiding;
 
-	void set_old_order_key (uint32_t ok) { _old_order_key = ok; }
-	uint32_t old_order_key() const { return _old_order_key; }
+	virtual boost::shared_ptr<ARDOUR::Stripable> stripable() const = 0;
 
 	virtual std::string state_id() const = 0;
 	/* for now, we always return properties in string form.
@@ -77,17 +77,14 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
 		property_hashtable.clear ();
 	}
 
-	bool marked_for_display () const;
+	void set_selected (bool yn);
+
+	virtual bool marked_for_display () const;
 	virtual bool set_marked_for_display (bool);
 
 	static GUIObjectState& gui_object_state();
 	void clear_property_cache() { property_hashtable.clear(); }
 
-  protected:
-
-	AxisView (ARDOUR::Session* sess);
-	virtual ~AxisView();
-
 	/**
 	 * Generate a new random TrackView color, unique from those colors already used.
 	 *
@@ -95,15 +92,15 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
 	 */
 	static Gdk::Color unique_random_color();
 
-	Gdk::Color _color;
+  protected:
+	AxisView ();
+	virtual ~AxisView();
 
 	static std::list<Gdk::Color> used_colors;
 
 	Gtk::Label name_label;
 
 	mutable boost::unordered_map<std::string, std::string> property_hashtable;
-	uint32_t _old_order_key;
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */
-