X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.h;h=c169cb59d09aa76da90d2b14531723c46086caf2;hb=c123829c0a8d483f4c53c2231e04c51e41e604df;hp=d1a465238a656f4d195a3c8468a266f6b5557d44;hpb=32df6209384bf99a04b2e1e227e325700bc45eed;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index d1a465238a..c169cb59d0 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -30,9 +30,9 @@
 #include "ardour/automatable.h"
 #include "ardour/automation_list.h"
 
-#include "canvas.h"
+#include "canvas/rectangle.h"
+
 #include "time_axis_view.h"
-#include "simplerect.h"
 #include "automation_controller.h"
 
 namespace ARDOUR {
@@ -69,11 +69,10 @@ class AutomationTimeAxisView : public TimeAxisView {
 	~AutomationTimeAxisView();
 
 	virtual void set_height (uint32_t);
-	void set_samples_per_unit (double);
-	bool set_visibility (bool yn);
+	void set_samples_per_pixel (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, bool with_guard_points);
 
 	void clear_lines ();
 
@@ -87,22 +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);
-	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; }
@@ -120,6 +115,12 @@ 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 */
 	boost::shared_ptr<ARDOUR::Route> _route;
@@ -131,15 +132,15 @@ class AutomationTimeAxisView : public TimeAxisView {
 	boost::shared_ptr<AutomationController> _controller;
 	Evoral::Parameter _parameter;
 
-	ArdourCanvas::SimpleRect* _base_rect;
+	ArdourCanvas::Rectangle* _base_rect;
 	boost::shared_ptr<AutomationLine> _line;
 
+	std::string _name;
+
 	/** AutomationStreamView if we are editing region-based automation (for MIDI), otherwise 0 */
 	AutomationStreamView* _view;
 
-	std::string _name;
 	bool    ignore_toggle;
-
 	bool    first_call_to_set_height;
 
 	Gtk::Button        hide_button;
@@ -156,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 ();
@@ -165,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);
@@ -181,15 +182,13 @@ class AutomationTimeAxisView : public TimeAxisView {
 	PBD::ScopedConnectionList _list_connections;
 	PBD::ScopedConnectionList _route_connections;
 
-	void update_extra_xml_shown (bool editor_shown);
-
 	void entered ();
 	void exited ();
 
 	//void set_colors ();
 	void color_handler ();
 
-	static Pango::FontDescription* name_font;
+	static Pango::FontDescription name_font;
 	static bool have_name_font;
 
 private: