X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faxis_view.h;h=8e777c2a58550d251da31f46f43cc277cd29ed6d;hb=0796ccfb652dd31ea1d94526e0e6d92863a972b0;hp=e64ef99b160b216bb9d3fa136c65f07ede4f7df7;hpb=f7f9d6fdc40248b190ec9c6e1a886261d55777ae;p=ardour.git

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index e64ef99b16..8e777c2a58 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
@@ -25,7 +25,12 @@
 #include <gtkmm/label.h>
 #include <gdkmm/color.h>
 
-#include <pbd/xml++.h>
+#include "pbd/xml++.h"
+#include "pbd/signals.h"
+
+#include "ardour/session_handle.h"
+
+#include "gui_object.h"
 #include "prompter.h"
 #include "selectable.h"
 
@@ -37,39 +42,39 @@ 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:
-	/**
-	 * Returns the current 'Track' Color
-	 *
-	 * @return the current Track Color
-	 */
-	Gdk::Color color() const { return _color; }
+	/** @return the track's own color */
+	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 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;
-		}
-	}
-	
 	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; }
 
+	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_property<T> (state_id(), property_name, value);
+	}
+
+	bool marked_for_display () const;
+	virtual bool set_marked_for_display (bool);
+
+	static GUIObjectState& gui_object_state();
+	
   protected:
 
-	AxisView (ARDOUR::Session& sess);
+	AxisView (ARDOUR::Session* sess);
 	virtual ~AxisView();
-	
 
 	/**
 	 * Generate a new random TrackView color, unique from those colors already used.
@@ -78,17 +83,14 @@ class AxisView : public virtual Selectable
 	 */
 	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 _marked_for_display;
 	uint32_t _old_order_key;
-
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */