X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcontrol_point.h;h=ce4c30be968aa0506009972f2eed4ac880b7675f;hb=ac33bb425641bd4377f68f8a6a3eabc6c58286a9;hp=2dbf225d86d2d519d3b0fb8c1acc177a4fd92912;hpb=efe60474d6447fa710db5dd863f3058e3ab2e511;p=ardour.git

diff --git a/gtk2_ardour/control_point.h b/gtk2_ardour/control_point.h
index 2dbf225d86..ce4c30be96 100644
--- a/gtk2_ardour/control_point.h
+++ b/gtk2_ardour/control_point.h
@@ -21,11 +21,10 @@
 #define __ardour_control_point_h__
 
 #include <sys/types.h>
+#include <gdk/gdkevents.h>
 
 #include "ardour/automation_list.h"
 
-#include "canvas.h"
-#include "simplerect.h"
 #include "selectable.h"
 
 class AutomationLine;
@@ -36,11 +35,9 @@ class AutomationTimeAxisView;
 class Selectable;
 class Selection;
 
-namespace Gnome {
-	namespace Canvas {
-		class SimpleRect;
-		class Diamond;
-	}
+namespace ArdourCanvas {
+	class Rectangle;
+	class Diamond;
 }
 
 class ControlPoint : public Selectable
@@ -63,15 +60,14 @@ class ControlPoint : public Selectable
 
 	void hide ();
 	void show ();
-	void set_color ();
+	bool visible () const;
 
 	double size () const {
 		return _size;
 	}
-	
+
 	void set_size (double);
-	void set_visible (bool);
-	bool visible () const;
+	void set_color ();
 
 	bool     can_slide() const          { return _can_slide; }
 	void     set_can_slide(bool yn)     { _can_slide = yn; }
@@ -83,21 +79,21 @@ class ControlPoint : public Selectable
 	ARDOUR::AutomationList::iterator model() const { return _model; }
 	AutomationLine&                  line()  const { return _line; }
 
+	static PBD::Signal1<void, ControlPoint *> CatchDeletion;
+	
   private:
-	ArdourCanvas::SimpleRect* _item;
-
-	AutomationLine& _line;
-
+	ArdourCanvas::Rectangle*        _item;
+	AutomationLine&                  _line;
 	ARDOUR::AutomationList::iterator _model;
-	uint32_t _view_index;
-	bool     _can_slide;
+	uint32_t                         _view_index;
+	bool                             _can_slide;
+	double                           _x;
+	double                           _y;
+	double                           _size;
+	ShapeType                        _shape;
 
 	virtual bool event_handler (GdkEvent*);
 
-	double    _x;
-	double    _y;
-	double    _size;
-	ShapeType _shape;
 };