diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-02-17 16:18:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-02-17 16:18:27 +0000 |
| commit | 5576faf943f875cc13b807bdd0d3d99eb2714ff2 (patch) | |
| tree | 93dd90feefee2831e7f3722f9357270e7d84f33c /gtk2_ardour/automation_streamview.cc | |
| parent | 81aef8b49138deea084942740de8dbfa2e30edc1 (diff) | |
Clean up some confusion with AutomationControls in AutomationTimeAxisViews that have regions.
git-svn-id: svn://localhost/ardour2/branches/3.0@8883 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_streamview.cc')
| -rw-r--r-- | gtk2_ardour/automation_streamview.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index a543c9d68c..86388f527f 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -52,7 +52,6 @@ AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv) : StreamView (*dynamic_cast<RouteTimeAxisView*>(tv.get_parent()), new ArdourCanvas::Group(*tv.canvas_background()), new ArdourCanvas::Group(*tv.canvas_display())) - , _controller(tv.controller()) , _automation_view(tv) , _pending_automation_state (Off) { @@ -78,7 +77,7 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region } const boost::shared_ptr<AutomationControl> control = boost::dynamic_pointer_cast<AutomationControl> ( - region->control (_controller->controllable()->parameter(), true) + region->control (_automation_view.parameter(), true) ); boost::shared_ptr<AutomationList> list; @@ -106,9 +105,11 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region } } - region_view = new AutomationRegionView (_canvas_group, _automation_view, region, - _controller->controllable()->parameter(), list, - _samples_per_unit, region_color); + region_view = new AutomationRegionView ( + _canvas_group, _automation_view, region, + _automation_view.parameter (), list, + _samples_per_unit, region_color + ); region_view->init (region_color, false); region_views.push_front (region_view); |