X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.cc;h=a8125c0818be4e0b649003ad56fc5ff1a18c114b;hb=4336bb25d739cd007811ccd0298a15acc5e20787;hp=e674fd4ffff8d92dfef114a201384bf92aa1955d;hpb=10bdce85a0e7381d1b5db38e3640600c6fd3ec79;p=ardour.git diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index e674fd4fff..a8125c0818 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -55,15 +55,16 @@ using namespace PBD; using namespace Editing; using namespace Gnome; // for Canvas -static const Evoral::IdentityConverter default_converter; +static const Evoral::IdentityConverter default_converter; AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Group& parent, boost::shared_ptr al, - const Evoral::TimeConverter* converter) + const Evoral::TimeConverter* converter) : trackview (tv) , _name (name) , alist (al) , _parent_group (parent) + , _offset (0) , _time_converter (converter ? (*converter) : default_converter) , _maximum_time (max_framepos) { @@ -72,7 +73,7 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv _uses_gain_mapping = false; no_draw = false; _visible = true; - _is_boolean = false; + _is_boolean = false; terminal_points_can_slide = true; _height = 0; @@ -226,7 +227,7 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y) 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 ( @@ -287,11 +288,11 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) /* 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 @@ -302,7 +303,7 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) /* 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 @@ -975,7 +976,7 @@ AutomationLine::get_selectables ( for (vector::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); @@ -1075,20 +1076,17 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) 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 () { @@ -1129,10 +1127,10 @@ AutomationLine::set_list (boost::shared_ptr list) 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; @@ -1212,7 +1210,7 @@ AutomationLine::view_to_model_coord_y (double& y) const } 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()); } } @@ -1232,7 +1230,7 @@ AutomationLine::model_to_view_coord (double& x, double& y) const 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 */ @@ -1333,9 +1331,14 @@ AutomationLine::memento_command_binder () * 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 (); } @@ -1346,9 +1349,20 @@ AutomationLine::get_point_x_range () const pair 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 (); +}