summaryrefslogtreecommitdiff
path: root/gtk2_ardour/automation_time_axis.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-02-17 16:18:15 +0000
committerCarl Hetherington <carl@carlh.net>2011-02-17 16:18:15 +0000
commit81aef8b49138deea084942740de8dbfa2e30edc1 (patch)
treea9c9ad68bcac2c2a3ac39a9bbedbe98e79be5c74 /gtk2_ardour/automation_time_axis.h
parent79f060adbd509d17863309ffcd390467b5965a9c (diff)
Minor tidying-up.
git-svn-id: svn://localhost/ardour2/branches/3.0@8882 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.h')
-rw-r--r--gtk2_ardour/automation_time_axis.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 76e687da0d..885e95a864 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -58,6 +58,7 @@ class AutomationTimeAxisView : public TimeAxisView {
boost::shared_ptr<ARDOUR::Route>,
boost::shared_ptr<ARDOUR::Automatable>,
boost::shared_ptr<ARDOUR::AutomationControl>,
+ Evoral::Parameter,
PublicEditor&,
TimeAxisView& parent,
bool show_regions,
@@ -117,14 +118,18 @@ class AutomationTimeAxisView : public TimeAxisView {
}
protected:
- boost::shared_ptr<ARDOUR::Route> _route; ///< 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::Automatable> _automatable; ///< Control owner, maybe = _route
-
+ /** 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;
ArdourCanvas::SimpleRect* _base_rect;
boost::shared_ptr<AutomationLine> _line;
+
/** AutomationStreamView if we are editing region-based automation (for MIDI), otherwise 0 */
AutomationStreamView* _view;