ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

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.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12060 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-04-23 00:35:49 +00:00
parent 8a98f466f9
commit 7070b8f753
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/automation_line.cc
View File

@ -254,7 +254,7 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y)
}
alist->freeze ();
sync_model_with_view_point (cp, false, 0);
sync_model_with_view_point (cp, 0);
alist->thaw ();
update_pending = false;
@ -277,12 +277,12 @@ AutomationLine::reset_line_coords (ControlPoint& cp)
}
void
AutomationLine::sync_model_with_view_points (list<ControlPoint*> cp, bool did_push, int64_t distance)
AutomationLine::sync_model_with_view_points (list<ControlPoint*> cp, int64_t distance)
{
update_pending = true;
for (list<ControlPoint*>::iterator i = cp.begin(); i != cp.end(); ++i) {
sync_model_with_view_point (**i, did_push, distance);
sync_model_with_view_point (**i, distance);
}
}
@ -452,7 +452,7 @@ AutomationLine::start_drag_common (double x, float fraction)
}
/** Should be called to indicate motion during a drag.
* @param x New x position of the drag in units, or undefined if ignore_x == true.
* @param x New x position of the drag in canvas units, or undefined if ignore_x == true.
* @param fraction New y fraction.
* @return x position and y fraction that were actually used (once clamped).
*/
@ -570,7 +570,7 @@ AutomationLine::end_drag ()
points.sort (ControlPointSorter ());
}
sync_model_with_view_points (points, did_push, rint (_drag_distance * trackview.editor().get_current_zoom ()));
sync_model_with_view_points (points, trackview.editor().unit_to_frame (_drag_distance));
alist->thaw ();
@ -581,10 +581,11 @@ AutomationLine::end_drag ()
);
trackview.editor().session()->set_dirty ();
did_push = false;
}
void
AutomationLine::sync_model_with_view_point (ControlPoint& cp, bool did_push, int64_t distance)
AutomationLine::sync_model_with_view_point (ControlPoint& cp, framecnt_t distance)
{
/* find out where the visual control point is.
initial results are in canvas units. ask the
@ -610,11 +611,8 @@ AutomationLine::sync_model_with_view_point (ControlPoint& cp, bool did_push, int
alist->modify (cp.model(), view_x, view_y);
if (did_push) {
/* move all points after cp by the same distance
*/
alist->slide (cp.model()++, distance);
/* move all points after cp by the same distance */
alist->slide (cp.model()++, _time_converter->from (distance));
}
}

6
gtk2_ardour/automation_line.h
View File

@ -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