using namespace Editing;
using namespace Gnome; // for Canvas
-static const Evoral::IdentityConverter<double, sframes_t> default_converter;
+static const Evoral::IdentityConverter<double, framepos_t> default_converter;
AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Group& parent,
boost::shared_ptr<AutomationList> al,
- const Evoral::TimeConverter<double, sframes_t>* converter)
+ const Evoral::TimeConverter<double, framepos_t>* converter)
: trackview (tv)
, _name (name)
, alist (al)
, _parent_group (parent)
+ , _offset (0)
, _time_converter (converter ? (*converter) : default_converter)
, _maximum_time (max_framepos)
{
_uses_gain_mapping = false;
no_draw = false;
_visible = true;
- _is_boolean = false;
+ _is_boolean = false;
terminal_points_can_slide = true;
_height = 0;
y = min (1.0, y);
y = _height - (y * _height);
- double const x = trackview.editor().frame_to_unit (_time_converter.to((*cp.model())->when));
+ double const x = trackview.editor().frame_to_unit (_time_converter.to((*cp.model())->when) - _offset);
trackview.editor().session()->begin_reversible_command (_("automation event move"));
trackview.editor().session()->add_command (
/* if xval has not changed, set it directly from the model to avoid rounding errors */
- if (mr.xval == trackview.editor().frame_to_unit(_time_converter.to((*cp.model())->when))) {
- mr.xval = (*cp.model())->when;
+ if (mr.xval == trackview.editor().frame_to_unit(_time_converter.to((*cp.model())->when)) - _offset) {
+ mr.xval = (*cp.model())->when - _offset;
} else {
mr.xval = trackview.editor().unit_to_frame (mr.xval);
- mr.xval = _time_converter.from (mr.xval);
+ mr.xval = _time_converter.from (mr.xval + _offset);
}
/* convert y to model units; the x was already done above
/* part 2: find out where the model point is now
*/
- mr.xpos = (*cp.model())->when;
+ mr.xpos = (*cp.model())->when - _offset;
mr.ypos = (*cp.model())->value;
/* part 3: get the position of the visual control
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
double const model_when = (*(*i)->model())->when;
- framepos_t const session_frames_when = _time_converter.to (model_when) + _time_converter.origin_b ();
+ framepos_t const session_frames_when = _time_converter.to (model_when - _offset) + _time_converter.origin_b ();
if (session_frames_when >= start && session_frames_when <= end && (*i)->get_y() >= bot_track && (*i)->get_y() <= top_track) {
results.push_back (*i);
double translated_y = (*ai)->value;
model_to_view_coord (translated_x, translated_y);
- add_model_point (tmp_points, (*ai)->when, translated_y);
+ if (translated_x >= 0 && translated_x < _maximum_time) {
+ tmp_points.push_back (ALPoint (
+ trackview.editor().frame_to_unit (translated_x),
+ _height - (translated_y * _height))
+ );
+ }
}
determine_visible_control_points (tmp_points);
}
-
-void
-AutomationLine::add_model_point (ALPoints& tmp_points, double frame, double yfract)
-{
- tmp_points.push_back (ALPoint (trackview.editor().frame_to_unit (_time_converter.to(frame)),
- _height - (yfract * _height)));
-}
-
void
AutomationLine::reset ()
{
void
AutomationLine::show_all_control_points ()
{
- if (_is_boolean) {
- // show the line but don't allow any control points
- return;
- }
+ if (_is_boolean) {
+ // show the line but don't allow any control points
+ return;
+ }
points_visible = true;
} else if (alist->parameter().type() == PluginAutomation) {
y = y * (double)(alist->get_max_y()- alist->get_min_y()) + alist->get_min_y();
} else {
- y = (int)(y * alist->parameter().max());
+ y = rint (y * alist->parameter().max());
}
}
y = y / (double)alist->parameter().max(); /* ... like this */
}
- x = _time_converter.to(x);
+ x = _time_converter.to (x) - _offset;
}
/** Called when our list has announced that its interpolation style has changed */
* to the start of the track or region that it is on.
*/
void
-AutomationLine::set_maximum_time (framepos_t t)
+AutomationLine::set_maximum_time (framecnt_t t)
{
+ if (_maximum_time == t) {
+ return;
+ }
+
_maximum_time = t;
+ reset ();
}
pair<framepos_t, framepos_t> r (max_framepos, 0);
for (AutomationList::const_iterator i = the_list()->begin(); i != the_list()->end(); ++i) {
- r.first = min (r.first, _time_converter.to ((*i)->when) + _time_converter.origin_b ());
- r.second = max (r.second, _time_converter.to ((*i)->when) + _time_converter.origin_b ());
+ r.first = min (r.first, _time_converter.to ((*i)->when) + _offset + _time_converter.origin_b ());
+ r.second = max (r.second, _time_converter.to ((*i)->when) + _offset + _time_converter.origin_b ());
}
return r;
}
+
+void
+AutomationLine::set_offset (framepos_t off)
+{
+ if (_offset == off) {
+ return;
+ }
+
+ _offset = off;
+ reset ();
+}