Merge branch 'windows' into windows+cc

[ardour.git] / gtk2_ardour / automation_streamview.cc

diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index fa6a8248196b2714f2d6becb1ba71657cc283056..a1ba99a2b444db5e1990748cc56fe3ec25f557f8 100644 (file)
--- a/gtk2_ardour/automation_streamview.cc
+++ b/gtk2_ardour/automation_streamview.cc
@@ -45,9 +45,7 @@ using namespace PBD;
 using namespace Editing;
 
 AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv)
-       : StreamView (*dynamic_cast<RouteTimeAxisView*>(tv.get_parent()),
-                     new ArdourCanvas::Group (tv.canvas_background()),
-                     new ArdourCanvas::Group (tv.canvas_display()))
+       : StreamView (*dynamic_cast<RouteTimeAxisView*>(tv.get_parent()))
        , _automation_view(tv)
        , _pending_automation_state (Off)
 {
@@ -105,7 +103,7 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region
        region_view = new AutomationRegionView (
                _canvas_group, _automation_view, region,
                _automation_view.parameter (), list,
-               _frames_per_pixel, region_color
+               _samples_per_pixel, region_color
                );
 
        region_view->init (region_color, false);
@@ -188,11 +186,11 @@ void
 AutomationStreamView::color_handler ()
 {
        /*if (_trackview.is_midi_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
+               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_canvasvar_MidiTrackBase();
        }
 
        if (!_trackview.is_midi_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
+               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_canvasvar_MidiBusBase();;
        }*/
 }