1 files changed, 14 insertions, 19 deletions

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 45103ec7f1..04ac1ee076 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -74,11 +74,11 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	base_rect->property_x1() = 0.0;
 	base_rect->property_y1() = 0.0;
 	base_rect->property_x2() = editor.frame_to_pixel (max_frames);
-	base_rect->property_outline_color_rgba() = color_map[cAutomationTrackOutline];
+	base_rect->property_outline_color_rgba() = Config->canvasvar_AutomationTrackOutline.get();
 	/* outline ends and bottom */
 	base_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);
-	base_rect->property_fill_color_rgba() = color_map[cAutomationTrackFill];
-	//base_rect->property_fill_color_rgba() = color_map[cEnteredControlPoint];
+	base_rect->property_fill_color_rgba() = Config->canvasvar_AutomationTrackFill.get();
+	//base_rect->property_fill_color_rgba() = Config->canvasvar_EnteredControlPoint.get();
 	
 	base_rect->set_data ("trackview", this);
 
@@ -182,7 +182,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	/* make sure labels etc. are correct */
 
 	automation_state_changed ();
-	ColorChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler));
+	ColorsChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler));
 }
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
@@ -821,24 +821,19 @@ AutomationTimeAxisView::set_colors () {
 }
 
 void
-AutomationTimeAxisView::color_handler (ColorID id, uint32_t val) {
+AutomationTimeAxisView::color_handler () 
+{
     
-	switch (id) {
-	case cGhostTrackWave:
-	case cGhostTrackWaveClip:
-	case cGhostTrackZeroLine:
-
-	case cControlPoint:
-	case cControlPointFill:
-	case cControlPointOutline:
-	case cAutomationLine:
-		set_colors ();
+	//case cGhostTrackWave:
+	//case cGhostTrackWaveClip:
+	//case cGhostTrackZeroLine:
 
-		break;
+	//case cControlPoint:
+	//case cControlPointFill:
+	//case cControlPointOutline:
+	//case cAutomationLine:
+	set_colors ();
 
-	default: 
-		break;
-	}
 }