line->signal_event().connect (sigc::mem_fun (*this, &AutomationLine::event_handler));
- connect_to_list ();
-
trackview.session()->register_with_memento_command_factory(alist->id(), this);
if (alist->parameter().type() == GainAutomation ||
trackview.editor().session()->add_command (
new MementoCommand<AutomationList> (memento_command_binder(), 0, &alist->get_state())
);
-
+
trackview.editor().session()->commit_reversible_command ();
trackview.editor().session()->set_dirty ();
}
}
}
+/** @param points AutomationLine points to consider. These will correspond 1-to-1 to
+ * points in the AutomationList, but will have been transformed so that they are in pixels;
+ * the x coordinate being the pixel distance from the start of the line (0, or the start
+ * of the AutomationRegionView if we are in one).
+ *
+ * @param skipped Number of points in the AutomationList that were skipped before
+ * `points' starts.
+ */
+
void
-AutomationLine::determine_visible_control_points (ALPoints& points)
+AutomationLine::determine_visible_control_points (ALPoints& points, int skipped)
{
uint32_t view_index, pi, n;
- AutomationList::iterator model;
uint32_t npoints;
uint32_t this_rx = 0;
uint32_t prev_rx = 0;
view_index = 0;
- for (model = alist->begin(), pi = 0; pi < npoints; ++model, ++pi) {
+ /* skip over unused AutomationList points before we start */
+ AutomationList::iterator model = alist->begin ();
+ for (int i = 0; i < skipped; ++i) {
+ ++model;
+ }
+
+ for (pi = 0; pi < npoints; ++model, ++pi) {
+
+ /* If this line is in an AutomationRegionView, this is an offset from the region position, in pixels */
double tx = points[pi].x;
double ty = points[pi].y;
/* ok, we should display this point */
add_visible_control_point (view_index, pi, tx, ty, model, npoints);
-
+
prev_rx = this_rx;
prev_ry = this_ry;
if (fraction == 0.0) {
snprintf (buf, sizeof (buf), "-inf");
} else {
- snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain (fraction)));
+ snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain_with_max (fraction, Config->get_max_gain())));
}
} else {
view_to_model_coord_y (fraction);
sscanf (s.c_str(), "%lf", &v);
if (_uses_gain_mapping) {
- v = gain_to_slider_position (dB_to_coefficient (v));
+ v = gain_to_slider_position_with_max (dB_to_coefficient (v), Config->get_max_gain());
} else {
double dummy = 0.0;
model_to_view_coord (dummy, v);
}
}
}
-
+
start_drag_common (x, fraction);
}
copy (_push_points.begin(), _push_points.end(), back_inserter (points));
points.sort (ControlPointSorter ());
}
-
+
double dx = ignore_x ? 0 : (x - _drag_x);
double dy = fraction - _last_drag_fraction;
copy (_push_points.begin(), _push_points.end(), back_inserter (points));
points.sort (ControlPointSorter ());
}
-
+
sync_model_with_view_points (points, did_push, rint (_drag_distance * trackview.editor().get_current_zoom ()));
alist->thaw ();
trackview.editor().session()->add_command (
new MementoCommand<AutomationList>(memento_command_binder (), 0, &alist->get_state())
);
-
+
trackview.editor().session()->set_dirty ();
}
trackview.editor().session()->add_command(
new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state())
);
-
+
trackview.editor().session()->commit_reversible_command ();
trackview.editor().session()->set_dirty ();
}
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 - _offset) + _time_converter.origin_b ();
+
+ /* model_when is relative to the start of the source, so we just need to add on the origin_b here
+ (as it is the session frame position of the start of the source)
+ */
+
+ framepos_t const session_frames_when = _time_converter.to (model_when) + _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);
AutomationLine::point_selection_to_control_points (PointSelection const & s)
{
list<ControlPoint*> cp;
-
+
for (PointSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
if (i->track != &trackview) {
for (vector<ControlPoint*>::iterator j = control_points.begin(); j != control_points.end(); ++j) {
- double const rstart = trackview.editor().frame_to_unit (_time_converter.to (i->start));
- double const rend = trackview.editor().frame_to_unit (_time_converter.to (i->end));
+ double const rstart = trackview.editor().frame_to_unit (_time_converter.to (i->start) - _offset);
+ double const rend = trackview.editor().frame_to_unit (_time_converter.to (i->end) - _offset);
if ((*j)->get_x() >= rstart && (*j)->get_x() <= rend) {
if ((*j)->get_y() >= bot && (*j)->get_y() <= top) {
}
void
-AutomationLine::set_selected_points (PointSelection& points)
+AutomationLine::set_selected_points (PointSelection const & points)
{
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
(*i)->set_selected (false);
}
AutomationList::const_iterator ai;
+ int skipped = 0;
for (ai = events.begin(); ai != events.end(); ++ai) {
trackview.editor().frame_to_unit (translated_x),
_height - (translated_y * _height))
);
+ } else if (translated_x < 0) {
+ ++skipped;
}
}
- determine_visible_control_points (tmp_points);
+ determine_visible_control_points (tmp_points, skipped);
}
void
/* TODO: This should be more generic ... */
if (alist->parameter().type() == GainAutomation ||
alist->parameter().type() == EnvelopeAutomation) {
- y = slider_position_to_gain (y);
+ y = slider_position_to_gain_with_max (y, Config->get_max_gain());
y = max (0.0, y);
y = min (2.0, y);
} else if (alist->parameter().type() == PanAzimuthAutomation ||
/* TODO: This should be more generic ... */
if (alist->parameter().type() == GainAutomation ||
alist->parameter().type() == EnvelopeAutomation) {
- y = gain_to_slider_position (y);
+ y = gain_to_slider_position_with_max (y, Config->get_max_gain());
} else if (alist->parameter().type() == PanAzimuthAutomation ||
alist->parameter().type() == PanElevationAutomation ||
alist->parameter().type() == PanWidthAutomation) {
control_points[view_index]->reset (tx, ty, model, view_index, shape);
/* finally, control visibility */
-
+
if (_visible && points_visible) {
control_points[view_index]->show ();
control_points[view_index]->set_visible (true);
AutomationLine::connect_to_list ()
{
_list_connections.drop_connections ();
-
+
alist->StateChanged.connect (_list_connections, invalidator (*this), boost::bind (&AutomationLine::list_changed, this), gui_context());
-
+
alist->InterpolationChanged.connect (
_list_connections, invalidator (*this), boost::bind (&AutomationLine::interpolation_changed, this, _1), gui_context()
);
if (_offset == off) {
return;
}
-
+
_offset = off;
reset ();
}
projects / ardour.git / blobdiff