X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.cc;h=4978a1ef68e14cde3752b87268450eb98c7cbad3;hb=691b0c10ac8089efa015e88513d309768fe0f44b;hp=4cf6779c9827406ff76f672a2357e04d3dabd962;hpb=b0b723445816bc968a6a183c6619fccc61e82859;p=ardour.git diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 4cf6779c98..4978a1ef68 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -15,15 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include #include #include +#include #include #include +#include #include #include @@ -244,6 +245,9 @@ AutomationLine::AutomationLine (const string & name, TimeAxisView& tv, ArdourCan line->signal_event().connect (mem_fun (*this, &AutomationLine::event_handler)); alist.StateChanged.connect (mem_fun(*this, &AutomationLine::list_changed)); + + trackview.session().register_with_memento_command_factory(alist.id(), this); + } AutomationLine::~AutomationLine () @@ -267,14 +271,6 @@ AutomationLine::queue_reset () } } -void -AutomationLine::set_point_size (double sz) -{ - for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - (*i)->set_size (sz); - } -} - void AutomationLine::show () { @@ -299,18 +295,27 @@ AutomationLine::hide () _visible = false; } +double +AutomationLine::control_point_box_size () +{ + if (_height > TimeAxisView::hLarger) { + return 8.0; + } else if (_height > (guint32) TimeAxisView::hNormal) { + return 6.0; + } + return 4.0; +} + void AutomationLine::set_height (guint32 h) { if (h != _height) { _height = h; - if (_height > (guint32) TimeAxisView::Larger) { - set_point_size (8.0); - } else if (_height > (guint32) TimeAxisView::Normal) { - set_point_size (6.0); - } else { - set_point_size (4.0); + double bsz = control_point_box_size(); + + for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { + (*i)->set_size (bsz); } reset (); @@ -343,13 +348,6 @@ AutomationLine::nth (uint32_t n) } } -void -AutomationLine::modify_view (ControlPoint& cp, double x, double y, bool with_push) -{ - modify_view_point (cp, x, y, with_push); - update_line (); -} - void AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool with_push) { @@ -412,7 +410,7 @@ AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool wi 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; @@ -467,14 +465,10 @@ AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool wi void AutomationLine::reset_line_coords (ControlPoint& cp) { - line_points[cp.view_index].set_x (cp.get_x()); - line_points[cp.view_index].set_y (cp.get_y()); -} - -void -AutomationLine::update_line () -{ - line->property_points() = line_points; + if (cp.view_index < line_points.size()) { + line_points[cp.view_index].set_x (cp.get_x()); + line_points[cp.view_index].set_y (cp.get_y()); + } } void @@ -487,10 +481,8 @@ AutomationLine::sync_model_with_view_line (uint32_t start, uint32_t end) for (uint32_t i = start; i <= end; ++i) { p = nth(i); - sync_model_with_view_point(*p); + sync_model_with_view_point (*p, false, 0); } - - } void @@ -501,19 +493,17 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) line to convert them to something relevant. */ - mr.xval = (jack_nframes_t) floor (cp.get_x()); + mr.xval = (nframes_t) floor (cp.get_x()); mr.yval = 1.0 - (cp.get_y() / _height); - /* if xval has not changed, set it directly from the model to avoid rounding errors */ if (mr.xval == trackview.editor.frame_to_unit((*cp.model)->when)) { - mr.xval = (jack_nframes_t) (*cp.model)->when; + mr.xval = (nframes_t) (*cp.model)->when; } else { mr.xval = trackview.editor.unit_to_frame (mr.xval); } - /* virtual call: this will do the right thing for whatever particular type of line we are. */ @@ -523,7 +513,7 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) /* part 2: find out where the model point is now */ - mr.xpos = (jack_nframes_t) (*cp.model)->when; + mr.xpos = (nframes_t) (*cp.model)->when; mr.ypos = (*cp.model)->value; /* part 3: get the position of the visual control @@ -542,7 +532,7 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) after = nth (cp.view_index + 1); if (before) { - mr.xmin = (jack_nframes_t) (*before->model)->when; + mr.xmin = (nframes_t) (*before->model)->when; mr.ymin = (*before->model)->value; mr.start = before->model; ++mr.start; @@ -562,98 +552,6 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) } } -void -AutomationLine::sync_model_from (ControlPoint& cp) -{ - ControlPoint* p; - uint32_t lasti; - - sync_model_with_view_point (cp); - - /* we might have moved all points after `cp' by some amount - if we pressed the with_push modifyer some of the time during the drag - so all subsequent points have to be resynced - */ - - lasti = control_points.size() - 1; - p = nth (lasti); - - update_pending = true; - - while (p != &cp && lasti) { - sync_model_with_view_point (*p); - --lasti; - p = nth (lasti); - } -} - -void -AutomationLine::sync_model_with_view_point (ControlPoint& cp) -{ - ModelRepresentation mr; - double ydelta; - - model_representation (cp, mr); - - /* part 4: how much are we changing the central point by */ - - ydelta = mr.yval - mr.ypos; - - /* IMPORTANT: changing the model when the x-coordinate changes - may invalidate the iterators that we are using. this means that we have - to change the points before+after the one corresponding to the visual CP - first (their x-coordinate doesn't change). then we change the - "main" point. - - apply the full change to the central point, and interpolate - in each direction to cover all model points represented - by the control point. - */ - - /* part 5: change all points before the primary point */ - - for (AutomationList::iterator i = mr.start; i != cp.model; ++i) { - - double delta; - - delta = ydelta * ((*i)->when - mr.xmin) / (mr.xpos - mr.xmin); - - /* x-coordinate (generally time) stays where it is, - y-coordinate moves by a certain amount. - */ - - update_pending = true; - change_model (i, (*i)->when, mr.yval + delta); - } - - /* part 6: change later points */ - - AutomationList::iterator i = cp.model; - - ++i; - - while (i != mr.end) { - - double delta; - - delta = ydelta * (mr.xmax - (*i)->when) / (mr.xmax - mr.xpos); - - /* x-coordinate (generally time) stays where it is, - y-coordinate moves by a certain amount. - */ - - update_pending = true; - change_model (i, (*i)->when, (*i)->value + delta); - - ++i; - } - - /* part 7: change the primary point */ - - update_pending = true; - change_model (cp.model, mr.xval, mr.yval); -} - void AutomationLine::determine_visible_control_points (ALPoints& points) { @@ -667,11 +565,16 @@ AutomationLine::determine_visible_control_points (ALPoints& points) uint32_t this_ry = 0; uint32_t prev_ry = 0; double* slope; + uint32_t box_size; + uint32_t cpsize; /* hide all existing points, and the line */ + + cpsize = 0; for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { (*i)->hide(); + ++cpsize; } line->hide (); @@ -692,6 +595,8 @@ AutomationLine::determine_visible_control_points (ALPoints& points) slope[n] = ydelta/xdelta; } + box_size = (uint32_t) control_point_box_size (); + /* read all points and decide which ones to show as control points */ view_index = 0; @@ -733,29 +638,27 @@ AutomationLine::determine_visible_control_points (ALPoints& points) */ this_rx = (uint32_t) rint (tx); - this_ry = (unsigned long) rint (ty); - - if (view_index && pi != npoints && (this_rx == prev_rx) && (this_ry == prev_ry)) { + this_ry = (uint32_t) rint (ty); + if (view_index && pi != npoints && /* not the first, not the last */ + (((this_rx == prev_rx) && (this_ry == prev_ry)) || /* same point */ + (((this_rx - prev_rx) < (box_size + 2)) && /* not identical, but still too close horizontally */ + (abs ((int)(this_ry - prev_ry)) < (int) (box_size + 2))))) { /* too close vertically */ continue; } /* ok, we should display this point */ - if (view_index >= control_points.size()) { + if (view_index >= cpsize) { + /* make sure we have enough control points */ ControlPoint* ncp = new ControlPoint (*this); - - if (_height > (guint32) TimeAxisView::Larger) { - ncp->set_size (8.0); - } else if (_height > (guint32) TimeAxisView::Normal) { - ncp->set_size (6.0); - } else { - ncp->set_size (4.0); - } + + ncp->set_size (box_size); control_points.push_back (ncp); + ++cpsize; } ControlPoint::ShapeType shape; @@ -801,7 +704,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points) view_index++; } - + /* discard extra CP's to avoid confusing ourselves */ while (control_points.size() > view_index) { @@ -826,6 +729,10 @@ AutomationLine::determine_visible_control_points (ALPoints& points) line_points.push_back (Art::Point (0,0)); } + while (line_points.size() > npoints) { + line_points.pop_back (); + } + for (view_index = 0; view_index < npoints; ++view_index) { line_points[view_index].set_x (control_points[view_index]->get_x()); line_points[view_index].set_y (control_points[view_index]->get_y()); @@ -836,9 +743,11 @@ AutomationLine::determine_visible_control_points (ALPoints& points) if (_visible) { line->show (); } + } set_selected_points (trackview.editor.get_selection().points); + } string @@ -873,7 +782,7 @@ AutomationLine::invalidate_point (ALPoints& p, uint32_t index) } void -AutomationLine::start_drag (ControlPoint* cp, float fraction) +AutomationLine::start_drag (ControlPoint* cp, nframes_t x, float fraction) { if (trackview.editor.current_session() == 0) { /* how? */ return; @@ -888,24 +797,43 @@ AutomationLine::start_drag (ControlPoint* cp, float fraction) } trackview.editor.current_session()->begin_reversible_command (str); - trackview.editor.current_session()->add_command (new MementoUndoCommand(*this, get_state())); + trackview.editor.current_session()->add_command (new MementoCommand(alist, &get_state(), 0)); + drag_x = x; + drag_distance = 0; first_drag_fraction = fraction; last_drag_fraction = fraction; drags = 0; + did_push = false; } void -AutomationLine::point_drag (ControlPoint& cp, jack_nframes_t x, float fraction, bool with_push) +AutomationLine::point_drag (ControlPoint& cp, nframes_t x, float fraction, bool with_push) { - modify_view (cp, x, fraction, with_push); + if (x > drag_x) { + drag_distance += (x - drag_x); + } else { + drag_distance -= (drag_x - x); + } + + drag_x = x; + + modify_view_point (cp, x, fraction, with_push); + + if (line_points.size() > 1) { + line->property_points() = line_points; + } + drags++; + did_push = with_push; } void AutomationLine::line_drag (uint32_t i1, uint32_t i2, float fraction, bool with_push) { double ydelta = fraction - last_drag_fraction; + + did_push = with_push; last_drag_fraction = fraction; @@ -919,7 +847,9 @@ AutomationLine::line_drag (uint32_t i1, uint32_t i2, float fraction, bool with_p modify_view_point (*cp, trackview.editor.unit_to_frame (cp->get_x()), ((_height - cp->get_y()) /_height) + ydelta, with_push); } - update_line (); + if (line_points.size() > 1) { + line->property_points() = line_points; + } drags++; } @@ -927,20 +857,95 @@ AutomationLine::line_drag (uint32_t i1, uint32_t i2, float fraction, bool with_p void AutomationLine::end_drag (ControlPoint* cp) { - if (drags) { + if (!drags) { + return; + } - if (cp) { - sync_model_from (*cp); - } else { - sync_model_with_view_line (line_drag_cp1, line_drag_cp2); + alist.freeze (); + + if (cp) { + sync_model_with_view_point (*cp, did_push, drag_distance); + } else { + sync_model_with_view_line (line_drag_cp1, line_drag_cp2); + } + + alist.thaw (); + + update_pending = false; + + trackview.editor.current_session()->add_command (new MementoCommand(alist, 0, &alist.get_state())); + trackview.editor.current_session()->commit_reversible_command (); + trackview.editor.current_session()->set_dirty (); +} + + +void +AutomationLine::sync_model_with_view_point (ControlPoint& cp, bool did_push, int64_t distance) +{ + ModelRepresentation mr; + double ydelta; + + model_representation (cp, mr); + + /* how much are we changing the central point by */ + + ydelta = mr.yval - mr.ypos; + + /* + apply the full change to the central point, and interpolate + on both axes to cover all model points represented + by the control point. + */ + + /* change all points before the primary point */ + + for (AutomationList::iterator i = mr.start; i != cp.model; ++i) { + + double fract = ((*i)->when - mr.xmin) / (mr.xpos - mr.xmin); + double y_delta = ydelta * fract; + double x_delta = distance * fract; + + /* interpolate */ + + if (y_delta || x_delta) { + alist.modify (i, (*i)->when + x_delta, mr.ymin + y_delta); + } + } + + /* change the primary point */ + + update_pending = true; + alist.modify (cp.model, mr.xval, mr.yval); + + + /* change later points */ + + AutomationList::iterator i = cp.model; + + ++i; + + while (i != mr.end) { + + double delta = ydelta * (mr.xmax - (*i)->when) / (mr.xmax - mr.xpos); + + /* all later points move by the same distance along the x-axis as the main point */ + + if (delta) { + alist.modify (i, (*i)->when + distance, (*i)->value + delta); } + + ++i; + } + + if (did_push) { - update_pending = false; + /* move all points after the range represented by the view by the same distance + as the main point moved. + */ - trackview.editor.current_session()->add_command (new MementoRedoCommand(*this, get_state())); - trackview.editor.current_session()->commit_reversible_command (); - trackview.editor.current_session()->set_dirty (); + alist.slide (mr.end, drag_distance); } + } bool @@ -1014,24 +1019,24 @@ AutomationLine::remove_point (ControlPoint& cp) model_representation (cp, mr); trackview.editor.current_session()->begin_reversible_command (_("remove control point")); - XMLNode &before = get_state(); + XMLNode &before = alist.get_state(); alist.erase (mr.start, mr.end); - trackview.editor.current_session()->add_command(new MementoCommand(*this, before, get_state())); + trackview.editor.current_session()->add_command(new MementoCommand(alist, &before, &alist.get_state())); trackview.editor.current_session()->commit_reversible_command (); trackview.editor.current_session()->set_dirty (); } void -AutomationLine::get_selectables (jack_nframes_t& start, jack_nframes_t& end, +AutomationLine::get_selectables (nframes_t& start, nframes_t& end, double botfrac, double topfrac, list& results) { double top; double bot; - jack_nframes_t nstart; - jack_nframes_t nend; + nframes_t nstart; + nframes_t nend; bool collecting = false; /* Curse X11 and its inverted coordinate system! */ @@ -1044,7 +1049,7 @@ AutomationLine::get_selectables (jack_nframes_t& start, jack_nframes_t& end, for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - jack_nframes_t when = (jack_nframes_t) (*(*i)->model)->when; + nframes_t when = (nframes_t) (*(*i)->model)->when; if (when >= start && when <= end) { @@ -1136,8 +1141,6 @@ AutomationLine::show_selection () { TimeSelection& time (trackview.editor.get_selection().time); - // cerr << "show selection\n"; - for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { (*i)->selected = false; @@ -1161,20 +1164,11 @@ AutomationLine::show_selection () void AutomationLine::hide_selection () { - // cerr << "hide selection\n"; // show_selection (); } - -// This is copied into AudioRegionGainLine -UndoAction -AutomationLine::get_memento () -{ - return alist.get_memento(); -} - void -AutomationLine::list_changed (Change ignored) +AutomationLine::list_changed () { queue_reset (); } @@ -1198,9 +1192,7 @@ AutomationLine::reset_callback (const AutomationList& events) for (ai = events.const_begin(); ai != events.const_end(); ++ai) { - double translated_y; - - translated_y = (*ai)->value; + double translated_y = (*ai)->value; model_to_view_y (translated_y); tmp_points.push_back (ALPoint (trackview.editor.frame_to_unit ((*ai)->when), @@ -1228,7 +1220,7 @@ AutomationLine::clear () /* parent must create command */ XMLNode &before = get_state(); alist.clear(); - trackview.editor.current_session()->add_command (new MementoCommand(*this, before, get_state())); + trackview.editor.current_session()->add_command (new MementoCommand(*this, &before, &get_state())); trackview.editor.current_session()->commit_reversible_command (); trackview.editor.current_session()->set_dirty (); } @@ -1236,7 +1228,6 @@ AutomationLine::clear () void AutomationLine::change_model (AutomationList::iterator i, double x, double y) { - alist.modify (i, (jack_nframes_t) x, y); } void @@ -1268,14 +1259,16 @@ AutomationLine::hide_all_but_selected_control_points () } } -XMLNode &AutomationLine::get_state(void) +XMLNode & +AutomationLine::get_state (void) { - // TODO - return alist.get_state(); + /* function as a proxy for the model */ + return alist.get_state(); } -int AutomationLine::set_state(const XMLNode &node) +int +AutomationLine::set_state (const XMLNode &node) { - // TODO - alist.set_state(node); + /* function as a proxy for the model */ + return alist.set_state (node); }