X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.h;h=f1a9a8bd57327a35a7da6c81d9b4cb02f53a6196;hb=c5fd217a4acc83fe3b52824cdc809d0de093f941;hp=55fcb142026fd54229413564c5874d20d5b93870;hpb=136b8ed74721957e9617885fe156e6b8657116bd;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 55fcb14202..f1a9a8bd57 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -58,6 +58,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 				boost::shared_ptr<ARDOUR::Route>,
 				boost::shared_ptr<ARDOUR::Automatable>,
 				boost::shared_ptr<ARDOUR::AutomationControl>,
+				Evoral::Parameter,
 				PublicEditor&,
 				TimeAxisView& parent,
 				bool show_regions,
@@ -69,37 +70,40 @@ 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, nframes_t, double);
+	void add_automation_event (GdkEvent *, framepos_t, double);
 
 	void clear_lines ();
+
+	/** @return Our AutomationLine, if this view has one, or 0 if it uses AutomationRegionViews */
 	boost::shared_ptr<AutomationLine> line() { return _line; }
 
+	/** @return All AutomationLines associated with this view */
+	std::list<boost::shared_ptr<AutomationLine> > lines () const;
+
 	void set_selected_points (PointSelection&);
 	void get_selectables (ARDOUR::framepos_t start, ARDOUR::framepos_t end, double top, double bot, std::list<Selectable *>&);
 	void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
 
-	void show_timestretch (nframes_t /*start*/, nframes_t /*end*/) {}
+	void show_timestretch (framepos_t /*start*/, framepos_t /*end*/, int /*layers*/, int /*layer*/) {}
 	void hide_timestretch () {}
 
 	/* editing operations */
 
 	void cut_copy_clear (Selection&, Editing::CutCopyOp);
-	void cut_copy_clear_objects (PointSelection&, Editing::CutCopyOp);
 	bool paste (ARDOUR::framepos_t, float times, Selection&, size_t nth);
-	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;
@@ -111,15 +115,26 @@ class AutomationTimeAxisView : public TimeAxisView {
 		return _route;
 	}
 
-  protected:
-	boost::shared_ptr<ARDOUR::Route> _route; ///< Parent route
-	boost::shared_ptr<ARDOUR::AutomationControl> _control; ///< Control
-	boost::shared_ptr<ARDOUR::Automatable> _automatable; ///< Control owner, maybe = _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 */
+	boost::shared_ptr<ARDOUR::Route> _route;
+	/** control; 0 if we are editing region-based automation */
+	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;
+
 	/** AutomationStreamView if we are editing region-based automation (for MIDI), otherwise 0 */
 	AutomationStreamView* _view;
 
@@ -142,6 +157,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 ();
@@ -151,9 +168,8 @@ class AutomationTimeAxisView : public TimeAxisView {
 	void build_display_menu ();
 
 	void cut_copy_clear_one (AutomationLine&, Selection&, Editing::CutCopyOp);
-	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;
@@ -164,8 +180,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 ();
@@ -173,7 +188,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: