X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=315f7daf1226a8b32121302a19a4c67158adf641;hb=746665e89cf66c5688cd584555168bb8323b824e;hp=8554d487ee877208c3369420db297112cc667fd3;hpb=b3ea22fc3f91e39cf7994ba2fb328a899d58d7ea;p=ardour.git

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 8554d487ee..315f7daf12 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -60,7 +60,7 @@ public:
 		ControlPoints = 0x2,
 		SelectedControlPoints = 0x4
 	};
-	
+
 	AutomationLine (const std::string&                                 name,
 	                TimeAxisView&                                      tv,
 	                ArdourCanvas::Item&                                parent,
@@ -73,6 +73,7 @@ public:
 	void queue_reset ();
 	void reset ();
 	void clear ();
+	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*>&);
@@ -85,7 +86,7 @@ public:
 	virtual void start_drag_single (ControlPoint*, double, float);
 	virtual void start_drag_line (uint32_t, uint32_t, float);
 	virtual void start_drag_multiple (std::list<ControlPoint*>, float, XMLNode *);
-	virtual std::pair<double, float> drag_motion (double, float, bool, bool with_push, uint32_t& final_index);
+	virtual std::pair<float, float> drag_motion (double, float, bool, bool with_push, uint32_t& final_index);
 	virtual void end_drag (bool with_push, uint32_t final_index);
 
 	ControlPoint* nth (uint32_t);
@@ -105,8 +106,8 @@ public:
 
 	void hide ();
 	void set_height (guint32);
-	void set_uses_gain_mapping (bool yn);
-	bool get_uses_gain_mapping () const { return _uses_gain_mapping; }
+
+	bool get_uses_gain_mapping () const;
 
 	TimeAxisView& trackview;
 
@@ -117,13 +118,16 @@ public:
 	virtual std::string get_verbose_cursor_string (double) const;
 	std::string get_verbose_cursor_relative_string (double, double) const;
 	std::string fraction_to_string (double) const;
-	std::string fraction_to_relative_string (double, double) const;
+	std::string delta_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   model_to_view_coord_y (double &) const;
 
+	double compute_delta (double from, double to) const;
+	void   apply_delta (double& val, double delta) const;
+
 	void set_list(boost::shared_ptr<ARDOUR::AutomationList> list);
 	boost::shared_ptr<ARDOUR::AutomationList> the_list() const { return alist; }
 
@@ -153,6 +157,7 @@ public:
 	}
 
 	void set_offset (ARDOUR::framecnt_t);
+	ARDOUR::framecnt_t offset () { return _offset; }
 	void set_width (ARDOUR::framecnt_t);
 
 	framepos_t session_position (ARDOUR::AutomationList::const_iterator) const;
@@ -160,8 +165,8 @@ public:
 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;
@@ -169,8 +174,7 @@ protected:
 	bool _our_time_converter;
 
 	VisibleAspects _visible;
- 
-	bool    _uses_gain_mapping;
+
 	bool    terminal_points_can_slide;
 	bool    update_pending;
 	bool    have_timeout;
@@ -179,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 */
@@ -189,7 +193,7 @@ protected:
 public:
 		ContiguousControlPoints (AutomationLine& al);
 		double clamp_dx (double dx);
-		void move (double dx, double dy);
+		void move (double dx, double dvalue);
 		void compute_x_bounds (PublicEditor& e);
 private:
 		AutomationLine& line;
@@ -202,8 +206,8 @@ private:
 	typedef boost::shared_ptr<ContiguousControlPoints> CCP;
 	std::vector<CCP> contiguous_points;
 
-	void sync_model_with_view_point (ControlPoint&);
-	void sync_model_with_view_points (std::list<ControlPoint*>);
+	bool sync_model_with_view_point (ControlPoint&);
+	bool sync_model_with_view_points (std::list<ControlPoint*>);
 	void start_drag_common (double, float);
 
 	void reset_callback (const Evoral::ControlList&);
@@ -236,6 +240,8 @@ private:
 	/** 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;
 
+	bool _fill;
+
 	const ARDOUR::ParameterDescriptor _desc;
 
 	friend class AudioRegionGainLine;