X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=6ce548e55d7c6f95c2a619aaf7815e0124ebcf47;hb=a606a83d2ec43d9fbf9b65969afb3b3c46c546fa;hp=a915966d97259aac46b6db9c2ac47e661cf2dc5f;hpb=24ccaac67e9d416b3f3c564a441934313f3e9a21;p=ardour.git

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index a915966d97..6ce548e55d 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -53,48 +53,6 @@ namespace Gnome {
 	}
 }
 
-class ControlPoint 
-{
-  public:
-	ControlPoint (AutomationLine& al);
-	ControlPoint (const ControlPoint&, bool dummy_arg_to_force_special_copy_constructor);
-	virtual ~ControlPoint ();
-
-	enum ShapeType {
-		Full,
-		Start,
-		End
-	};
-	
-	void move_to (double x, double y, ShapeType);
-	void reset (double x, double y, ARDOUR::AutomationList::iterator, uint32_t, ShapeType);
-	double get_x() const { return _x; }
-	double get_y() const { return _y; }
-
-	void hide (); 
-	void show ();
-	void show_color (bool entered, bool hide_too);
-
-	void set_size (double);
-	void set_visible (bool);
-
-	ArdourCanvas::SimpleRect* item;
-	AutomationLine& line;
-	uint32_t view_index;
-	ARDOUR::AutomationList::iterator model;
-	bool can_slide;
-	bool selected;
-	
-  protected:
-	virtual bool event_handler (GdkEvent*);
-
-  private:
-	double _x;
-	double _y;
-	double _size;
-	ShapeType _shape;
-};
-
 class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoingAway
 {
   public:
@@ -129,9 +87,11 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
 	guint32 height() const { return _height; }
 	guint32 y_position() const { return _y_position; }
 
-	void         set_line_color (uint32_t);
+	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_y_position_and_height (uint32_t, uint32_t);
@@ -146,15 +106,18 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
 	void show_selection();
 	void hide_selection ();
 
-	virtual string  get_verbose_cursor_string (float);
-	virtual void view_to_model_y (double&) = 0;
-	virtual void model_to_view_y (double&) = 0;
+	virtual string get_verbose_cursor_string (double);
+	virtual void view_to_model_y (double&);
+	virtual void model_to_view_y (double&);
 
 	boost::shared_ptr<ARDOUR::AutomationList> the_list() const { return alist; }
 
 	void show_all_control_points ();
 	void hide_all_but_selected_control_points ();
 
+	void track_entered();
+	void track_exited();
+
 	bool is_last_point (ControlPoint &);
 	bool is_first_point (ControlPoint &);
 
@@ -215,6 +178,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
 	uint32_t line_drag_cp2;
 	int64_t  drag_x;
 	int64_t  drag_distance;
+	
+	ARDOUR::AutomationList::InterpolationStyle _interpolation;
 
 	void modify_view_point(ControlPoint&, double, double, bool with_push);
 	void reset_line_coords (ControlPoint&);