diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-04-23 00:35:49 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-04-23 00:35:49 +0000 |
| commit | 7070b8f753bac6338b0b1629ef543a8d694fb76c (patch) | |
| tree | 006b13ddbdb259158913523c8288c304ff730076 /gtk2_ardour/automation_line.h | |
| parent | 8a98f466f9580cda97d952109ae5f8ccadfadc03 (diff) | |
Fix some confusion wrt did_push as a member and a local variable; pass push distances through the AutomationList's time converter so that they work properly; a few comment fixes.
git-svn-id: svn://localhost/ardour2/branches/3.0@12060 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_line.h')
| -rw-r--r-- | gtk2_ardour/automation_line.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index 82debde51b..bee78c4ef5 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -172,8 +172,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible ArdourCanvas::Points line_points; /* coordinates for canvas line */ std::vector<ControlPoint*> control_points; /* visible control points */ - void sync_model_with_view_point (ControlPoint&, bool, int64_t); - void sync_model_with_view_points (std::list<ControlPoint*>, bool, int64_t); + void sync_model_with_view_point (ControlPoint&, ARDOUR::framecnt_t); + void sync_model_with_view_points (std::list<ControlPoint*>, ARDOUR::framecnt_t); void start_drag_common (double, float); virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y); @@ -188,7 +188,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible std::list<ControlPoint*> _push_points; ///< additional points we are dragging if "push" is enabled bool _drag_had_movement; ///< true if the drag has seen movement, otherwise false double _drag_x; ///< last x position of the drag, in units - double _drag_distance; ///< total x movement of the drag, in units + double _drag_distance; ///< total x movement of the drag, in canvas units double _last_drag_fraction; ///< last y position of the drag, as a fraction /** 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 |