X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.h;h=b726de64405c98c6eb03b2015c0f648f06acd81c;hb=057cf770f0dd57e1594725448b3da2b77d675e55;hp=343c6b5e5cd2d854bf418a4b073f63a52970ffda;hpb=f4b5f4c72ee60b6f509e307c5bfd164108d1f30b;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 343c6b5e5c..b726de6440 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -34,6 +34,7 @@
 
 #include "time_axis_view.h"
 #include "automation_controller.h"
+#include "ardour_button.h"
 
 namespace ARDOUR {
 	class Session;
@@ -50,7 +51,7 @@ class Selection;
 class Selectable;
 class AutomationStreamView;
 class AutomationController;
-
+class ItemCounts;
 
 class AutomationTimeAxisView : public TimeAxisView {
   public:
@@ -72,7 +73,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	void set_samples_per_pixel (double);
 	std::string name() const { return _name; }
 
-	void add_automation_event (GdkEvent *, framepos_t, double);
+        void add_automation_event (GdkEvent *, framepos_t, double, bool with_guard_points);
 
 	void clear_lines ();
 
@@ -92,7 +93,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	/* editing operations */
 
 	void cut_copy_clear (Selection&, Editing::CutCopyOp);
-	bool paste (ARDOUR::framepos_t, float times, Selection&, size_t nth);
+	bool paste (ARDOUR::framepos_t, const Selection&, PasteContext&);
 
 	int  set_state (const XMLNode&, int version);
 
@@ -122,13 +123,17 @@ class AutomationTimeAxisView : public TimeAxisView {
 	static void what_has_visible_automation (const boost::shared_ptr<ARDOUR::Automatable>& automatable, std::set<Evoral::Parameter>& visible);
 
   protected:
+	/* Note that for MIDI controller "automation" (in regions), all of these
+	   may be set.  In this case, _automatable is likely _route so the
+	   controller will send immediate events out the route's MIDI port. */
+
 	/** parent route */
 	boost::shared_ptr<ARDOUR::Route> _route;
-	/** control; 0 if we are editing region-based automation */
+	/** control */
 	boost::shared_ptr<ARDOUR::AutomationControl> _control;
-	/** control owner; may be _route, or 0 if we are editing region-based automation */
+	/** control owner; may be _route, something else (e.g. a pan control), or NULL */
 	boost::shared_ptr<ARDOUR::Automatable> _automatable;
-	/** controller owner; 0 if we are editing region-based automation */
+	/** controller owner */
 	boost::shared_ptr<AutomationController> _controller;
 	Evoral::Parameter _parameter;
 
@@ -143,8 +148,8 @@ class AutomationTimeAxisView : public TimeAxisView {
 	bool    ignore_toggle;
 	bool    first_call_to_set_height;
 
-	Gtk::Button        hide_button;
-	Gtk::Button        auto_button;
+	ArdourButton       hide_button;
+	ArdourButton       auto_button;
 	Gtk::Menu*         automation_menu;
 	Gtk::Label*        plugname;
 	bool               plugname_packed;
@@ -165,10 +170,12 @@ class AutomationTimeAxisView : public TimeAxisView {
 	void hide_clicked ();
 	void auto_clicked ();
 
+	virtual bool can_edit_name() const {return false;}
+
 	void build_display_menu ();
 
 	void cut_copy_clear_one (AutomationLine&, Selection&, Editing::CutCopyOp);
-	bool paste_one (AutomationLine&, ARDOUR::framepos_t, float times, Selection&, size_t nth);
+	bool paste_one (ARDOUR::framepos_t, unsigned, float times, const Selection&, ItemCounts& counts, bool greedy=false);
 	void route_going_away ();
 
 	void set_automation_state (ARDOUR::AutoState);