Group the Rec and Monitor buttons together. Group the Solo Isolate and Lock buttons...

[ardour.git] / gtk2_ardour / streamview.cc

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index bed80582b2b6a091b7441a8f13e29ffb70747b9e..9eecc80dd7fd80de28ced468cb2bb81c02453a48 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -45,14 +45,17 @@
 #include "gui_thread.h"
 #include "utils.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Editing;
 
-StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* canvas_group)
+StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Container* canvas_group)
        : _trackview (tv)
-       , _canvas_group (canvas_group ? canvas_group : new ArdourCanvas::Group (_trackview.canvas_display()))
+       , _canvas_group (canvas_group ? canvas_group : new ArdourCanvas::Container (_trackview.canvas_display()))
        , _samples_per_pixel (_trackview.editor().get_current_zoom ())
        , rec_updating(false)
        , rec_active(false)
@@ -341,7 +344,13 @@ StreamView::diskstream_changed ()
 }
 
 void
-StreamView::apply_color (Gdk::Color color, ColorTarget target)
+StreamView::apply_color (Gdk::Color const& c, ColorTarget target)
+{
+       return apply_color (gdk_color_to_rgba (c), target);
+}
+
+void
+StreamView::apply_color (uint32_t color, ColorTarget target)
 {
        list<RegionView *>::iterator i;
 
@@ -354,7 +363,7 @@ StreamView::apply_color (Gdk::Color color, ColorTarget target)
                break;
 
        case StreamBaseColor:
-               stream_base_color = RGBA_TO_UINT (color.get_red_p(), color.get_green_p(), color.get_blue_p(), 255);
+               stream_base_color = color;
                canvas_rect->set_fill_color (stream_base_color);
                break;
        }
@@ -419,6 +428,11 @@ StreamView::update_rec_box ()
                        xstart = _trackview.editor().sample_to_pixel (_trackview.track()->current_capture_start());
                        xend = _trackview.editor().sample_to_pixel (at);
                        break;
+
+               default:
+                       fatal << string_compose (_("programming error: %1"), "illegal track mode") << endmsg;
+                       /*NOTREACHED*/
+                       return;
                }
 
                rect.rectangle->set_x0 (xstart);