diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-28 17:52:09 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-28 17:52:09 +0000 |
| commit | f3e5450492109bb4fab898ae824e30ede28bf7b5 (patch) | |
| tree | c9cf6714aa8df9a07a395a03ba8c383d8fbe88c9 /gtk2_ardour/automation_line.h | |
| parent | 00afa40d458debc3fc53d25a6c077881678ea53e (diff) | |
major fixes to automation editing
git-svn-id: svn://localhost/ardour2/trunk@1161 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_line.h')
| -rw-r--r-- | gtk2_ardour/automation_line.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index b73a1c548a..1349efac4b 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -117,7 +117,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin /* dragging API */ - virtual void start_drag (ControlPoint*, float fraction); + virtual void start_drag (ControlPoint*, nframes_t x, float fraction); virtual void point_drag(ControlPoint&, nframes_t x, float, bool with_push); virtual void end_drag (ControlPoint*); virtual void line_drag(uint32_t i1, uint32_t i2, float, bool with_push); @@ -174,7 +174,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin bool update_pending : 1; bool no_draw : 1; bool points_visible : 1; - + bool did_push; + ArdourCanvas::Group& _parent_group; ArdourCanvas::Group* group; ArdourCanvas::Line* line; /* line */ @@ -193,10 +194,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin static bool invalid_point (ALPoints&, uint32_t index); void determine_visible_control_points (ALPoints&); - void sync_model_from (ControlPoint&); - void sync_model_with_view_point (ControlPoint&); + void sync_model_with_view_point (ControlPoint&, bool did_push, int64_t distance); void sync_model_with_view_line (uint32_t, uint32_t); - void modify_view (ControlPoint&, double, double, bool with_push); virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y); virtual void change_model_range (ARDOUR::AutomationList::iterator,ARDOUR::AutomationList::iterator, double delta, float ydelta); @@ -212,10 +211,11 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin double last_drag_fraction; uint32_t line_drag_cp1; uint32_t line_drag_cp2; + int64_t drag_x; + int64_t drag_distance; void modify_view_point(ControlPoint&, double, double, bool with_push); void reset_line_coords (ControlPoint&); - void update_line (); double control_point_box_size (); |