summaryrefslogtreecommitdiff
path: root/gtk2_ardour/automation_line.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-12-12 22:25:27 +0000
committerCarl Hetherington <carl@carlh.net>2010-12-12 22:25:27 +0000
commita97d522a4fa5ea96a638a9ce54a056d77fbd0128 (patch)
treeb8cd13b9ae2407bcd0aa863742ad04bf343d75db /gtk2_ardour/automation_line.h
parent9a1f83923d637d4bc88c7ed2af09a89d4ae58050 (diff)
Fix display of MIDI automation on regions with non-zero _start. Should fix #3504.
git-svn-id: svn://localhost/ardour2/branches/3.0@8257 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_line.h')
-rw-r--r--gtk2_ardour/automation_line.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index c9ae5becaa..a05a7b9180 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -140,10 +140,13 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
std::pair<ARDOUR::framepos_t, ARDOUR::framepos_t> get_point_x_range () const;
- void set_maximum_time (ARDOUR::framepos_t);
- ARDOUR::framepos_t maximum_time () const {
+ void set_maximum_time (ARDOUR::framecnt_t);
+ ARDOUR::framecnt_t maximum_time () const {
return _maximum_time;
}
+
+ void set_offset (ARDOUR::framecnt_t);
+ void set_width (ARDOUR::framecnt_t);
protected:
@@ -199,6 +202,10 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
double _drag_distance; ///< total x movement of the drag, in units
double _last_drag_fraction; ///< last y position of the drag, as a fraction
std::list<double> _always_in_view;
+ /** offset from the start of the automation list to the start of the line, so that
+ * a +ve offset means that the 0 on the line is at _offset in the list
+ */
+ ARDOUR::framecnt_t _offset;
const Evoral::TimeConverter<double, ARDOUR::framepos_t>& _time_converter;
@@ -225,7 +232,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
PBD::ScopedConnectionList _list_connections;
- /** maximum time that a point on this line can be at, relative to the start of its region or track */
+ /** maximum time that a point on this line can be at, relative to the position of its region or start of its track */
ARDOUR::framecnt_t _maximum_time;
friend class AudioRegionGainLine;