X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.cc;h=9eecc80dd7fd80de28ced468cb2bb81c02453a48;hb=849d80bfcc40fff9a5a58804a48dd98206a72426;hp=8239bca2f4a84e0a92e17f87cf2c103ef0510c59;hpb=cc92c879bfd989aa8de25fdc29fb8d9b2ec7a992;p=ardour.git

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 8239bca2f4..9eecc80dd7 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -45,21 +45,24 @@
 #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)
+StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Container* canvas_group)
 	: _trackview (tv)
-	, _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)
 	, stream_base_color(0xFFFFFFFF)
 	, _layers (1)
 	, _layer_display (Overlaid)
-	, height(tv.height)
+	, height (tv.height)
 	, last_rec_data_frame(0)
 {
 	CANVAS_DEBUG_NAME (_canvas_group, string_compose ("SV canvas group %1", _trackview.name()));
@@ -69,16 +72,10 @@ StreamView::StreamView (RouteTimeAxisView& tv)
 	canvas_rect = new ArdourCanvas::Rectangle (_canvas_group);
 	CANVAS_DEBUG_NAME (canvas_rect, string_compose ("SV canvas rectangle %1", _trackview.name()));
 	canvas_rect->set (ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, tv.current_height ()));
-	canvas_rect->raise(1); // raise above tempo lines
-
-	canvas_rect->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::TOP | ArdourCanvas::Rectangle::BOTTOM));
+	canvas_rect->set_outline_what (ArdourCanvas::Rectangle::BOTTOM);
 	canvas_rect->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255));
-	canvas_rect->set_fill_color (RGBA_TO_UINT (1.0, 0, 0, 255));
 	canvas_rect->set_fill (true);
-
-	canvas_rect->Event.connect (sigc::bind (
-			sigc::mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event),
-			canvas_rect, &_trackview));
+	canvas_rect->Event.connect (sigc::bind (sigc::mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
 
 	if (_trackview.is_track()) {
 		_trackview.track()->DiskstreamChanged.connect (*this, invalidator (*this), boost::bind (&StreamView::diskstream_changed, this), gui_context());
@@ -347,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;
 
@@ -360,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;
 	}
@@ -425,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);