1 files changed, 15 insertions, 23 deletions

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 573ed0ceba..a95c0ba648 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -64,12 +64,12 @@ AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
 	_waveform_shape = Traditional;
 	
 	if (tv.is_track())
-		stream_base_color = color_map[cAudioTrackBase];
+		stream_base_color = Config->canvasvar_AudioTrackBase.get();
 	else
-		stream_base_color = color_map[cAudioBusBase];
+		stream_base_color = Config->canvasvar_AudioBusBase.get();
 	
 	canvas_rect->property_fill_color_rgba() = stream_base_color;
-	canvas_rect->property_outline_color_rgba() = color_map[cAudioTrackOutline];
+	canvas_rect->property_outline_color_rgba() = RGBA_BLACK;
 
 	_amplitude_above_axis = 1.0;
 
@@ -520,12 +520,12 @@ AudioStreamView::setup_rec_box ()
 			switch (_trackview.audio_track()->mode()) {
 			case Normal:
 				xend = xstart;
-				fill_color = color_map[cRecordingRectFill];
+				fill_color = Config->canvasvar_RecordingRect.get();
 				break;
 
 			case Destructive:
 				xend = xstart + 2;
-				fill_color = color_map[cRecordingRectFill];
+				fill_color = Config->canvasvar_RecordingRect.get();
 				/* make the recording rect translucent to allow
 				   the user to see the peak data coming in, etc.
 				*/
@@ -538,7 +538,7 @@ AudioStreamView::setup_rec_box ()
 			rec_rect->property_y1() = 1.0;
 			rec_rect->property_x2() = xend;
 			rec_rect->property_y2() = (double) _trackview.height - 1;
-			rec_rect->property_outline_color_rgba() = color_map[cRecordingRectOutline];
+			rec_rect->property_outline_color_rgba() = Config->canvasvar_RecordingRect.get();
 			rec_rect->property_fill_color_rgba() = fill_color;
 			rec_rect->lower_to_bottom();
 			
@@ -761,26 +761,18 @@ AudioStreamView::reveal_xfades_involving (AudioRegionView& rv)
 }
 
 void
-AudioStreamView::color_handler (ColorID id, uint32_t val)
+AudioStreamView::color_handler ()
 {
-	switch (id) {
-	case cAudioTrackBase:
-		if (_trackview.is_track()) {
-			canvas_rect->property_fill_color_rgba() = val;
-		} 
-		break;
-	case cAudioBusBase:
-		if (!_trackview.is_track()) {
-			canvas_rect->property_fill_color_rgba() = val;
-		}
-		break;
-	case cAudioTrackOutline:
-		canvas_rect->property_outline_color_rgba() = val;
-		break;
+	//case cAudioTrackBase:
+	if (_trackview.is_track()) {
+		canvas_rect->property_fill_color_rgba() = Config->canvasvar_AudioTrackBase.get();
+	} 
 
-	default:
-		break;
+	//case cAudioBusBase:
+	if (!_trackview.is_track()) {
+		canvas_rect->property_fill_color_rgba() = Config->canvasvar_AudioBusBase.get();
 	}
+
 }
 
 void