X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=a05a7b918058b493def596db721c278c5f9d5d1c;hb=1c5f395c01270cfae0397d56ceb63a104d34b1a0;hp=3e0f0f4bb3c364b0a163f6d7b9f6a2180b943ed1;hpb=37dd777c9acf3d80a6fb0f2b20e10fb0de61414d;p=ardour.git

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 3e0f0f4bb3..a05a7b9180 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -34,6 +34,7 @@
 
 #include "pbd/undo.h"
 #include "pbd/statefuldestructible.h"
+#include "pbd/memento_command.h"
 
 #include "ardour/automation_list.h"
 #include "ardour/types.h"
@@ -52,23 +53,22 @@ namespace Gnome {
 	}
 }
 
+/** A GUI representation of an ARDOUR::AutomationList */
 class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 {
   public:
 	AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&,
 			boost::shared_ptr<ARDOUR::AutomationList>,
-			const Evoral::TimeConverter<double, ARDOUR::sframes_t>* converter = 0);
+			const Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0);
 	virtual ~AutomationLine ();
 
 	void queue_reset ();
 	void reset ();
-	void clear();
+	void clear ();
 
 	std::list<ControlPoint*> point_selection_to_control_points (PointSelection const &); 
 	void set_selected_points (PointSelection&);
-	void get_selectables (nframes_t& start, nframes_t& end,
-			      double botfrac, double topfrac,
-			      std::list<Selectable*>& results);
+	void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable*>&);
 	void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
 
 	virtual void remove_point (ControlPoint&);
@@ -82,6 +82,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	virtual void end_drag ();
 
 	ControlPoint* nth (uint32_t);
+	ControlPoint const * nth (uint32_t) const;
 	uint32_t npoints() const { return control_points.size(); }
 
 	std::string  name()    const { return _name; }
@@ -91,8 +92,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	void     set_line_color (uint32_t);
 	uint32_t get_line_color() const { return _line_color; }
 
-	void set_interpolation(ARDOUR::AutomationList::InterpolationStyle style);
-
 	void    show ();
 	void    hide ();
 	void    set_height (guint32);
@@ -109,6 +108,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	std::string fraction_to_string (double) const;
 	double string_to_fraction (std::string const &) const;
 	void   view_to_model_coord (double& x, double& y) const;
+	void   view_to_model_coord_y (double &) const;
 	void   model_to_view_coord (double& x, double& y) const;
 
 	void set_list(boost::shared_ptr<ARDOUR::AutomationList> list);
@@ -132,6 +132,22 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	void add_always_in_view (double);
 	void clear_always_in_view ();
 
+	virtual MementoCommandBinder<ARDOUR::AutomationList>* memento_command_binder ();
+
+	const Evoral::TimeConverter<double, ARDOUR::framepos_t>& time_converter () const {
+		return _time_converter;
+	}
+
+	std::pair<ARDOUR::framepos_t, ARDOUR::framepos_t> get_point_x_range () const;
+
+	void set_maximum_time (ARDOUR::framecnt_t);
+ 	ARDOUR::framecnt_t maximum_time () const {
+		return _maximum_time;
+	}
+
+	void set_offset (ARDOUR::framecnt_t);
+	void set_width (ARDOUR::framecnt_t);
+	
   protected:
 
 	std::string    _name;
@@ -145,6 +161,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	bool    terminal_points_can_slide : 1;
 	bool    update_pending            : 1;
 	bool    no_draw                   : 1;
+	bool    _is_boolean               : 1;
 	bool    points_visible            : 1;
 	bool    did_push;
 
@@ -174,10 +191,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 
 	void reset_callback (const Evoral::ControlList&);
 	void list_changed ();
-	PBD::ScopedConnection _state_connection;
 
 	virtual bool event_handler (GdkEvent*);
-	virtual void add_model_point (ALPoints& tmp_points, double frame, double yfract);
 
   private:
 	std::list<ControlPoint*> _drag_points; ///< points we are dragging
@@ -187,14 +202,18 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	double _drag_distance; ///< total x movement of the drag, in units
 	double _last_drag_fraction; ///< last y position of the drag, as a fraction
 	std::list<double> _always_in_view;
+	/** offset from the start of the automation list to the start of the line, so that
+	 *  a +ve offset means that the 0 on the line is at _offset in the list
+	 */
+	ARDOUR::framecnt_t _offset;
 
-	const Evoral::TimeConverter<double, ARDOUR::sframes_t>& _time_converter;
-	ARDOUR::AutomationList::InterpolationStyle              _interpolation;
+	const Evoral::TimeConverter<double, ARDOUR::framepos_t>& _time_converter;
 
 	void reset_line_coords (ControlPoint&);
 	void add_visible_control_point (uint32_t, uint32_t, double, double, ARDOUR::AutomationList::iterator, uint32_t);
-
 	double control_point_box_size ();
+	void connect_to_list ();
+	void interpolation_changed (ARDOUR::AutomationList::InterpolationStyle);
 
 	struct ModelRepresentation {
 	    ARDOUR::AutomationList::iterator start;
@@ -211,6 +230,11 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 
 	void model_representation (ControlPoint&, ModelRepresentation&);
 
+	PBD::ScopedConnectionList _list_connections;
+
+	/** maximum time that a point on this line can be at, relative to the position of its region or start of its track */
+	ARDOUR::framecnt_t _maximum_time;
+	
 	friend class AudioRegionGainLine;
 };