X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=a6df048354d0842a5f5b594ead4e58beee8e4d81;hb=e653da32c06c00e2ff481f2fc9d2d2de34b5aba0;hp=405fc63e1170e30b07f4db7b6c5536385f219d51;hpb=0fe968a140cab6270b9480059cb173e7f7b33322;p=ardour.git

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 405fc63e11..a6df048354 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -25,10 +25,7 @@
 #include <string>
 #include <sys/types.h>
 
-#include <libgnomecanvasmm/line.h>
 #include <sigc++/signal.h>
-#include "canvas.h"
-#include "simplerect.h"
 
 #include "evoral/TimeConverter.hpp"
 
@@ -37,8 +34,13 @@
 #include "pbd/memento_command.h"
 
 #include "ardour/automation_list.h"
+#include "ardour/parameter_descriptor.h"
 #include "ardour/types.h"
 
+#include "canvas/types.h"
+#include "canvas/container.h"
+#include "canvas/poly_line.h"
+
 class AutomationLine;
 class ControlPoint;
 class PointSelection;
@@ -46,12 +48,8 @@ class TimeAxisView;
 class AutomationTimeAxisView;
 class Selectable;
 class Selection;
+class PublicEditor;
 
-namespace Gnome {
-	namespace Canvas {
-		class SimpleRect;
-	}
-}
 
 /** A GUI representation of an ARDOUR::AutomationList */
 class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
@@ -62,15 +60,20 @@ public:
 		ControlPoints = 0x2,
 		SelectedControlPoints = 0x4
 	};
-	
-	AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&,
-	                boost::shared_ptr<ARDOUR::AutomationList>,
+
+	AutomationLine (const std::string&                                 name,
+	                TimeAxisView&                                      tv,
+	                ArdourCanvas::Item&                                parent,
+	                boost::shared_ptr<ARDOUR::AutomationList>          al,
+	                const ARDOUR::ParameterDescriptor&                 desc,
 	                Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0);
+
 	virtual ~AutomationLine ();
 
 	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*>&);
@@ -108,11 +111,11 @@ public:
 
 	TimeAxisView& trackview;
 
-	ArdourCanvas::Group& canvas_group() const { return *group; }
+	ArdourCanvas::Container& canvas_group() const { return *group; }
 	ArdourCanvas::Item&  parent_group() const { return _parent_group; }
 	ArdourCanvas::Item&  grab_item() const { return *line; }
 
-	std::string get_verbose_cursor_string (double) const;
+	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;
@@ -120,6 +123,7 @@ public:
 	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;
 
 	void set_list(boost::shared_ptr<ARDOUR::AutomationList> list);
 	boost::shared_ptr<ARDOUR::AutomationList> the_list() const { return alist; }
@@ -150,6 +154,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;
@@ -166,7 +171,7 @@ protected:
 	bool _our_time_converter;
 
 	VisibleAspects _visible;
- 
+
 	bool    _uses_gain_mapping;
 	bool    terminal_points_can_slide;
 	bool    update_pending;
@@ -176,9 +181,9 @@ protected:
 	/** true if we did a push at any point during the current drag */
 	bool    did_push;
 
-	ArdourCanvas::Group&        _parent_group;
-	ArdourCanvas::Group*        group;
-	ArdourCanvas::Line*         line; /* line */
+	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 */
 
@@ -187,7 +192,7 @@ public:
 		ContiguousControlPoints (AutomationLine& al);
 		double clamp_dx (double dx);
 		void move (double dx, double dy);
-		void compute_x_bounds ();
+		void compute_x_bounds (PublicEditor& e);
 private:
 		AutomationLine& line;
 		double before_x;
@@ -199,12 +204,10 @@ 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);
 
-	virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y);
-
 	void reset_callback (const Evoral::ControlList&);
 	void list_changed ();
 
@@ -222,7 +225,8 @@ private:
 	 */
 	ARDOUR::framecnt_t _offset;
 
-	void show ();
+	bool is_stepped() const;
+	void update_visibility ();
 	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 ();
@@ -234,6 +238,10 @@ 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;
 };