introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor

git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 13 deletions

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 8e7d6f394a..32e6fce849 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -74,7 +74,7 @@ class StreamView;
  * This class provides the basic LHS controls and display methods. This should be
  * extended to create functional time-axis based views.
  */
-class TimeAxisView : public virtual AxisView, public PBD::Stateful
+class TimeAxisView : public virtual AxisView
 {
   private:
 	enum NamePackingBits {
@@ -87,9 +87,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 	TimeAxisView(ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas);
 	virtual ~TimeAxisView ();
 
-	XMLNode& get_state ();
-	int set_state (const XMLNode&, int version);
-
 	static PBD::Signal1<void,TimeAxisView*> CatchDeletion;
 
 	/** @return index of this TimeAxisView within its parent */
@@ -129,8 +126,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 	void show_name_label ();
 	void show_name_entry ();
 
-	virtual bool set_visibility (bool);
 	virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent);
+	virtual void hide ();
 
 	void clip_to_viewport ();
 
@@ -152,6 +149,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 	void set_height_enum (Height, bool apply_to_selection = false);
 	void reset_height();
 
+	virtual void reset_visual_state ();
+
 	std::pair<TimeAxisView*, ARDOUR::layer_t> covers_y_position (double);
 
 	virtual void step_height (bool);
@@ -196,7 +195,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
 	TimeAxisView* get_parent () { return parent; }
 	void set_parent (TimeAxisView& p);
-	bool has_state () const;
 
 	virtual LayerDisplay layer_display () const { return Overlaid; }
 	virtual StreamView* view () const { return 0; }
@@ -205,7 +203,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 	Children get_child_list ();
 
 	SelectionRect* get_selection_rect(uint32_t id);
-
+	
 	static uint32_t preset_height (Height);
 
   protected:
@@ -270,18 +268,12 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
 	TimeAxisView* parent;
 
-	/** Find the parent with state */
-	TimeAxisView* get_parent_with_state();
-
 	Children children;
 	bool is_child (TimeAxisView*);
 
 	void remove_child (boost::shared_ptr<TimeAxisView>);
 	void add_child (boost::shared_ptr<TimeAxisView>);
 
-	virtual void hide ();
-	virtual void show ();
-
 	/* selection display */
 
 	ArdourCanvas::Group      *selection_group;