ardour/livetrax
13
0
Fork 0
Code

Fix display of MIDI automation on regions with non-zero _start. Should fix #3504.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8257 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-12-12 22:25:27 +00:00
parent 9a1f83923d
commit a97d522a4f
3 changed files with 55 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gtk2_ardour/automation_line.cc
View File

@ -64,6 +64,7 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv
, _name (name) , _name (name)
, alist (al) , alist (al)
, _parent_group (parent) , _parent_group (parent)
, _offset (0)
, _time_converter (converter ? (*converter) : default_converter) , _time_converter (converter ? (*converter) : default_converter)
, _maximum_time (max_framepos) , _maximum_time (max_framepos)
{ {
@ -226,7 +227,7 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y)
y = min (1.0, y); y = min (1.0, y);
y = _height - (y * _height); 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()->begin_reversible_command (_("automation event move"));
trackview.editor().session()->add_command ( 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 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))) { if (mr.xval == trackview.editor().frame_to_unit(_time_converter.to((*cp.model())->when)) - _offset) {
mr.xval = (*cp.model())->when; mr.xval = (*cp.model())->when - _offset;
} else { } else {
mr.xval = trackview.editor().unit_to_frame (mr.xval); 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 /* 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 /* 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; mr.ypos = (*cp.model())->value;
/* part 3: get the position of the visual control /* 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) { for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
double const model_when = (*(*i)->model())->when; 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) { if (session_frames_when >= start && session_frames_when <= end && (*i)->get_y() >= bot_track && (*i)->get_y() <= top_track) {
results.push_back (*i); results.push_back (*i);
@ -1074,11 +1075,13 @@ AutomationLine::reset_callback (const Evoral::ControlList& events)
double translated_x = (*ai)->when; double translated_x = (*ai)->when;
double translated_y = (*ai)->value; double translated_y = (*ai)->value;
model_to_view_coord (translated_x, translated_y); model_to_view_coord (translated_x, translated_y);
tmp_points.push_back (ALPoint ( if (translated_x >= 0 && translated_x < _maximum_time) {
trackview.editor().frame_to_unit (_time_converter.to ((*ai)->when)), tmp_points.push_back (ALPoint (
_height - (translated_y * _height)) trackview.editor().frame_to_unit (translated_x),
); _height - (translated_y * _height))
);
}
} }
determine_visible_control_points (tmp_points); 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 */ 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 */ /** 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. * to the start of the track or region that it is on.
*/ */
void void
AutomationLine::set_maximum_time (framepos_t t) AutomationLine::set_maximum_time (framecnt_t t)
{ {
if (_maximum_time == t) {
return;
}
_maximum_time = t; _maximum_time = t;
reset ();
} }
@ -1341,9 +1349,20 @@ AutomationLine::get_point_x_range () const
pair<framepos_t, framepos_t> r (max_framepos, 0); pair<framepos_t, framepos_t> r (max_framepos, 0);
for (AutomationList::const_iterator i = the_list()->begin(); i != the_list()->end(); ++i) { 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.first = min (r.first, _time_converter.to ((*i)->when) + _offset + _time_converter.origin_b ());
r.second = max (r.second, _time_converter.to ((*i)->when) + _time_converter.origin_b ()); r.second = max (r.second, _time_converter.to ((*i)->when) + _offset + _time_converter.origin_b ());
} }
return r; return r;
} }
void
AutomationLine::set_offset (framepos_t off)
{
if (_offset == off) {
return;
}
_offset = off;
reset ();
}

13
gtk2_ardour/automation_line.h
View File

@ -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; std::pair<ARDOUR::framepos_t, ARDOUR::framepos_t> get_point_x_range () const;
void set_maximum_time (ARDOUR::framepos_t); void set_maximum_time (ARDOUR::framecnt_t);
ARDOUR::framepos_t maximum_time () const { ARDOUR::framecnt_t maximum_time () const {
return _maximum_time; return _maximum_time;
} }
void set_offset (ARDOUR::framecnt_t);
void set_width (ARDOUR::framecnt_t);
protected: 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 _drag_distance; ///< total x movement of the drag, in units
double _last_drag_fraction; ///< last y position of the drag, as a fraction double _last_drag_fraction; ///< last y position of the drag, as a fraction
std::list<double> _always_in_view; 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; 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; 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; ARDOUR::framecnt_t _maximum_time;
friend class AudioRegionGainLine; friend class AudioRegionGainLine;

17
gtk2_ardour/automation_region_view.cc
View File

@ -67,8 +67,6 @@ AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
set_height (trackview.current_height()); set_height (trackview.current_height());
_region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context());
set_colors (); set_colors ();
_enable_display = true; _enable_display = true;
@ -88,6 +86,7 @@ AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> lis
_line->show(); _line->show();
_line->show_all_control_points(); _line->show_all_control_points();
_line->set_maximum_time (_region->length()); _line->set_maximum_time (_region->length());
_line->set_offset (_region->start ());
} }
bool bool
@ -203,10 +202,17 @@ AutomationRegionView::reset_width_dependent_items (double pixel_width)
void void
AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed) AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed)
{ {
RegionView::region_resized(what_changed); RegionView::region_resized (what_changed);
if (_line) { if (!_line) {
_line->reset(); 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()); _line->set_maximum_time (_region->length());
} }
} }
@ -226,4 +232,3 @@ AutomationRegionView::exited()
if (_line) if (_line)
_line->track_exited(); _line->track_exited();
} }