X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.h;h=f1a9a8bd57327a35a7da6c81d9b4cb02f53a6196;hb=f80859f3bdcb5c3b982379481ae3999446f35e81;hp=3e3fbde35c54b9ffe246acdf8602c911483acb8d;hpb=106024330230fca331e2f611fec42ec1f4f43e5a;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 3e3fbde35c..f1a9a8bd57 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -72,7 +72,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	void set_samples_per_unit (double);
 	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 ();
 
@@ -86,21 +86,18 @@ class AutomationTimeAxisView : public TimeAxisView {
 	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 (framepos_t /*start*/, framepos_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);
 
-	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; }
@@ -118,6 +115,10 @@ 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:
@@ -156,8 +157,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	Gtk::CheckMenuItem* mode_discrete_item;
 	Gtk::CheckMenuItem* mode_line_item;
 
-	void hide ();
-	void show ();
+	bool _show_regions;
 
 	void add_line (boost::shared_ptr<AutomationLine>);
 
@@ -168,9 +168,7 @@ 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);
@@ -184,8 +182,6 @@ class AutomationTimeAxisView : public TimeAxisView {
 	PBD::ScopedConnectionList _list_connections;
 	PBD::ScopedConnectionList _route_connections;
 
-	void update_extra_xml_shown (bool editor_shown);
-
 	void entered ();
 	void exited ();