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_time_axis.h | |
| 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_time_axis.h')
| -rw-r--r-- | gtk2_ardour/automation_time_axis.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h index 885e95a864..7fc9c2575a 100644 --- a/gtk2_ardour/automation_time_axis.h +++ b/gtk2_ardour/automation_time_axis.h @@ -106,6 +106,9 @@ class AutomationTimeAxisView : public TimeAxisView { boost::shared_ptr<ARDOUR::AutomationControl> control() { return _control; } boost::shared_ptr<AutomationController> controller() { return _controller; } + Evoral::Parameter parameter () const { + return _parameter; + } ArdourCanvas::Item* base_item () const { return _base_rect; @@ -118,14 +121,15 @@ class AutomationTimeAxisView : public TimeAxisView { } protected: - /** parent route * + /** parent route */ boost::shared_ptr<ARDOUR::Route> _route; /** control; 0 if we are editing region-based automation */ - boost::shared_ptr<ARDOUR::AutomationControl> _control; ///< Control + boost::shared_ptr<ARDOUR::AutomationControl> _control; /** control owner; may be _route, or 0 if we are editing region-based automation */ boost::shared_ptr<ARDOUR::Automatable> _automatable; /** controller owner; 0 if we are editing region-based automation */ boost::shared_ptr<AutomationController> _controller; + Evoral::Parameter _parameter; ArdourCanvas::SimpleRect* _base_rect; boost::shared_ptr<AutomationLine> _line; |