X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.cc;h=670083e0d482a917365101ab7d74eba8320a2f38;hb=237741d18722252abd4a6a20d3422315481ccffe;hp=6586aed966350a0fa79a5765784c4aea4e8d73e4;hpb=2373c48da627724b3ebf3021a3bda1b49b44078f;p=ardour.git diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 6586aed966..670083e0d4 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -17,22 +17,34 @@ */ +#ifdef COMPILER_MSVC +#include +/* isinf() & isnan() are C99 standards, which older MSVC doesn't provide */ +#define isinf(val) !((bool)_finite((double)val)) +#define isnan(val) (bool)_isnan((double)val) +#endif + #include #include #include #include -#include "pbd/stl_delete.h" +#include "boost/shared_ptr.hpp" + +#include "pbd/floating.h" #include "pbd/memento_command.h" +#include "pbd/stl_delete.h" #include "pbd/stacktrace.h" #include "ardour/automation_list.h" #include "ardour/dB.h" #include "ardour/debug.h" +#include "ardour/tempo.h" #include "evoral/Curve.hpp" -#include "simplerect.h" +#include "canvas/debug.h" + #include "automation_line.h" #include "control_point.h" #include "gui_thread.h" @@ -54,14 +66,13 @@ using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Editing; -using namespace Gnome; // for Canvas /** @param converter A TimeConverter whose origin_b is the start time of the AutomationList in session frames. * This will not be deleted by AutomationLine. */ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Group& parent, - boost::shared_ptr al, - Evoral::TimeConverter* converter) + boost::shared_ptr al, + Evoral::TimeConverter* converter) : trackview (tv) , _name (name) , alist (al) @@ -88,15 +99,16 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv terminal_points_can_slide = true; _height = 0; - group = new ArdourCanvas::Group (parent); - group->property_x() = 0.0; - group->property_y() = 0.0; + group = new ArdourCanvas::Group (&parent); + CANVAS_DEBUG_NAME (group, "region gain envelope group"); - line = new ArdourCanvas::Line (*group); - line->property_width_pixels() = (guint)1; + line = new ArdourCanvas::PolyLine (group); + CANVAS_DEBUG_NAME (line, "region gain envelope line"); line->set_data ("line", this); + line->set_outline_width (2.0); + line->set_covers_threshold (4.0); - line->signal_event().connect (sigc::mem_fun (*this, &AutomationLine::event_handler)); + line->Event.connect (sigc::mem_fun (*this, &AutomationLine::event_handler)); trackview.session()->register_with_memento_command_factory(alist->id(), this); @@ -127,7 +139,7 @@ AutomationLine::event_handler (GdkEvent* event) } void -AutomationLine::show () +AutomationLine::update_visibility () { if (_visible & Line) { /* Only show the line there are some points, otherwise we may show an out-of-date line @@ -139,30 +151,42 @@ AutomationLine::show () } else { line->hide (); } - } else { - line->hide(); - } - if (_visible & ControlPoints) { - for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - (*i)->set_visible (true); - (*i)->show (); - } - } else if (_visible & SelectedControlPoints) { - for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - (*i)->set_visible ((*i)->get_selected()); + if (_visible & ControlPoints) { + for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { + (*i)->show (); + } + } else if (_visible & SelectedControlPoints) { + for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { + if ((*i)->get_selected()) { + (*i)->show (); + } else { + (*i)->hide (); + } + } + } else { + for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { + (*i)->hide (); + } } + } else { + line->hide (); for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { - (*i)->set_visible (false); + (*i)->hide (); } } + } void AutomationLine::hide () { - set_visibility (VisibleAspects (0)); + /* leave control points setting unchanged, we are just hiding the + overall line + */ + + set_visibility (AutomationLine::VisibleAspects (_visible & ~Line)); } double @@ -170,7 +194,7 @@ AutomationLine::control_point_box_size () { if (alist->interpolation() == AutomationList::Discrete) { return max((_height*4.0) / (double)(alist->parameter().max() - alist->parameter().min()), - 4.0); + 4.0); } if (_height > TimeAxisView::preset_height (HeightLarger)) { @@ -201,7 +225,7 @@ void AutomationLine::set_line_color (uint32_t color) { _line_color = color; - line->property_fill_color_rgba() = color; + line->set_outline_color (color); } void @@ -244,19 +268,18 @@ 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_unrounded (_time_converter->to((*cp.model())->when) - _offset); + double const x = trackview.editor().sample_to_pixel_unrounded (_time_converter->to((*cp.model())->when) - _offset); trackview.editor().session()->begin_reversible_command (_("automation event move")); trackview.editor().session()->add_command ( - new MementoCommand (memento_command_binder(), &get_state(), 0) - ); + new MementoCommand (memento_command_binder(), &get_state(), 0)); cp.move_to (x, y, ControlPoint::Full); reset_line_coords (cp); if (line_points.size() > 1) { - line->property_points() = line_points; + line->set (line_points); } alist->freeze (); @@ -266,8 +289,7 @@ AutomationLine::modify_point_y (ControlPoint& cp, double y) update_pending = false; trackview.editor().session()->add_command ( - new MementoCommand (memento_command_binder(), 0, &alist->get_state()) - ); + new MementoCommand (memento_command_binder(), 0, &alist->get_state())); trackview.editor().session()->commit_reversible_command (); trackview.editor().session()->set_dirty (); @@ -277,8 +299,8 @@ void AutomationLine::reset_line_coords (ControlPoint& cp) { 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()); + line_points[cp.view_index()].x = cp.get_x (); + line_points[cp.view_index()].y = cp.get_y (); } } @@ -431,8 +453,7 @@ 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 (memento_command_binder(), &get_state(), 0) - ); + new MementoCommand (memento_command_binder(), &get_state(), 0)); _drag_points.clear (); _drag_points.push_back (cp); @@ -458,10 +479,10 @@ 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 (memento_command_binder (), &get_state(), 0) - ); + new MementoCommand (memento_command_binder (), &get_state(), 0)); _drag_points.clear (); + for (uint32_t i = i1; i <= i2; i++) { _drag_points.push_back (nth (i)); } @@ -478,21 +499,105 @@ AutomationLine::start_drag_multiple (list cp, float fraction, XML { trackview.editor().session()->begin_reversible_command (_("automation range move")); trackview.editor().session()->add_command ( - new MementoCommand (memento_command_binder(), state, 0) - ); + new MementoCommand (memento_command_binder(), state, 0)); _drag_points = cp; start_drag_common (0, fraction); } - struct ControlPointSorter { - bool operator() (ControlPoint const * a, ControlPoint const * b) { + bool operator() (ControlPoint const * a, ControlPoint const * b) const { + if (floateq (a->get_x(), b->get_x(), 1)) { + return a->view_index() < b->view_index(); + } return a->get_x() < b->get_x(); } }; +AutomationLine::ContiguousControlPoints::ContiguousControlPoints (AutomationLine& al) + : line (al), before_x (0), after_x (DBL_MAX) +{ +} + +void +AutomationLine::ContiguousControlPoints::compute_x_bounds (PublicEditor& e) +{ + uint32_t sz = size(); + + if (sz > 0 && sz < line.npoints()) { + const TempoMap& map (e.session()->tempo_map()); + + /* determine the limits on x-axis motion for this + contiguous range of control points + */ + + if (front()->view_index() > 0) { + before_x = line.nth (front()->view_index() - 1)->get_x(); + + const framepos_t pos = e.pixel_to_sample(before_x); + const Meter& meter = map.meter_at (pos); + const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate()) + / (Timecode::BBT_Time::ticks_per_beat * meter.divisions_per_bar()) ); + const double one_tick_in_pixels = e.sample_to_pixel_unrounded (len); + + before_x += one_tick_in_pixels; + } + + /* if our last point has a point after it in the line, + we have an "after" bound + */ + + if (back()->view_index() < (line.npoints() - 1)) { + after_x = line.nth (back()->view_index() + 1)->get_x(); + + const framepos_t pos = e.pixel_to_sample(after_x); + const Meter& meter = map.meter_at (pos); + const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate()) + / (Timecode::BBT_Time::ticks_per_beat * meter.divisions_per_bar())); + const double one_tick_in_pixels = e.sample_to_pixel_unrounded (len); + + after_x -= one_tick_in_pixels; + } + } +} + +double +AutomationLine::ContiguousControlPoints::clamp_dx (double dx) +{ + if (empty()) { + return dx; + } + + /* get the maximum distance we can move any of these points along the x-axis + */ + + double tx; /* possible position a point would move to, given dx */ + ControlPoint* cp; + + if (dx > 0) { + /* check the last point, since we're moving later in time */ + cp = back(); + } else { + /* check the first point, since we're moving earlier in time */ + cp = front(); + } + + tx = cp->get_x() + dx; // new possible position if we just add the motion + tx = max (tx, before_x); // can't move later than following point + tx = min (tx, after_x); // can't move earlier than preceeding point + return tx - cp->get_x (); +} + +void +AutomationLine::ContiguousControlPoints::move (double dx, double dy) +{ + for (std::list::iterator i = begin(); i != end(); ++i) { + (*i)->move_to ((*i)->get_x() + dx, (*i)->get_y() - line.height() * dy, ControlPoint::Full); + line.reset_line_coords (**i); + } +} + /** Common parts of starting a drag. * @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) @@ -506,88 +611,80 @@ AutomationLine::start_drag_common (double x, float 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 - */ + /* they are probably ordered already, but we have to make sure */ - 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; - } + _drag_points.sort (ControlPointSorter()); } + /** Should be called to indicate motion during a drag. * @param x New x position of the drag in canvas units, or undefined if ignore_x == true. * @param fraction New y fraction. * @return x position and y fraction that were actually used (once clamped). */ pair -AutomationLine::drag_motion (double const x, float fraction, bool ignore_x, bool with_push) +AutomationLine::drag_motion (double const x, float fraction, bool ignore_x, bool with_push, uint32_t& final_index) { - /* setup the points that are to be moved this time round */ - list points = _drag_points; - if (with_push) { - copy (_push_points.begin(), _push_points.end(), back_inserter (points)); - points.sort (ControlPointSorter ()); + if (_drag_points.empty()) { + return pair (x,fraction); } double dx = ignore_x ? 0 : (x - _drag_x); double dy = fraction - _last_drag_fraction; - for (list::iterator i = points.begin(); i != points.end(); ++i) { - /* Find the points that aren't being moved before and after - this one on the control_points list - */ - - ControlPoint* before = 0; - ControlPoint* after = 0; - - ControlPoint* last = 0; - for (vector::iterator j = control_points.begin(); j != control_points.end(); ++j) { - - if (*j == *i) { - - before = last; - - vector::iterator k = j; - - /* Next point */ - ++k; + if (!_drag_had_movement) { - /* Now move past any points that are being moved this time */ - while (find (points.begin(), points.end(), *k) != points.end() && k != control_points.end ()) { - ++k; - } - - if (k != control_points.end()) { - after = *k; - } - break; + /* "first move" ... do some stuff that we don't want to do if + no motion ever took place, but need to do before we handle + motion. + */ + + /* partition the points we are dragging into (potentially several) + * set(s) of contiguous points. this will not happen with a normal + * drag, but if the user does a discontiguous selection, it can. + */ + + uint32_t expected_view_index = 0; + CCP contig; + + for (list::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) { + if (i == _drag_points.begin() || (*i)->view_index() != expected_view_index) { + contig.reset (new ContiguousControlPoints (*this)); + contiguous_points.push_back (contig); } + contig->push_back (*i); + expected_view_index = (*i)->view_index() + 1; + } - if (find (points.begin(), points.end(), *j) == points.end ()) { - /* This point isn't being moved, so it's the `last' point we've seen */ - last = *j; - } + if (contiguous_points.back()->empty()) { + contiguous_points.pop_back (); } - /* Clamp dx for this point */ - double const before_x = before ? before->get_x() : 0; - double const after_x = after ? after->get_x() : DBL_MAX; + for (vector::iterator ccp = contiguous_points.begin(); ccp != contiguous_points.end(); ++ccp) { + (*ccp)->compute_x_bounds (trackview.editor()); + } + } + + /* OK, now on to the stuff related to *this* motion event. First, for + * each contiguous range, figure out the maximum x-axis motion we are + * allowed (because of neighbouring points that are not moving. + * + * if we are moving forwards with push, we don't need to do this, + * since all later points will move too. + */ - double tx = (*i)->get_x() + dx; - tx = max (tx, before_x); - tx = min (tx, after_x); - dx = tx - (*i)->get_x (); + if (dx < 0 || ((dx > 0) && !with_push)) { + for (vector::iterator ccp = contiguous_points.begin(); ccp != contiguous_points.end(); ++ccp) { + double dxt = (*ccp)->clamp_dx (dx); + if (fabs (dxt) < fabs (dx)) { + dx = dxt; + } + } } /* clamp y */ - for (list::iterator i = points.begin(); i != points.end(); ++i) { + + for (list::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) { double const y = ((_height - (*i)->get_y()) / _height) + dy; if (y < 0) { dy -= y; @@ -597,65 +694,72 @@ AutomationLine::drag_motion (double const x, float fraction, bool ignore_x, bool } } - pair const clamped (_drag_x + dx, _last_drag_fraction + dy); - _drag_distance += dx; - _drag_x += dx; - _last_drag_fraction = fraction; - - for (list::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); - } + if (dx || dy) { - if (with_push) { - /* move push points, preserving their y */ - for (list::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); + /* and now move each section */ + + for (vector::iterator ccp = contiguous_points.begin(); ccp != contiguous_points.end(); ++ccp) { + (*ccp)->move (dx, dy); + } + if (with_push) { + final_index = contiguous_points.back()->back()->view_index () + 1; + ControlPoint* p; + uint32_t i = final_index; + while ((p = nth (i)) != 0 && p->can_slide()) { + p->move_to (p->get_x() + dx, p->get_y(), ControlPoint::Full); + reset_line_coords (*p); + ++i; + } } - } - if (line_points.size() > 1) { - line->property_points() = line_points; - } + /* update actual line coordinates (will queue a redraw) + */ - _drag_had_movement = true; - if (with_push) { - did_push = with_push; + if (line_points.size() > 1) { + line->set (line_points); + } } + + _drag_distance += dx; + _drag_x += dx; + _last_drag_fraction = fraction; + _drag_had_movement = true; + did_push = with_push; - return clamped; + return pair (_drag_x + dx, _last_drag_fraction + dy); } /** Should be called to indicate the end of a drag */ void -AutomationLine::end_drag () +AutomationLine::end_drag (bool with_push, uint32_t final_index) { if (!_drag_had_movement) { return; } alist->freeze (); + sync_model_with_view_points (_drag_points); - /* set up the points that were moved this time round */ - list points = _drag_points; - if (did_push) { - copy (_push_points.begin(), _push_points.end(), back_inserter (points)); - points.sort (ControlPointSorter ()); + if (with_push) { + ControlPoint* p; + uint32_t i = final_index; + while ((p = nth (i)) != 0 && p->can_slide()) { + sync_model_with_view_point (*p); + ++i; + } } - sync_model_with_view_points (points); - alist->thaw (); update_pending = false; trackview.editor().session()->add_command ( - new MementoCommand(memento_command_binder (), 0, &alist->get_state()) - ); + new MementoCommand(memento_command_binder (), 0, &alist->get_state())); trackview.editor().session()->set_dirty (); did_push = false; + + contiguous_points.clear (); } void @@ -671,10 +775,10 @@ AutomationLine::sync_model_with_view_point (ControlPoint& cp) /* if xval has not changed, set it directly from the model to avoid rounding errors */ - if (view_x == trackview.editor().frame_to_unit_unrounded (_time_converter->to ((*cp.model())->when)) - _offset) { + if (view_x == trackview.editor().sample_to_pixel_unrounded (_time_converter->to ((*cp.model())->when)) - _offset) { view_x = (*cp.model())->when - _offset; } else { - view_x = trackview.editor().unit_to_frame (view_x); + view_x = trackview.editor().pixel_to_sample (view_x); view_x = _time_converter->from (view_x + _offset); } @@ -692,7 +796,7 @@ AutomationLine::control_points_adjacent (double xval, uint32_t & before, uint32_ ControlPoint *acp = 0; double unit_xval; - unit_xval = trackview.editor().frame_to_unit_unrounded (xval); + unit_xval = trackview.editor().sample_to_pixel_unrounded (xval); for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { @@ -754,8 +858,7 @@ AutomationLine::remove_point (ControlPoint& cp) alist->erase (cp.model()); trackview.editor().session()->add_command( - new MementoCommand (memento_command_binder (), &before, &alist->get_state()) - ); + new MementoCommand (memento_command_binder (), &before, &alist->get_state())); trackview.editor().session()->commit_reversible_command (); trackview.editor().session()->set_dirty (); @@ -769,9 +872,7 @@ AutomationLine::remove_point (ControlPoint& cp) * @param result Filled in with selectable things; in this case, ControlPoints. */ void -AutomationLine::get_selectables ( - framepos_t start, framepos_t end, double botfrac, double topfrac, list& results - ) +AutomationLine::get_selectables (framepos_t start, framepos_t end, double botfrac, double topfrac, list& results) { /* convert fractions to display coordinates with 0 at the top of the track */ double const bot_track = (1 - topfrac) * trackview.current_height (); @@ -814,7 +915,7 @@ AutomationLine::set_selected_points (PointSelection const & points) void AutomationLine::set_colors () { - set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get()); + set_line_color (ARDOUR_UI::config()->get_canvasvar_AutomationLine()); for (vector::iterator i = control_points.begin(); i != control_points.end(); ++i) { (*i)->set_color (); } @@ -867,9 +968,9 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) model_to_view_coord (tx, ty); - if (std::isnan (tx) || std::isnan (ty)) { + if (isnan (tx) || isnan (ty)) { warning << string_compose (_("Ignoring illegal points on AutomationLine \"%1\""), - _name) << endmsg; + _name) << endmsg; continue; } @@ -881,7 +982,7 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) * zoom and scroll into account). */ - tx = trackview.editor().frame_to_unit_unrounded (tx); + tx = trackview.editor().sample_to_pixel_unrounded (tx); /* convert from canonical view height (0..1.0) to actual * height coordinates (using X11's top-left rooted system) @@ -910,7 +1011,7 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) /* reset the line coordinates given to the CanvasLine */ while (line_points.size() < vp) { - line_points.push_back (Art::Point (0,0)); + line_points.push_back (ArdourCanvas::Duple (0,0)); } while (line_points.size() > vp) { @@ -918,15 +1019,13 @@ AutomationLine::reset_callback (const Evoral::ControlList& events) } for (uint32_t n = 0; n < vp; ++n) { - line_points[n].set_x (control_points[n]->get_x()); - line_points[n].set_y (control_points[n]->get_y()); + line_points[n].x = control_points[n]->get_x(); + line_points[n].y = control_points[n]->get_y(); } - line->property_points() = line_points; + line->set (line_points); - if (_visible && alist->interpolation() != AutomationList::Discrete) { - line->show(); - } + update_visibility (); } set_selected_points (trackview.editor().get_selection().points); @@ -975,8 +1074,7 @@ AutomationLine::clear () alist->clear(); trackview.editor().session()->add_command ( - new MementoCommand (memento_command_binder (), &before, &alist->get_state()) - ); + new MementoCommand (memento_command_binder (), &before, &alist->get_state())); } void @@ -995,22 +1093,34 @@ AutomationLine::set_list (boost::shared_ptr list) void AutomationLine::add_visibility (VisibleAspects va) { + VisibleAspects old = _visible; + _visible = VisibleAspects (_visible | va); - show (); + + if (old != _visible) { + update_visibility (); + } } void AutomationLine::set_visibility (VisibleAspects va) { - _visible = va; - show (); + if (_visible != va) { + _visible = va; + update_visibility (); + } } void AutomationLine::remove_visibility (VisibleAspects va) { + VisibleAspects old = _visible; + _visible = VisibleAspects (_visible & ~va); - show (); + + if (old != _visible) { + update_visibility (); + } } void @@ -1060,9 +1170,10 @@ AutomationLine::view_to_model_coord_y (double& y) const y = max (0.0, y); y = min (2.0, y); } else if (alist->parameter().type() == PanAzimuthAutomation || - alist->parameter().type() == PanElevationAutomation || - alist->parameter().type() == PanWidthAutomation) { + alist->parameter().type() == PanElevationAutomation) { y = 1.0 - y; + } else if (alist->parameter().type() == PanWidthAutomation) { + y = 2.0 * y - 1.0; } else if (alist->parameter().type() == PluginAutomation) { y = y * (double)(alist->get_max_y()- alist->get_min_y()) + alist->get_min_y(); } else { @@ -1078,10 +1189,10 @@ AutomationLine::model_to_view_coord (double& x, double& y) const alist->parameter().type() == EnvelopeAutomation) { 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 + alist->parameter().type() == PanElevationAutomation) { y = 1.0 - y; + } else if (alist->parameter().type() == PanWidthAutomation) { + y = .5 + y * .5; } else if (alist->parameter().type() == PluginAutomation) { y = (y - alist->get_min_y()) / (double)(alist->get_max_y()- alist->get_min_y()); } else { @@ -1105,7 +1216,7 @@ AutomationLine::interpolation_changed (AutomationList::InterpolationStyle style) void AutomationLine::add_visible_control_point (uint32_t view_index, uint32_t pi, double tx, double ty, - AutomationList::iterator model, uint32_t npoints) + AutomationList::iterator model, uint32_t npoints) { ControlPoint::ShapeType shape; @@ -1145,9 +1256,8 @@ AutomationLine::add_visible_control_point (uint32_t view_index, uint32_t pi, dou if (_visible & ControlPoints) { control_points[view_index]->show (); - control_points[view_index]->set_visible (true); } else { - control_points[view_index]->set_visible (false); + control_points[view_index]->hide (); } } @@ -1159,8 +1269,7 @@ AutomationLine::connect_to_list () 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() - ); + _list_connections, invalidator (*this), boost::bind (&AutomationLine::interpolation_changed, this, _1), gui_context()); } MementoCommandBinder*