fix meter color definitions (extra 0x in every one)

[ardour.git] / gtk2_ardour / audio_streamview.cc

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index df1820eeeb6147dac48025ace07a4972099013bc..4a9f3bfd84a64a53eb88031d937e9c1f8de99487 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -249,17 +249,22 @@ AudioStreamView::setup_rec_box ()
                        case Normal:
                        case NonLayered:
                                xend = xstart;
-                               fill_color = ARDOUR_UI::config()->get_RecordingRect();
+                               fill_color = ARDOUR_UI::config()->color ("recording rect");
                                break;
 
                        case Destructive:
                                xend = xstart + 2;
-                               fill_color = ARDOUR_UI::config()->get_RecordingRect();
+                               fill_color = ARDOUR_UI::config()->color ("recording rect");
                                /* make the recording rect translucent to allow
                                   the user to see the peak data coming in, etc.
                                */
                                fill_color = UINT_RGBA_CHANGE_A (fill_color, 120);
                                break;
+                       default:
+                               fatal << string_compose (_("programming error: %1: %2"),
+                                               "AudioStreamView: impossible track mode",
+                                               (int) _trackview.audio_track()->mode()) << endmsg;
+                               abort(); /*NOTREACHED*/
                        }
 
                        ArdourCanvas::Rectangle * rec_rect = new ArdourCanvas::TimeRectangle (_canvas_group);
@@ -268,7 +273,7 @@ AudioStreamView::setup_rec_box ()
                        rec_rect->set_x1 (xend);
                        rec_rect->set_y1 (child_height ());
                        rec_rect->set_outline_what (ArdourCanvas::Rectangle::What (0));
-                       rec_rect->set_outline_color (ARDOUR_UI::config()->get_TimeAxisFrame());
+                       rec_rect->set_outline_color (ARDOUR_UI::config()->color ("time axis frame"));
                        rec_rect->set_fill_color (fill_color);
 
                        RecBoxInfo recbox;
@@ -511,15 +516,15 @@ AudioStreamView::color_handler ()
 {
        //case cAudioTrackBase:
        if (_trackview.is_track()) {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_AudioTrackBase());
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("audio track base"));
        }
 
        //case cAudioBusBase:
        if (!_trackview.is_track()) {
                if (Profile->get_sae() && _trackview.route()->is_master()) {
-                       canvas_rect->set_fill_color (ARDOUR_UI::config()->get_AudioMasterBusBase());
+                       canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("audio master bus base"));
                } else {
-                       canvas_rect->set_fill_color (ARDOUR_UI::config()->get_AudioBusBase());
+                       canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("audio bus base"));
                }
        }
 }