X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.h;h=7fc9c2575aaf2879adfa7f05e6a0e87c45148315;hb=459eda7e11e4b8fa9767dc8a3e2b1228dc54078e;hp=9d4802f6fca3133f982aab443b75937822007e54;hpb=a57b9cdd99b47fde8bfa265c0f72a380bb5cbb6f;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 9d4802f6fc..7fc9c2575a 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -58,6 +58,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 				boost::shared_ptr<ARDOUR::Route>,
 				boost::shared_ptr<ARDOUR::Automatable>,
 				boost::shared_ptr<ARDOUR::AutomationControl>,
+				Evoral::Parameter,
 				PublicEditor&,
 				TimeAxisView& parent,
 				bool show_regions,
@@ -72,23 +73,28 @@ class AutomationTimeAxisView : public TimeAxisView {
 	bool set_visibility (bool yn);
 	std::string name() const { return _name; }
 
-	void add_automation_event (ArdourCanvas::Item *item, GdkEvent *event, nframes_t, double);
+	void add_automation_event (ArdourCanvas::Item *item, GdkEvent *event, framepos_t, double);
 
 	void clear_lines ();
+
+	/** @return Our AutomationLine, if this view has one, or 0 if it uses AutomationRegionViews */
 	boost::shared_ptr<AutomationLine> line() { return _line; }
 
+	/** @return All AutomationLines associated with this view */
+	std::list<boost::shared_ptr<AutomationLine> > lines () const;
+
 	void set_selected_points (PointSelection&);
-	void get_selectables (nframes_t start, nframes_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 *>&);
 	void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
 
-	void show_timestretch (nframes_t /*start*/, nframes_t /*end*/) {}
+	void show_timestretch (framepos_t /*start*/, framepos_t /*end*/) {}
 	void hide_timestretch () {}
 
 	/* editing operations */
 
-	bool cut_copy_clear (Selection&, Editing::CutCopyOp);
-	bool cut_copy_clear_objects (PointSelection&, Editing::CutCopyOp);
-	bool paste (nframes_t, float times, Selection&, size_t nth);
+	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);
@@ -100,6 +106,9 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	boost::shared_ptr<ARDOUR::AutomationControl> control()    { return _control; }
 	boost::shared_ptr<AutomationController>      controller() { return _controller; }
+	Evoral::Parameter parameter () const {
+		return _parameter;
+	}
 
 	ArdourCanvas::Item* base_item () const {
 		return _base_rect;
@@ -107,16 +116,26 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	bool has_automation () const;
 
-  protected:
-	boost::shared_ptr<ARDOUR::Route> _route; ///< Parent route
-	boost::shared_ptr<ARDOUR::AutomationControl> _control; ///< Control
-	boost::shared_ptr<ARDOUR::Automatable> _automatable; ///< Control owner, maybe = _route
+	boost::shared_ptr<ARDOUR::Route> parent_route () {
+		return _route;
+	}
 
+  protected:
+	/** parent route */
+	boost::shared_ptr<ARDOUR::Route> _route;
+	/** control; 0 if we are editing region-based automation */
+	boost::shared_ptr<ARDOUR::AutomationControl> _control;
+	/** control owner; may be _route, or 0 if we are editing region-based automation */
+	boost::shared_ptr<ARDOUR::Automatable> _automatable;
+	/** controller owner; 0 if we are editing region-based automation */
 	boost::shared_ptr<AutomationController> _controller;
+	Evoral::Parameter _parameter;
 
 	ArdourCanvas::SimpleRect* _base_rect;
 	boost::shared_ptr<AutomationLine> _line;
-	AutomationStreamView*             _view;
+
+	/** AutomationStreamView if we are editing region-based automation (for MIDI), otherwise 0 */
+	AutomationStreamView* _view;
 
 	std::string _name;
 	bool    ignore_toggle;
@@ -145,9 +164,9 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	void build_display_menu ();
 
-	bool cut_copy_clear_one (AutomationLine&, Selection&, Editing::CutCopyOp);
-	bool cut_copy_clear_objects_one (AutomationLine&, PointSelection&, Editing::CutCopyOp);
-	bool paste_one (AutomationLine&, nframes_t, float times, Selection&, size_t nth);
+	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 set_automation_state (ARDOUR::AutoState);
@@ -156,9 +175,9 @@ class AutomationTimeAxisView : public TimeAxisView {
 	void automation_state_changed ();
 
 	void set_interpolation (ARDOUR::AutomationList::InterpolationStyle);
-	void interpolation_changed ();
+	void interpolation_changed (ARDOUR::AutomationList::InterpolationStyle);
 
-	PBD::ScopedConnection automation_connection;
+	PBD::ScopedConnectionList _list_connections;
 
 	void update_extra_xml_shown (bool editor_shown);
 
@@ -170,6 +189,9 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	static Pango::FontDescription* name_font;
 	static bool have_name_font;
+
+private:
+	int set_state_2X (const XMLNode &, int);
 };
 
 #endif /* __ardour_gtk_automation_time_axis_h__ */