Render tracks and regions to a background image in the editor summary.

[ardour.git] / gtk2_ardour / audio_streamview.cc

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 088eec17e5b7bb39fd42c5ac4584ff070a3f5f28..0520b1846c769902c70b48389a33b9c6867062f1 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -110,7 +110,7 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
                break;
        case Destructive:
                region_view = new TapeAudioRegionView (_canvas_group, _trackview, region,
-                               _samples_per_pixel, region_color);
+                                                      _samples_per_pixel, region_color);
                break;
        default:
                fatal << string_compose (_("programming error: %1"), "illegal track mode in ::add_region_view_internal") << endmsg;
@@ -118,7 +118,7 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
 
        }
 
-       region_view->init (region_color, wait_for_waves);
+       region_view->init (wait_for_waves);
        region_view->set_amplitude_above_axis(_amplitude_above_axis);
        region_view->set_height (child_height ());
 
@@ -264,7 +264,7 @@ AudioStreamView::setup_rec_box ()
                        at = _trackview.audio_track(); /* we know what it is already */
                        framepos_t const frame_pos = at->current_capture_start ();
                        gdouble xstart = _trackview.editor().sample_to_pixel (frame_pos);
-                       gdouble xend;
+                       gdouble xend = xstart; /* keeps gcc optimized happy, really set in switch() below */
                        uint32_t fill_color;
 
                        switch (_trackview.audio_track()->mode()) {
@@ -289,7 +289,7 @@ AudioStreamView::setup_rec_box ()
                        rec_rect->set_y0 (1);
                        rec_rect->set_x1 (xend);
                        rec_rect->set_y1 (child_height ());
-                       rec_rect->set_outline_what (0);
+                       rec_rect->set_outline_what (ArdourCanvas::Rectangle::What (0));
                        rec_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
                        rec_rect->set_fill_color (fill_color);
                        rec_rect->lower_to_bottom();