X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcontrol_point.cc;h=2a457c52f1ec487a19fcb06c375ccdb5d5644859;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=406e134e3ea025a535815c8a53a65c911654a295;hpb=56ca52651e910496084b992486ac7b8e3bbc88cf;p=ardour.git

diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc
index 406e134e3e..2a457c52f1 100644
--- a/gtk2_ardour/control_point.cc
+++ b/gtk2_ardour/control_point.cc
@@ -19,12 +19,12 @@
 
 #include "control_point.h"
 #include "automation_line.h"
-#include "ardour_ui.h"
 #include "public_editor.h"
+#include "ui_config.h"
 
 #include "canvas/rectangle.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -45,8 +45,8 @@ ControlPoint::ControlPoint (AutomationLine& al)
 
 	_item = new ArdourCanvas::Rectangle (&_line.canvas_group());
 	_item->set_fill (true);
-	_item->set_fill_color (ARDOUR_UI::config()->color ("control point fill"));
-	_item->set_outline_color (ARDOUR_UI::config()->color ("control point outline"));
+	_item->set_fill_color (UIConfiguration::instance().color ("control point fill"));
+	_item->set_outline_color (UIConfiguration::instance().color ("control point outline"));
 	_item->set_data ("control_point", this);
 	_item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler));
 
@@ -70,7 +70,7 @@ ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force
 
 	_item = new ArdourCanvas::Rectangle (&_line.canvas_group());
 	_item->set_fill (true);
-	_item->set_outline_color (ARDOUR_UI::config()->color ("control point outline"));
+	_item->set_outline_color (UIConfiguration::instance().color ("control point outline"));
 
 	/* NOTE: no event handling in copied ControlPoints */
 
@@ -80,7 +80,7 @@ ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force
 ControlPoint::~ControlPoint ()
 {
 	CatchDeletion (this); /* EMIT SIGNAL */
-	
+
 	delete _item;
 }
 
@@ -119,16 +119,13 @@ ControlPoint::reset (double x, double y, AutomationList::iterator mi, uint32_t v
 void
 ControlPoint::set_color ()
 {
-	uint32_t color = 0;
-
 	if (_selected) {
-		color = ARDOUR_UI::config()->color ("control point selected");
+		_item->set_outline_color(UIConfiguration::instance().color ("control point selected outline"));;
+		_item->set_fill_color(UIConfiguration::instance().color ("control point selected fill"));
 	} else {
-		color = ARDOUR_UI::config()->color ("control point outline");
+		_item->set_outline_color(UIConfiguration::instance().color ("control point outline"));
+		_item->set_fill_color(UIConfiguration::instance().color ("control point fill"));
 	}
-
-	_item->set_outline_color (color);
-	_item->set_fill_color (ARDOUR_UI::config()->color ("control point fill"));
 }
 
 void
@@ -168,7 +165,7 @@ ControlPoint::move_to (double x, double y, ShapeType shape)
 }
 
 ArdourCanvas::Item&
-ControlPoint::item() const 
+ControlPoint::item() const
 {
 	return *_item;
 }