diff options
| -rw-r--r-- | gtk2_ardour/automation_line.cc | 49 | ||||
| -rw-r--r-- | gtk2_ardour/automation_line.h | 13 | ||||
| -rw-r--r-- | gtk2_ardour/automation_region_view.cc | 17 |
3 files changed, 55 insertions, 24 deletions
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 0d63f29226..a8125c0818 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -64,6 +64,7 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv , _name (name) , alist (al) , _parent_group (parent) + , _offset (0) , _time_converter (converter ? (*converter) : default_converter) , _maximum_time (max_framepos) { @@ -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<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); @@ -1074,11 +1075,13 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) double translated_x = (*ai)->when; double translated_y = (*ai)->value; model_to_view_coord (translated_x, translated_y); - - tmp_points.push_back (ALPoint ( - trackview.editor().frame_to_unit (_time_converter.to ((*ai)->when)), - _height - (translated_y * _height)) - ); + + 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); @@ -1227,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 */ @@ -1328,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 (); } @@ -1341,9 +1349,20 @@ AutomationLine::get_point_x_range () const 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 (); +} diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index c9ae5becaa..a05a7b9180 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -140,10 +140,13 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible std::pair<ARDOUR::framepos_t, ARDOUR::framepos_t> get_point_x_range () const; - void set_maximum_time (ARDOUR::framepos_t); - ARDOUR::framepos_t maximum_time () const { + void set_maximum_time (ARDOUR::framecnt_t); + ARDOUR::framecnt_t maximum_time () const { return _maximum_time; } + + void set_offset (ARDOUR::framecnt_t); + void set_width (ARDOUR::framecnt_t); protected: @@ -199,6 +202,10 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible double _drag_distance; ///< total x movement of the drag, in units double _last_drag_fraction; ///< last y position of the drag, as a fraction std::list<double> _always_in_view; + /** 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 + */ + ARDOUR::framecnt_t _offset; const Evoral::TimeConverter<double, ARDOUR::framepos_t>& _time_converter; @@ -225,7 +232,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible PBD::ScopedConnectionList _list_connections; - /** maximum time that a point on this line can be at, relative to the start of its region or track */ + /** maximum time that a point on this line can be at, relative to the position of its region or start of its track */ ARDOUR::framecnt_t _maximum_time; friend class AudioRegionGainLine; diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index c556d01848..6f6f3e29dc 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -67,8 +67,6 @@ AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/) set_height (trackview.current_height()); - _region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context()); - set_colors (); _enable_display = true; @@ -88,6 +86,7 @@ AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> lis _line->show(); _line->show_all_control_points(); _line->set_maximum_time (_region->length()); + _line->set_offset (_region->start ()); } bool @@ -203,10 +202,17 @@ AutomationRegionView::reset_width_dependent_items (double pixel_width) void AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed) { - RegionView::region_resized(what_changed); + RegionView::region_resized (what_changed); - if (_line) { - _line->reset(); + if (!_line) { + return; + } + + if (what_changed.contains (ARDOUR::Properties::start)) { + _line->set_offset (_region->start ()); + } + + if (what_changed.contains (ARDOUR::Properties::length)) { _line->set_maximum_time (_region->length()); } } @@ -226,4 +232,3 @@ AutomationRegionView::exited() if (_line) _line->track_exited(); } - |