X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=57d90a1edc33149266a1f7ffa8f7126005ab9785;hb=0140b24248e95f1e7ddc15ce2ec9a466aebfa6a1;hp=07b8df51483349a2671004cbec93572d5fcf8301;hpb=fd36355e2cd95550a0f7d9b7a6f5e3bc2fcc7fa2;p=ardour.git

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 07b8df5148..57d90a1edc 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -66,7 +66,7 @@ public:
 	                ArdourCanvas::Item&                                parent,
 	                boost::shared_ptr<ARDOUR::AutomationList>          al,
 	                const ARDOUR::ParameterDescriptor&                 desc,
-	                Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0);
+	                Evoral::TimeConverter<double, ARDOUR::samplepos_t>* converter = 0);
 
 	virtual ~AutomationLine ();
 
@@ -76,7 +76,7 @@ public:
 	void set_fill (bool f) { _fill = f; } // owner needs to call set_height
 
 	void set_selected_points (PointSelection const &);
-	void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable*>&);
+	void get_selectables (ARDOUR::samplepos_t, ARDOUR::samplepos_t, double, double, std::list<Selectable*>&);
 	void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
 
 	virtual void remove_point (ControlPoint&);
@@ -145,31 +145,31 @@ public:
 
 	virtual MementoCommandBinder<ARDOUR::AutomationList>* memento_command_binder ();
 
-	const Evoral::TimeConverter<double, ARDOUR::framepos_t>& time_converter () const {
+	const Evoral::TimeConverter<double, ARDOUR::samplepos_t>& time_converter () const {
 		return *_time_converter;
 	}
 
-	std::pair<ARDOUR::framepos_t, ARDOUR::framepos_t> get_point_x_range () const;
+	std::pair<ARDOUR::samplepos_t, ARDOUR::samplepos_t> get_point_x_range () const;
 
-	void set_maximum_time (ARDOUR::framecnt_t);
-	ARDOUR::framecnt_t maximum_time () const {
+	void set_maximum_time (ARDOUR::samplecnt_t);
+	ARDOUR::samplecnt_t maximum_time () const {
 		return _maximum_time;
 	}
 
-	void set_offset (ARDOUR::framecnt_t);
-	ARDOUR::framecnt_t offset () { return _offset; }
-	void set_width (ARDOUR::framecnt_t);
+	void set_offset (ARDOUR::samplecnt_t);
+	ARDOUR::samplecnt_t offset () { return _offset; }
+	void set_width (ARDOUR::samplecnt_t);
 
-	framepos_t session_position (ARDOUR::AutomationList::const_iterator) const;
+	samplepos_t session_position (ARDOUR::AutomationList::const_iterator) const;
 
 protected:
 
 	std::string    _name;
-	guint32   _height;
-	uint32_t  _line_color;
+	guint32        _height;
+	uint32_t       _line_color;
 
 	boost::shared_ptr<ARDOUR::AutomationList> alist;
-	Evoral::TimeConverter<double, ARDOUR::framepos_t>* _time_converter;
+	Evoral::TimeConverter<double, ARDOUR::samplepos_t>* _time_converter;
 	/** true if _time_converter belongs to us (ie we should delete it on destruction) */
 	bool _our_time_converter;
 
@@ -183,8 +183,8 @@ protected:
 	/** true if we did a push at any point during the current drag */
 	bool    did_push;
 
-	ArdourCanvas::Item&        _parent_group;
-	ArdourCanvas::Container*       group;
+	ArdourCanvas::Item&         _parent_group;
+	ArdourCanvas::Container*    group;
 	ArdourCanvas::PolyLine*     line; /* line */
 	ArdourCanvas::Points        line_points; /* coordinates for canvas line */
 	std::vector<ControlPoint*>  control_points; /* visible control points */
@@ -225,7 +225,7 @@ private:
 	/** 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;
+	ARDOUR::samplecnt_t _offset;
 
 	bool is_stepped() const;
 	void update_visibility ();
@@ -238,7 +238,7 @@ private:
 	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;
+	ARDOUR::samplecnt_t _maximum_time;
 
 	bool _fill;