X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.h;h=7706ed7ee31469bb97f4429468857c03d8232dfa;hb=3aa7dacfdf214f0db9330d975e94b7697a0259eb;hp=885e95a864e1a774b255cb1726abfccc0ccde633;hpb=81aef8b49138deea084942740de8dbfa2e30edc1;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 885e95a864..7706ed7ee3 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -70,10 +70,9 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	virtual void set_height (uint32_t);
 	void set_samples_per_unit (double);
-	bool set_visibility (bool yn);
 	std::string name() const { return _name; }
 
-	void add_automation_event (ArdourCanvas::Item *item, GdkEvent *event, framepos_t, double);
+	void add_automation_event (GdkEvent *, framepos_t, double);
 
 	void clear_lines ();
 
@@ -98,14 +97,15 @@ class AutomationTimeAxisView : public TimeAxisView {
 	void reset_objects (PointSelection&);
 
 	int  set_state (const XMLNode&, int version);
-	guint32 show_at (double y, int& nth, Gtk::VBox *parent);
-	void hide ();
 
-	static const std::string state_node_name;
-	XMLNode* get_state_node();
+	std::string state_id() const;
+	static bool parse_state_id (std::string const &, PBD::ID &, bool &, Evoral::Parameter &);
 
 	boost::shared_ptr<ARDOUR::AutomationControl> control()    { return _control; }
 	boost::shared_ptr<AutomationController>      controller() { return _controller; }
+	Evoral::Parameter parameter () const {
+		return _parameter;
+	}
 
 	ArdourCanvas::Item* base_item () const {
 		return _base_rect;
@@ -117,15 +117,22 @@ class AutomationTimeAxisView : public TimeAxisView {
 		return _route;
 	}
 
+	bool show_regions () const {
+		return _show_regions;
+	}
+
+	static void what_has_visible_automation (const boost::shared_ptr<ARDOUR::Automatable>& automatable, std::set<Evoral::Parameter>& visible);
+
   protected:
-	/** parent route *
+	/** parent route */
 	boost::shared_ptr<ARDOUR::Route> _route;
 	/** control; 0 if we are editing region-based automation */
-	boost::shared_ptr<ARDOUR::AutomationControl> _control; ///< Control
+	boost::shared_ptr<ARDOUR::AutomationControl> _control;
 	/** control owner; may be _route, or 0 if we are editing region-based automation */
 	boost::shared_ptr<ARDOUR::Automatable> _automatable;
 	/** controller owner; 0 if we are editing region-based automation */
 	boost::shared_ptr<AutomationController> _controller;
+	Evoral::Parameter _parameter;
 
 	ArdourCanvas::SimpleRect* _base_rect;
 	boost::shared_ptr<AutomationLine> _line;
@@ -152,6 +159,8 @@ class AutomationTimeAxisView : public TimeAxisView {
 	Gtk::CheckMenuItem* mode_discrete_item;
 	Gtk::CheckMenuItem* mode_line_item;
 
+	bool _show_regions;
+
 	void add_line (boost::shared_ptr<AutomationLine>);
 
 	void clear_clicked ();
@@ -164,6 +173,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	void cut_copy_clear_objects_one (AutomationLine&, PointSelection&, Editing::CutCopyOp);
 	bool paste_one (AutomationLine&, ARDOUR::framepos_t, float times, Selection&, size_t nth);
 	void reset_objects_one (AutomationLine&, PointSelection&);
+	void route_going_away ();
 
 	void set_automation_state (ARDOUR::AutoState);
 	bool ignore_state_request;
@@ -174,8 +184,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	void interpolation_changed (ARDOUR::AutomationList::InterpolationStyle);
 
 	PBD::ScopedConnectionList _list_connections;
-
-	void update_extra_xml_shown (bool editor_shown);
+	PBD::ScopedConnectionList _route_connections;
 
 	void entered ();
 	void exited ();
@@ -183,7 +192,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	//void set_colors ();
 	void color_handler ();
 
-	static Pango::FontDescription* name_font;
+	static Pango::FontDescription name_font;
 	static bool have_name_font;
 
 private: