X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcontrol_point.cc;h=7632642adc32ce80be91e7ff1bf04116c48a86c9;hb=70d246fbe30d24197781384fa4825f32fb0f4235;hp=047417d82a6c226017f467f9378f052eca79deb5;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc
index 047417d82a..7632642adc 100644
--- a/gtk2_ardour/control_point.cc
+++ b/gtk2_ardour/control_point.cc
@@ -26,7 +26,6 @@
 #include "i18n.h"
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gnome; // for Canvas
@@ -41,16 +40,15 @@ ControlPoint::ControlPoint (AutomationLine& al)
 	_y = 0;
 	_shape = Full;
 	_size = 4.0;
-	_selected = false;
 
 	_item = new Canvas::SimpleRect (_line.canvas_group());
 	_item->property_draw() = true;
 	_item->property_fill() = false;
-	_item->property_fill_color_rgba() =  ARDOUR_UI::config()->canvasvar_ControlPointFill.get();
+	_item->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ControlPointFill.get();
 	_item->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_ControlPointOutline.get();
 	_item->property_outline_pixels() = 1;
 	_item->set_data ("control_point", this);
-	_item->signal_event().connect (mem_fun (this, &ControlPoint::event_handler));
+	_item->signal_event().connect (sigc::mem_fun (this, &ControlPoint::event_handler));
 
 	hide ();
 	set_visible (false);
@@ -70,7 +68,6 @@ ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force
 	_y = other._y;
 	_shape = other._shape;
 	_size = other._size;
-	_selected = false;
 
 	_item = new Canvas::SimpleRect (_line.canvas_group());
 	_item->property_fill() = false;
@@ -112,6 +109,12 @@ ControlPoint::set_visible (bool yn)
 	_item->property_draw() = (gboolean) yn;
 }
 
+bool
+ControlPoint::visible () const
+{
+	return _item->property_draw ();
+}
+
 void
 ControlPoint::reset (double x, double y, AutomationList::iterator mi, uint32_t vi, ShapeType shape)
 {
@@ -121,31 +124,14 @@ ControlPoint::reset (double x, double y, AutomationList::iterator mi, uint32_t v
 }
 
 void
-ControlPoint::show_color (bool entered, bool hide_too)
+ControlPoint::set_color ()
 {
 	uint32_t color = 0;
 
-	if (entered) {
-		if (_selected) {
-			color = ARDOUR_UI::config()->canvasvar_EnteredControlPointSelected.get();
-			set_visible(true);
-		} else {
-			color = ARDOUR_UI::config()->canvasvar_EnteredControlPointOutline.get();
-			if (hide_too) {
-				set_visible(false);
-			}
-		}
-
+	if (_selected) {
+		color = ARDOUR_UI::config()->canvasvar_ControlPointSelected.get();
 	} else {
-		if (_selected) {
-			color = ARDOUR_UI::config()->canvasvar_ControlPointSelected.get();
-			set_visible(true);
-		} else {
-			color = ARDOUR_UI::config()->canvasvar_ControlPointOutline.get();
-			if (hide_too) {
-				set_visible(false);
-			}
-		}
+		color = ARDOUR_UI::config()->canvasvar_ControlPointOutline.get();
 	}
 
 	_item->property_outline_color_rgba() = color;
@@ -156,15 +142,6 @@ void
 ControlPoint::set_size (double sz)
 {
 	_size = sz;
-
-#if 0
-	if (_size > 6.0) {
-		item->property_fill() = (gboolean) TRUE;
-	} else {
-		item->property_fill() = (gboolean) FALSE;
-	}
-#endif
-
 	move_to (_x, _y, _shape);
 }
 
@@ -200,3 +177,8 @@ ControlPoint::move_to (double x, double y, ShapeType shape)
 	_shape = shape;
 }
 
+void
+ControlPoint::i2w (double& x, double& y) const
+{
+	_item->i2w (x, y);
+}