X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.h;h=1093fd18b4db9a28924ba6db764f7f6094ab0090;hb=7ad62ffbedb360260fd706b47849224b2e26ef6d;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..1093fd18b4 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -34,6 +34,8 @@
 
 #include "time_axis_view.h"
 #include "automation_controller.h"
+#include "ardour_button.h"
+#include "ardour_dropdown.h"
 
 namespace ARDOUR {
 	class Session;
@@ -50,7 +52,7 @@ class Selection;
 class Selectable;
 class AutomationStreamView;
 class AutomationController;
-
+class ItemCounts;
 
 class AutomationTimeAxisView : public TimeAxisView {
   public:
@@ -68,11 +70,15 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	~AutomationTimeAxisView();
 
-	virtual void set_height (uint32_t);
+	virtual void set_height (uint32_t, TrackHeightMode m = OnlySelf);
 	void set_samples_per_pixel (double);
 	std::string name() const { return _name; }
+	Gdk::Color color () const;
+
+	boost::shared_ptr<ARDOUR::Stripable> stripable() const;
+	ARDOUR::PresentationInfo const & presentation_info () const;
 
-	void add_automation_event (GdkEvent *, framepos_t, double);
+        void add_automation_event (GdkEvent *, framepos_t, double, bool with_guard_points);
 
 	void clear_lines ();
 
@@ -83,7 +89,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	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_selectables (ARDOUR::framepos_t start, ARDOUR::framepos_t end, double top, double bot, std::list<Selectable *>&, bool within = false);
 	void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
 
 	void show_timestretch (framepos_t /*start*/, framepos_t /*end*/, int /*layers*/, int /*layer*/) {}
@@ -92,7 +98,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&, const int32_t sub_num);
 
 	int  set_state (const XMLNode&, int version);
 
@@ -122,13 +128,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,9 +153,8 @@ class AutomationTimeAxisView : public TimeAxisView {
 	bool    ignore_toggle;
 	bool    first_call_to_set_height;
 
-	Gtk::Button        hide_button;
-	Gtk::Button        auto_button;
-	Gtk::Menu*         automation_menu;
+	ArdourButton       hide_button;
+	ArdourDropdown     auto_dropdown;
 	Gtk::Label*        plugname;
 	bool               plugname_packed;
 
@@ -163,12 +172,13 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	void clear_clicked ();
 	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);