X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=6fea1699ccd1a12460014189e9f2c79305a35a6f;hb=e490a1a2785f6d5aa3f8b3e600ce2e614c3a6077;hp=efc25eb84b5d247bffdd3372efd62d47fe87483a;hpb=66062a85b6388b28ed04f90bab3d302eec0f2a77;p=ardour.git

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index efc25eb84b..6fea1699cc 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -59,18 +59,16 @@ 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&);
@@ -84,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; }
@@ -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);
@@ -134,6 +134,17 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 
 	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::framepos_t);
+ 	ARDOUR::framepos_t maximum_time () const {
+		return _maximum_time;
+	}
+	
   protected:
 
 	std::string    _name;
@@ -147,6 +158,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;
 
@@ -189,7 +201,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	double _last_drag_fraction; ///< last y position of the drag, as a fraction
 	std::list<double> _always_in_view;
 
-	const Evoral::TimeConverter<double, ARDOUR::sframes_t>& _time_converter;
+	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);
@@ -213,6 +225,9 @@ 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 start of its region or track */
+	ARDOUR::framecnt_t _maximum_time;
 	
 	friend class AudioRegionGainLine;
 };