#include "selection.h"
#include "time_axis_view.h"
#include "point_selection.h"
-#include "automation_selectable.h"
#include "automation_time_axis.h"
#include "public_editor.h"
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)
{
- _interpolation = al->interpolation();
points_visible = false;
update_pending = false;
_uses_gain_mapping = false;
no_draw = false;
_visible = true;
+ _is_boolean = false;
terminal_points_can_slide = true;
_height = 0;
line->signal_event().connect (sigc::mem_fun (*this, &AutomationLine::event_handler));
- alist->StateChanged.connect (_state_connection, boost::bind (&AutomationLine::list_changed, this), gui_context());
-
trackview.session()->register_with_memento_command_factory(alist->id(), this);
if (alist->parameter().type() == GainAutomation ||
set_uses_gain_mapping (true);
}
- set_interpolation(alist->interpolation());
+ interpolation_changed (alist->interpolation ());
+
+ connect_to_list ();
}
AutomationLine::~AutomationLine ()
{
if (!update_pending) {
update_pending = true;
- Gtkmm2ext::UI::instance()->call_slot (boost::bind (&AutomationLine::reset, this));
+ Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&AutomationLine::reset, this));
}
}
void
AutomationLine::show ()
{
- if (_interpolation != AutomationList::Discrete) {
+ if (alist->interpolation() != AutomationList::Discrete) {
line->show();
}
double
AutomationLine::control_point_box_size ()
{
- if (_interpolation == AutomationList::Discrete) {
+ if (alist->interpolation() == AutomationList::Discrete) {
return max((_height*4.0) / (double)(alist->parameter().max() - alist->parameter().min()),
4.0);
}
- if (_height > TimeAxisView::hLarger) {
+ if (_height > TimeAxisView::preset_height (HeightLarger)) {
return 8.0;
- } else if (_height > (guint32) TimeAxisView::hNormal) {
+ } else if (_height > (guint32) TimeAxisView::preset_height (HeightNormal)) {
return 6.0;
}
return 4.0;
}
}
+ControlPoint const *
+AutomationLine::nth (uint32_t n) const
+{
+ if (n < control_points.size()) {
+ return control_points[n];
+ } else {
+ return 0;
+ }
+}
+
void
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 (new MementoCommand<AutomationList>(*alist.get(), &get_state(), 0));
+ trackview.editor().session()->add_command (
+ new MementoCommand<AutomationList> (memento_command_binder(), &get_state(), 0)
+ );
cp.move_to (x, y, ControlPoint::Full);
+
reset_line_coords (cp);
if (line_points.size() > 1) {
update_pending = false;
- trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), 0, &alist->get_state()));
+ 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 ();
}
-
-void
-AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool keep_x, bool with_push)
-{
- double delta = 0.0;
- uint32_t last_movable = UINT_MAX;
- double x_limit = DBL_MAX;
-
- /* this just changes the current view. it does not alter
- the model in any way at all.
- */
-
- /* clamp y-coord appropriately. y is supposed to be a normalized fraction (0.0-1.0),
- and needs to be converted to a canvas unit distance.
- */
-
- y = max (0.0, y);
- y = min (1.0, y);
- y = _height - (y * _height);
-
- if (cp.can_slide() && !keep_x) {
-
- /* x-coord cannot move beyond adjacent points or the start/end, and is
- already in frames. it needs to be converted to canvas units.
- */
-
- x = trackview.editor().frame_to_unit (x);
-
- /* clamp x position using view coordinates */
-
- ControlPoint *before;
- ControlPoint *after;
-
- if (cp.view_index()) {
- before = nth (cp.view_index() - 1);
- x = max (x, before->get_x()+1.0);
- } else {
- before = &cp;
- }
-
-
- if (!with_push) {
- if (cp.view_index() < control_points.size() - 1) {
-
- after = nth (cp.view_index() + 1);
-
- /*if it is a "spike" leave the x alone */
-
- if (after->get_x() - before->get_x() < 2) {
- x = cp.get_x();
-
- } else {
- x = min (x, after->get_x()-1.0);
- }
- } else {
- after = &cp;
- }
-
- } else {
-
- ControlPoint* after;
-
- /* find the first point that can't move */
-
- for (uint32_t n = cp.view_index() + 1; (after = nth (n)) != 0; ++n) {
- if (!after->can_slide()) {
- x_limit = after->get_x() - 1.0;
- last_movable = after->view_index();
- break;
- }
- }
-
- delta = x - cp.get_x();
- }
-
- } else {
-
- /* leave the x-coordinate alone */
-
- x = trackview.editor().frame_to_unit (_time_converter.to((*cp.model())->when));
-
- }
-
- if (!with_push) {
-
- cp.move_to (x, y, ControlPoint::Full);
- reset_line_coords (cp);
-
- } else {
-
- uint32_t limit = min (control_points.size(), (size_t)last_movable);
-
- /* move the current point to wherever the user told it to go, subject
- to x_limit.
- */
-
- cp.move_to (min (x, x_limit), y, ControlPoint::Full);
- reset_line_coords (cp);
-
- /* now move all subsequent control points, to reflect the motion.
- */
-
- for (uint32_t i = cp.view_index() + 1; i < limit; ++i) {
- ControlPoint *p = nth (i);
- double new_x;
-
- if (p->can_slide()) {
- new_x = min (p->get_x() + delta, x_limit);
- p->move_to (new_x, p->get_y(), ControlPoint::Full);
- reset_line_coords (*p);
- }
- }
- }
-}
-
void
AutomationLine::reset_line_coords (ControlPoint& cp)
{
/* 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 + _offset);
}
- /* convert to model units
+ /* convert y to model units; the x was already done above
*/
- view_to_model_coord (mr.xval, mr.yval);
+ view_to_model_coord_y (mr.yval);
/* 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
}
}
+/** @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;
line->property_points() = line_points;
- if (_visible && _interpolation != AutomationList::Discrete) {
+ if (_visible && alist->interpolation() != AutomationList::Discrete) {
line->show();
}
}
set_selected_points (trackview.editor().get_selection().points);
-
}
string
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 {
- double dummy = 0.0;
- view_to_model_coord (dummy, fraction);
+ view_to_model_coord_y (fraction);
if (EventTypeMap::instance().is_integer (alist->parameter())) {
snprintf (buf, sizeof (buf), "%d", (int)fraction);
} else {
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);
bool
AutomationLine::invalid_point (ALPoints& p, uint32_t index)
{
- return p[index].x == max_frames && p[index].y == DBL_MAX;
+ return p[index].x == max_framepos && p[index].y == DBL_MAX;
}
void
AutomationLine::invalidate_point (ALPoints& p, uint32_t index)
{
- p[index].x = max_frames;
+ p[index].x = max_framepos;
p[index].y = DBL_MAX;
}
-/** Start dragging a single point.
+/** Start dragging a single point, possibly adding others if the supplied point is selected and there
+ * are other selected points.
+ *
* @param cp Point to drag.
- * @param x Initial x position (frames).
+ * @param x Initial x position (units).
* @param fraction Initial y position (as a fraction of the track height, where 0 is the bottom and 1 the top)
*/
void
-AutomationLine::start_drag_single (ControlPoint* cp, nframes_t x, float fraction)
+AutomationLine::start_drag_single (ControlPoint* cp, double x, float fraction)
{
trackview.editor().session()->begin_reversible_command (_("automation event move"));
- trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &get_state(), 0));
+ trackview.editor().session()->add_command (
+ new MementoCommand<AutomationList> (memento_command_binder(), &get_state(), 0)
+ );
_drag_points.clear ();
_drag_points.push_back (cp);
+
+ if (cp->get_selected ()) {
+ for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+ if (*i != cp && (*i)->get_selected()) {
+ _drag_points.push_back (*i);
+ }
+ }
+ }
+
start_drag_common (x, fraction);
}
AutomationLine::start_drag_line (uint32_t i1, uint32_t i2, float fraction)
{
trackview.editor().session()->begin_reversible_command (_("automation range move"));
- trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &get_state(), 0));
+ trackview.editor().session()->add_command (
+ new MementoCommand<AutomationList> (memento_command_binder (), &get_state(), 0)
+ );
_drag_points.clear ();
-
- // check if one of the control points on the line is in a selected range
- bool range_found = false;
- ControlPoint *cp;
-
- for (uint32_t i = i1 ; i <= i2; i++) {
- cp = nth (i);
- if (cp->selected()) {
- range_found = true;
- }
- }
-
- if (range_found) {
- for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
- if ((*i)->selected()) {
- _drag_points.push_back (*i);
- }
- }
- } else {
- for (uint32_t i = i1 ; i <= i2; i++) {
- _drag_points.push_back (nth (i));
- }
+ for (uint32_t i = i1; i <= i2; i++) {
+ _drag_points.push_back (nth (i));
}
start_drag_common (0, fraction);
AutomationLine::start_drag_multiple (list<ControlPoint*> cp, float fraction, XMLNode* state)
{
trackview.editor().session()->begin_reversible_command (_("automation range move"));
- trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), state, 0));
+ trackview.editor().session()->add_command (
+ new MementoCommand<AutomationList> (memento_command_binder(), state, 0)
+ );
_drag_points = cp;
start_drag_common (0, fraction);
}
+
+struct ControlPointSorter
+{
+ bool operator() (ControlPoint const * a, ControlPoint const * b) {
+ return a->get_x() < b->get_x();
+ }
+};
+
/** Common parts of starting a drag.
- * @param d Description of the drag.
- * @param x Starting x position in frames, or 0 if x is being ignored.
+ * @param x Starting x position in units, or 0 if x is being ignored.
* @param fraction Starting y position (as a fraction of the track height, where 0 is the bottom and 1 the top)
*/
void
-AutomationLine::start_drag_common (nframes_t x, float fraction)
+AutomationLine::start_drag_common (double x, float fraction)
{
- drag_x = x;
- drag_distance = 0;
+ _drag_x = x;
+ _drag_distance = 0;
_last_drag_fraction = fraction;
_drag_had_movement = false;
did_push = false;
+
+ _drag_points.sort (ControlPointSorter ());
+
+ /* find the additional points that will be dragged when the user is holding
+ the "push" modifier
+ */
+
+ uint32_t i = _drag_points.back()->view_index () + 1;
+ ControlPoint* p = 0;
+ _push_points.clear ();
+ while ((p = nth (i)) != 0 && p->can_slide()) {
+ _push_points.push_back (p);
+ ++i;
+ }
}
/** Should be called to indicate motion during a drag.
- * @param x New x position of the drag in frames, or 0 if x is being ignored.
+ * @param x New x position of the drag in units, or undefined if ignore_x == true.
* @param fraction New y fraction.
+ * @return x position and y fraction that were actually used (once clamped).
*/
-void
-AutomationLine::drag_motion (nframes_t x, float fraction, bool with_push)
+pair<double, float>
+AutomationLine::drag_motion (double x, float fraction, bool ignore_x, bool with_push)
{
- int64_t const dx = x - drag_x;
- drag_distance += dx;
- drag_x = x;
+ /* setup the points that are to be moved this time round */
+ list<ControlPoint*> points = _drag_points;
+ if (with_push) {
+ 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;
- _last_drag_fraction = fraction;
- /* clamp y so that the "lowest" point hits the bottom but goes no further
- and similarly with the "highest" and the top
- */
- for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
+ /* find x limits */
+ ControlPoint* before = 0;
+ ControlPoint* after = 0;
+
+ for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+ if ((*i)->get_x() < points.front()->get_x()) {
+ before = *i;
+ }
+ if ((*i)->get_x() > points.back()->get_x() && after == 0) {
+ after = *i;
+ }
+ }
+
+ double const before_x = before ? before->get_x() : 0;
+ double const after_x = after ? after->get_x() : DBL_MAX;
+
+ /* clamp x */
+ for (list<ControlPoint*>::iterator i = points.begin(); i != points.end(); ++i) {
+
+ if ((*i)->can_slide() && !ignore_x) {
+
+ /* clamp min x */
+ double const a = (*i)->get_x() + dx;
+ double const b = before_x + 1;
+ if (a < b) {
+ dx += b - a;
+ }
+
+ /* clamp max x */
+ if (after) {
+
+ if (after_x - before_x < 2) {
+ /* after and before are very close, so just leave this alone */
+ dx = 0;
+ } else {
+ double const a = (*i)->get_x() + dx;
+ double const b = after_x - 1;
+ if (a > b) {
+ dx -= a - b;
+ }
+ }
+ }
+ }
+ }
+
+ /* clamp y */
+ for (list<ControlPoint*>::iterator i = points.begin(); i != points.end(); ++i) {
double const y = ((_height - (*i)->get_y()) / _height) + dy;
if (y < 0) {
dy -= y;
}
}
+ pair<double, float> const clamped (_drag_x + dx, _last_drag_fraction + dy);
+ _drag_distance += dx;
+ _drag_x = x;
+ _last_drag_fraction = fraction;
+
for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
+ (*i)->move_to ((*i)->get_x() + dx, (*i)->get_y() - _height * dy, ControlPoint::Full);
+ reset_line_coords (**i);
+ }
- modify_view_point (
- **i,
- trackview.editor().unit_to_frame ((*i)->get_x()) + dx,
- ((_height - (*i)->get_y()) / _height) + dy,
- (x == 0),
- with_push
- );
+ if (with_push) {
+ /* move push points, preserving their y */
+ for (list<ControlPoint*>::iterator i = _push_points.begin(); i != _push_points.end(); ++i) {
+ (*i)->move_to ((*i)->get_x() + dx, (*i)->get_y(), ControlPoint::Full);
+ reset_line_coords (**i);
+ }
}
if (line_points.size() > 1) {
_drag_had_movement = true;
did_push = with_push;
+
+ return clamped;
}
/** Should be called to indicate the end of a drag */
alist->freeze ();
- sync_model_with_view_points (_drag_points, did_push, drag_distance);
+ /* set up the points that were moved this time round */
+ list<ControlPoint*> points = _drag_points;
+ if (did_push) {
+ 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 ();
update_pending = false;
- trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), 0, &alist->get_state()));
- trackview.editor().session()->commit_reversible_command ();
+ trackview.editor().session()->add_command (
+ new MementoCommand<AutomationList>(memento_command_binder (), 0, &alist->get_state())
+ );
+
trackview.editor().session()->set_dirty ();
}
update_pending = true;
alist->modify (cp.model(), mr.xval, mr.yval);
-
/* change later points */
AutomationList::iterator i = cp.model();
as the main point moved.
*/
- alist->slide (mr.end, drag_distance);
+ alist->slide (mr.end, distance);
}
}
alist->erase (mr.start, mr.end);
- trackview.editor().session()->add_command(new MementoCommand<AutomationList>(
- *alist.get(), &before, &alist->get_state()));
+ 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 ();
}
+/** Get selectable points within an area.
+ * @param start Start position in session frames.
+ * @param end End position in session frames.
+ * @param bot Bottom y range, as a fraction of line height, where 0 is the bottom of the line.
+ * @param top Top y range, as a fraction of line height, where 0 is the bottom of the line.
+ * @param result Filled in with selectable things; in this case, ControlPoints.
+ */
void
-AutomationLine::get_selectables (nframes_t& start, nframes_t& end,
- double botfrac, double topfrac, list<Selectable*>& results)
+AutomationLine::get_selectables (
+ framepos_t start, framepos_t end, double botfrac, double topfrac, list<Selectable*>& results
+ )
{
-
- double top;
- double bot;
- double nstart;
- double nend;
- bool collecting = false;
-
- /* Curse X11 and its inverted coordinate system! */
-
- bot = (1.0 - topfrac) * _height;
- top = (1.0 - botfrac) * _height;
-
- nstart = max_frames;
- nend = 0;
+ /* convert fractions to display coordinates with 0 at the top of the track */
+ double const bot_track = (1 - topfrac) * trackview.current_height ();
+ double const top_track = (1 - botfrac) * trackview.current_height ();
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
- double when = (*(*i)->model())->when;
-
- if (when >= start && when <= end) {
-
- if ((*i)->get_y() >= bot && (*i)->get_y() <= top) {
-
- (*i)->show();
- (*i)->set_visible(true);
- collecting = true;
- nstart = min (nstart, when);
- nend = max (nend, when);
+ double const model_when = (*(*i)->model())->when;
- } else {
-
- if (collecting) {
+ /* 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 ();
- results.push_back (new AutomationSelectable (nstart, nend, botfrac, topfrac, &trackview));
- collecting = false;
- nstart = max_frames;
- nend = 0;
- }
- }
+ if (session_frames_when >= start && session_frames_when <= end && (*i)->get_y() >= bot_track && (*i)->get_y() <= top_track) {
+ results.push_back (*i);
}
}
-
- if (collecting) {
- results.push_back (new AutomationSelectable (nstart, nend, botfrac, topfrac, &trackview));
- }
-
}
void
// hmmm ....
}
-void
-AutomationLine::set_selected_points (PointSelection& points)
+/** Take a PointSelection and find ControlPoints that fall within it */
+list<ControlPoint*>
+AutomationLine::point_selection_to_control_points (PointSelection const & s)
{
- double top;
- double bot;
-
- for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
- (*i)->set_selected(false);
- }
-
- if (points.empty()) {
- goto out;
- }
+ list<ControlPoint*> cp;
- for (PointSelection::iterator r = points.begin(); r != points.end(); ++r) {
+ for (PointSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
- if ((*r).track != &trackview) {
+ if (i->track != &trackview) {
continue;
}
- /* Curse X11 and its inverted coordinate system! */
+ double const bot = (1 - i->high_fract) * trackview.current_height ();
+ double const top = (1 - i->low_fract) * trackview.current_height ();
- bot = (1.0 - (*r).high_fract) * _height;
- top = (1.0 - (*r).low_fract) * _height;
+ for (vector<ControlPoint*>::iterator j = control_points.begin(); j != control_points.end(); ++j) {
- for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-
- double rstart, rend;
-
- rstart = trackview.editor().frame_to_unit ((*r).start);
- rend = trackview.editor().frame_to_unit ((*r).end);
-
- if ((*i)->get_x() >= rstart && (*i)->get_x() <= rend) {
+ 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 ((*i)->get_y() >= bot && (*i)->get_y() <= top) {
-
- (*i)->set_selected(true);
+ if ((*j)->get_x() >= rstart && (*j)->get_x() <= rend) {
+ if ((*j)->get_y() >= bot && (*j)->get_y() <= top) {
+ cp.push_back (*j);
}
}
-
}
- }
- out:
- for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
- (*i)->show_color (false, !points_visible);
}
-}
-
-void AutomationLine::set_colors()
-{
- set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
- for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
- (*i)->show_color (false, !points_visible);
- }
+ return cp;
}
void
-AutomationLine::show_selection ()
+AutomationLine::set_selected_points (PointSelection const & points)
{
- TimeSelection& time (trackview.editor().get_selection().time);
-
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+ (*i)->set_selected (false);
+ }
- (*i)->set_selected(false);
-
- for (list<AudioRange>::iterator r = time.begin(); r != time.end(); ++r) {
- double rstart, rend;
-
- rstart = trackview.editor().frame_to_unit ((*r).start);
- rend = trackview.editor().frame_to_unit ((*r).end);
-
- if ((*i)->get_x() >= rstart && (*i)->get_x() <= rend) {
- (*i)->set_selected(true);
- break;
- }
+ if (!points.empty()) {
+ list<ControlPoint*> cp = point_selection_to_control_points (points);
+ for (list<ControlPoint*>::iterator i = cp.begin(); i != cp.end(); ++i) {
+ (*i)->set_selected (true);
}
-
- (*i)->show_color (false, !points_visible);
}
+
+ set_colors ();
}
-void
-AutomationLine::hide_selection ()
+void AutomationLine::set_colors ()
{
-// show_selection ();
+ set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
+ for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+ (*i)->set_color ();
+ }
}
void
}
AutomationList::const_iterator ai;
+ int skipped = 0;
for (ai = events.begin(); ai != events.end(); ++ai) {
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))
+ );
+ } else if (translated_x < 0) {
+ ++skipped;
+ }
}
- 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)));
+ determine_visible_control_points (tmp_points, skipped);
}
void
void
AutomationLine::clear ()
{
- /* parent must create command */
- XMLNode &before = get_state();
+ /* parent must create and commit command */
+ XMLNode &before = alist->get_state();
alist->clear();
+
trackview.editor().session()->add_command (
- new MementoCommand<AutomationLine>(*this, &before, &get_state()));
- trackview.editor().session()->commit_reversible_command ();
- trackview.editor().session()->set_dirty ();
+ new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state())
+ );
}
void
}
void
-AutomationLine::set_list(boost::shared_ptr<ARDOUR::AutomationList> list)
+AutomationLine::set_list
(boost::shared_ptr<ARDOUR::AutomationList> list)
{
alist = list;
- queue_reset();
+ queue_reset ();
+ connect_to_list ();
}
void
AutomationLine::show_all_control_points ()
{
+ if (_is_boolean) {
+ // show the line but don't allow any control points
+ return;
+ }
+
points_visible = true;
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
- (*i)->show_color((_interpolation != AutomationList::Discrete), false);
- (*i)->show ();
- (*i)->set_visible (true);
+ if (!(*i)->visible()) {
+ (*i)->show ();
+ (*i)->set_visible (true);
+ }
}
}
points_visible = false;
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
- if (!(*i)->selected()) {
+ if (!(*i)->get_selected()) {
(*i)->set_visible (false);
}
}
void
AutomationLine::view_to_model_coord (double& x, double& y) const
+{
+ x = _time_converter.from (x);
+ view_to_model_coord_y (y);
+}
+
+void
+AutomationLine::view_to_model_coord_y (double& y) const
{
/* 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() == PanAutomation) {
- // vertical coordinate axis reversal
+ } else if (alist->parameter().type() == PanAzimuthAutomation ||
+ alist->parameter().type() == PanElevationAutomation ||
+ alist->parameter().type() == PanWidthAutomation) {
y = 1.0 - y;
} 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());
}
-
- x = _time_converter.from(x);
}
void
/* TODO: This should be more generic ... */
if (alist->parameter().type() == GainAutomation ||
alist->parameter().type() == EnvelopeAutomation) {
- y = gain_to_slider_position (y);
- } else if (alist->parameter().type() == PanAutomation) {
+ 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) {
// vertical coordinate axis reversal
y = 1.0 - y;
} else if (alist->parameter().type() == PluginAutomation) {
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 */
void
-AutomationLine::set_interpolation(AutomationList::InterpolationStyle style)
+AutomationLine::interpolation_changed (AutomationList::InterpolationStyle style)
{
- _interpolation = style;
-
if (style == AutomationList::Discrete) {
show_all_control_points();
line->hide();
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);
alist->apply_to_points (*this, &AutomationLine::reset_callback);
}
+void
+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()
+ );
+}
+
+MementoCommandBinder<AutomationList>*
+AutomationLine::memento_command_binder ()
+{
+ return new SimpleMementoCommandBinder<AutomationList> (*alist.get());
+}
+
+/** Set the maximum time that points on this line can be at, relative
+ * to the start of the track or region that it is on.
+ */
+void
+AutomationLine::set_maximum_time (framecnt_t t)
+{
+ if (_maximum_time == t) {
+ return;
+ }
+
+ _maximum_time = t;
+ reset ();
+}
+
+
+/** @return min and max x positions of points that are in the list, in session frames */
+pair<framepos_t, framepos_t>
+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) + _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 ();
+}
projects / ardour.git / blobdiff