X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.h;h=cabe532646a29061cded840882b4ff916108442d;hb=cba53a20233531ef3e6c3692993eac8f74e991a1;hp=aef1300405c771c7aa9457d1fb9562848dd5087f;hpb=ced4378d0914bcfb926267772c45d1d23f3bed38;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index aef1300405..cabe532646 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -32,13 +32,15 @@
 
 #include "canvas/rectangle.h"
 
+#include "widgets/ardour_button.h"
+#include "widgets/ardour_dropdown.h"
+
 #include "time_axis_view.h"
 #include "automation_controller.h"
-#include "ardour_button.h"
 
 namespace ARDOUR {
 	class Session;
-	class Route;
+	class Stripable;
 	class AutomationControl;
 }
 
@@ -53,27 +55,32 @@ class AutomationStreamView;
 class AutomationController;
 class ItemCounts;
 
-class AutomationTimeAxisView : public TimeAxisView {
-  public:
+class AutomationTimeAxisView : public TimeAxisView
+{
+public:
 	AutomationTimeAxisView (ARDOUR::Session*,
-				boost::shared_ptr<ARDOUR::Route>,
-				boost::shared_ptr<ARDOUR::Automatable>,
-				boost::shared_ptr<ARDOUR::AutomationControl>,
-				Evoral::Parameter,
-				PublicEditor&,
-				TimeAxisView& parent,
-				bool show_regions,
-				ArdourCanvas::Canvas& canvas,
-				const std::string & name, /* translatable */
-				const std::string & plug_name = "");
+	                        boost::shared_ptr<ARDOUR::Stripable>,
+	                        boost::shared_ptr<ARDOUR::Automatable>,
+	                        boost::shared_ptr<ARDOUR::AutomationControl>,
+	                        Evoral::Parameter,
+	                        PublicEditor&,
+	                        TimeAxisView& parent,
+	                        bool show_regions,
+	                        ArdourCanvas::Canvas& canvas,
+	                        const std::string & name, /* translatable */
+	                        const std::string & plug_name = "");
 
 	~AutomationTimeAxisView();
 
 	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, bool with_guard_points);
+	void add_automation_event (GdkEvent *, framepos_t, double, bool with_guard_points);
 
 	void clear_lines ();
 
@@ -93,15 +100,15 @@ class AutomationTimeAxisView : public TimeAxisView {
 	/* editing operations */
 
 	void cut_copy_clear (Selection&, Editing::CutCopyOp);
-	bool paste (ARDOUR::framepos_t, const Selection&, PasteContext&);
+	bool paste (ARDOUR::framepos_t, const Selection&, PasteContext&, const int32_t sub_num);
 
 	int  set_state (const XMLNode&, int version);
 
 	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; }
+	boost::shared_ptr<ARDOUR::AutomationControl> control() const   { return _control; }
+	boost::shared_ptr<AutomationController>      controller() const { return _controller; }
 	Evoral::Parameter parameter () const {
 		return _parameter;
 	}
@@ -112,8 +119,8 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	bool has_automation () const;
 
-	boost::shared_ptr<ARDOUR::Route> parent_route () {
-		return _route;
+	boost::shared_ptr<ARDOUR::Stripable> parent_stripable () {
+		return _stripable;
 	}
 
 	bool show_regions () const {
@@ -122,16 +129,16 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	static void what_has_visible_automation (const boost::shared_ptr<ARDOUR::Automatable>& automatable, std::set<Evoral::Parameter>& visible);
 
-  protected:
+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. */
+	 * 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;
+	/** parent strip */
+	boost::shared_ptr<ARDOUR::Stripable> _stripable;
 	/** control */
 	boost::shared_ptr<ARDOUR::AutomationControl> _control;
-	/** control owner; may be _route, something else (e.g. a pan control), or NULL */
+	/** control owner; may be _stripable, something else (e.g. a pan control), or NULL */
 	boost::shared_ptr<ARDOUR::Automatable> _automatable;
 	/** controller owner */
 	boost::shared_ptr<AutomationController> _controller;
@@ -148,9 +155,8 @@ class AutomationTimeAxisView : public TimeAxisView {
 	bool    ignore_toggle;
 	bool    first_call_to_set_height;
 
-	ArdourButton       hide_button;
-	ArdourButton       auto_button;
-	Gtk::Menu*         automation_menu;
+	ArdourWidgets::ArdourButton   hide_button;
+	ArdourWidgets::ArdourDropdown auto_dropdown;
 	Gtk::Label*        plugname;
 	bool               plugname_packed;
 
@@ -158,9 +164,12 @@ class AutomationTimeAxisView : public TimeAxisView {
 	Gtk::CheckMenuItem*     auto_play_item;
 	Gtk::CheckMenuItem*     auto_touch_item;
 	Gtk::CheckMenuItem*     auto_write_item;
+	Gtk::CheckMenuItem*     auto_latch_item;
 
 	Gtk::CheckMenuItem* mode_discrete_item;
 	Gtk::CheckMenuItem* mode_line_item;
+	Gtk::CheckMenuItem* mode_log_item;
+	Gtk::CheckMenuItem* mode_exp_item;
 
 	bool _show_regions;
 
@@ -168,7 +177,6 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	void clear_clicked ();
 	void hide_clicked ();
-	void auto_clicked ();
 
 	virtual bool can_edit_name() const {return false;}
 
@@ -180,6 +188,9 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	void set_automation_state (ARDOUR::AutoState);
 	bool ignore_state_request;
+	bool ignore_mode_request;
+
+	bool propagate_time_selection () const;
 
 	void automation_state_changed ();
 
@@ -187,7 +198,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 	void interpolation_changed (ARDOUR::AutomationList::InterpolationStyle);
 
 	PBD::ScopedConnectionList _list_connections;
-	PBD::ScopedConnectionList _route_connections;
+	PBD::ScopedConnectionList _stripable_connections;
 
 	void entered ();
 	void exited ();
@@ -198,6 +209,8 @@ class AutomationTimeAxisView : public TimeAxisView {
 	static Pango::FontDescription name_font;
 	static bool have_name_font;
 
+	std::string automation_state_off_string () const;
+
 private:
 	int set_state_2X (const XMLNode &, int);
 };