X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faxis_view.h;h=2a7c3781978d92d8ea5e959c4ed794a2a9fe3cf5;hb=b6c3e5537269e53bb145300e7724e8b89dfb74d6;hp=2c891524b8f379269419df30b3f52985235f1455;hpb=5a53f2f1b9977e909f7720c9aa30333b0ec0572b;p=ardour.git

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 2c891524b8..2a7c378197 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -21,6 +21,7 @@
 #define __ardour_gtk_axis_view_h__
 
 #include <list>
+#include <boost/unordered_map.hpp>
 
 #include <gtkmm/label.h>
 #include <gdkmm/color.h>
@@ -36,45 +37,53 @@
 
 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.
 	 */
 	std::string gui_property (const std::string& property_name) const;
-	
+
 	template<typename T> void set_gui_property (const std::string& property_name, const T& value) {
-		gui_object_state().set<T> (state_id(), property_name, value);
+		std::stringstream s;
+		s << value;
+		property_hashtable.erase(property_name);
+		property_hashtable.emplace(property_name, s.str());
+		gui_object_state().set_property<T> (state_id(), property_name, value);
 	}
 
-	bool marked_for_display () const;
+	void cleanup_gui_properties () {
+		/* remove related property node from the GUI state */
+		gui_object_state().remove_node (state_id());
+		property_hashtable.clear ();
+	}
+
+	void set_selected (bool yn);
+
+	virtual bool marked_for_display () const;
 	virtual bool set_marked_for_display (bool);
 
 	static GUIObjectState& gui_object_state();
-	
-  protected:
-
-	AxisView (ARDOUR::Session* sess);
-	virtual ~AxisView();
+	void clear_property_cache() { property_hashtable.clear(); }
 
 	/**
 	 * Generate a new random TrackView color, unique from those colors already used.
@@ -83,16 +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;
 
-	bool _marked_for_display;
-	uint32_t _old_order_key;
+	mutable boost::unordered_map<std::string, std::string> property_hashtable;
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */
-