fixed typo

[ardour.git] / gtk2_ardour / midi_streamview.cc

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index c99f6ca77772ed642fcdaaf0a2ee21b2020626ae..b3d976ae2e907a7a2c47dc4d785bf42135684bcc 100644 (file)
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -56,12 +56,12 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
        : StreamView (tv)
 {
        if (tv.is_track())
-               stream_base_color = color_map[cMidiTrackBase];
+               stream_base_color = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
        else
-               stream_base_color = color_map[cMidiBusBase];
+               stream_base_color = ARDOUR_UI::config()->canvasvar_MidiBusBase.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;
 
        //use_rec_regions = tv.editor.show_waveforms_recording ();
        use_rec_regions = true;
@@ -216,14 +216,14 @@ MidiStreamView::setup_rec_box ()
                        assert(_trackview.midi_track()->mode() == Normal);
                        
                        xend = xstart;
-                       fill_color = color_map[cRecordingRectFill];
+                       fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
                        
                        ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group);
                        rec_rect->property_x1() = xstart;
                        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() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
                        rec_rect->property_fill_color_rgba() = fill_color;
                        rec_rect->lower_to_bottom();
                        
@@ -409,24 +409,17 @@ MidiStreamView::rec_data_range_ready (boost::shared_ptr<MidiBuffer> data, jack_n
 }
 
 void
-MidiStreamView::color_handler (ColorID id, uint32_t val)
+MidiStreamView::color_handler ()
 {
-       switch (id) {
-       case cMidiTrackBase:
-               if (_trackview.is_midi_track()) {
-                       canvas_rect->property_fill_color_rgba() = val;
-               } 
-               break;
-       case cMidiBusBase:
-               if (!_trackview.is_midi_track()) {
-                       canvas_rect->property_fill_color_rgba() = val;
-               }
-               break;
-       case cMidiTrackOutline:
-               canvas_rect->property_outline_color_rgba() = val;
-               break;
 
-       default:
-               break;
+       //case cMidiTrackBase:
+       if (_trackview.is_midi_track()) {
+               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
+       } 
+
+       //case cMidiBusBase:
+       if (!_trackview.is_midi_track()) {
+               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
        }
 }
+