Include pbd/crossthread.cc in the mingw build
[ardour.git] / gtk2_ardour / automation_line.cc
index 975281440a0d24cd95fc6142cdc458788a7186b3..aa4f25129934a88b472751e4f05e1fe811cf82c1 100644 (file)
 */
 
 #include <cmath>
+
+#ifdef COMPILER_MSVC
+#include <float.h>
+
+// 'std::isnan()' is not available in MSVC.
+#define isnan_local(val) (bool)_isnan((double)val)
+#else
+#define isnan_local std::isnan
+#endif
+
 #include <climits>
 #include <vector>
 #include <fstream>
 
-#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/parameter_types.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"
 #include "rgb_macros.h"
 #include "ardour_ui.h"
 #include "public_editor.h"
-#include "utils.h"
 #include "selection.h"
 #include "time_axis_view.h"
 #include "point_selection.h"
 #include "automation_time_axis.h"
-#include "public_editor.h"
 
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
+#include "ardour/value_as_string.h"
 
 #include "i18n.h"
 
@@ -53,14 +70,16 @@ 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<AutomationList> al,
-               Evoral::TimeConverter<double, framepos_t>* converter)
+AutomationLine::AutomationLine (const string&                              name,
+                                TimeAxisView&                              tv,
+                                ArdourCanvas::Item&                        parent,
+                                boost::shared_ptr<AutomationList>          al,
+                                const ParameterDescriptor&                 desc,
+                                Evoral::TimeConverter<double, framepos_t>* converter)
        : trackview (tv)
        , _name (name)
        , alist (al)
@@ -68,38 +87,40 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv
        , _parent_group (parent)
        , _offset (0)
        , _maximum_time (max_framepos)
+       , _desc (desc)
 {
        if (converter) {
-               _time_converter = converter;
                _our_time_converter = false;
        } else {
-               _time_converter = new Evoral::IdentityConverter<double, framepos_t>;
                _our_time_converter = true;
        }
        
-       points_visible = false;
+       _visible = Line;
+
        update_pending = false;
+       have_timeout = false;
        _uses_gain_mapping = false;
        no_draw = false;
-       _visible = true;
        _is_boolean = false;
        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::Container (&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);
 
        if (alist->parameter().type() == GainAutomation ||
-           alist->parameter().type() == EnvelopeAutomation) {
+           alist->parameter().type() == EnvelopeAutomation ||
+           desc.unit == ParameterDescriptor::DB) {
                set_uses_gain_mapping (true);
        }
 
@@ -124,49 +145,71 @@ AutomationLine::event_handler (GdkEvent* event)
        return PublicEditor::instance().canvas_line_event (event, line, this);
 }
 
-void
-AutomationLine::queue_reset ()
+bool
+AutomationLine::is_stepped() const
 {
-       if (!update_pending) {
-               update_pending = true;
-               Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&AutomationLine::reset, this));
-       }
+       return (_desc.toggled ||
+               (alist && alist->interpolation() == AutomationList::Discrete));
 }
 
 void
-AutomationLine::show ()
+AutomationLine::update_visibility ()
 {
-       if (alist->interpolation() != AutomationList::Discrete) {
-               line->show();
-       }
+       if (_visible & Line) {
+               /* Only show the line there are some points, otherwise we may show an out-of-date line
+                  when automation points have been removed (the line will still follow the shape of the
+                  old points).
+               */
+               if (control_points.size() >= 2) {
+                       line->show();
+               } else {
+                       line->hide ();
+               }
 
-       if (points_visible) {
+               if (_visible & ControlPoints) {
+                       for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+                               (*i)->show ();
+                       }
+               } else if (_visible & SelectedControlPoints) {
+                       for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+                               if ((*i)->get_selected()) {
+                                       (*i)->show ();
+                               } else {
+                                       (*i)->hide ();
+                               }
+                       }
+               } else {
+                       for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+                               (*i)->hide ();
+                       }
+               }
+
+       } else {
+               line->hide ();
                for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-                       (*i)->show ();
+                       if (_visible & ControlPoints) {
+                               (*i)->show ();
+                       } else {
+                               (*i)->hide ();
+                       }
                }
        }
 
-       _visible = true;
 }
 
 void
 AutomationLine::hide ()
 {
-       line->hide();
-       for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-               (*i)->hide();
-       }
-       _visible = false;
+       /* leave control points setting unchanged, we are just hiding the
+          overall line 
+       */
+       
+       set_visibility (AutomationLine::VisibleAspects (_visible & ~Line));
 }
 
 double
 AutomationLine::control_point_box_size ()
 {
-       if (alist->interpolation() == AutomationList::Discrete) {
-               return max((_height*4.0) / (double)(alist->parameter().max() - alist->parameter().min()),
-                               4.0);
-       }
-
        if (_height > TimeAxisView::preset_height (HeightLarger)) {
                return 8.0;
        } else if (_height > (guint32) TimeAxisView::preset_height (HeightNormal)) {
@@ -195,7 +238,7 @@ void
 AutomationLine::set_line_color (uint32_t color)
 {
        _line_color = color;
-       line->property_fill_color_rgba() = color;
+       line->set_outline_color (color);
 }
 
 void
@@ -238,30 +281,28 @@ 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) - _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<AutomationList> (memento_command_binder(), &get_state(), 0)
-               );
+               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) {
-               line->property_points() = line_points;
+               line->set_steps (line_points, is_stepped());
        }
 
        alist->freeze ();
-       sync_model_with_view_point (cp, 0);
+       sync_model_with_view_point (cp);
        alist->thaw ();
 
        update_pending = false;
 
        trackview.editor().session()->add_command (
-               new MementoCommand<AutomationList> (memento_command_binder(), 0, &alist->get_state())
-               );
+               new MementoCommand<AutomationList> (memento_command_binder(), 0, &alist->get_state()));
 
        trackview.editor().session()->commit_reversible_command ();
        trackview.editor().session()->set_dirty ();
@@ -271,18 +312,18 @@ 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 ();
        }
 }
 
 void
-AutomationLine::sync_model_with_view_points (list<ControlPoint*> cp, int64_t distance)
+AutomationLine::sync_model_with_view_points (list<ControlPoint*> cp)
 {
        update_pending = true;
 
        for (list<ControlPoint*>::iterator i = cp.begin(); i != cp.end(); ++i) {
-               sync_model_with_view_point (**i, distance);
+               sync_model_with_view_point (**i);
        }
 }
 
@@ -297,6 +338,31 @@ AutomationLine::get_verbose_cursor_string (double fraction) const
        return s;
 }
 
+string
+AutomationLine::get_verbose_cursor_relative_string (double original, double fraction) const
+{
+       std::string s = fraction_to_string (fraction);
+       if (_uses_gain_mapping) {
+               s += " dB";
+       }
+
+       std::string d = fraction_to_relative_string (original, fraction);
+
+       if (!d.empty()) {
+
+               s += " (\u0394";
+               s += d;
+
+               if (_uses_gain_mapping) {
+                       s += " dB";
+               }
+
+               s += ')';
+       }
+
+       return s;
+}
+
 /**
  *  @param fraction y fraction
  *  @return string representation of this value, using dB if appropriate.
@@ -304,27 +370,58 @@ AutomationLine::get_verbose_cursor_string (double fraction) const
 string
 AutomationLine::fraction_to_string (double fraction) const
 {
-       char buf[32];
-
        if (_uses_gain_mapping) {
+               char buf[32];
                if (fraction == 0.0) {
                        snprintf (buf, sizeof (buf), "-inf");
                } else {
                        snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain_with_max (fraction, Config->get_max_gain())));
                }
+               return buf;
        } else {
                view_to_model_coord_y (fraction);
-               if (EventTypeMap::instance().is_integer (alist->parameter())) {
-                       snprintf (buf, sizeof (buf), "%d", (int)fraction);
+               return ARDOUR::value_as_string (_desc, fraction);
+       }
+
+       return ""; /*NOTREACHED*/
+}
+
+/**
+ *  @param original an old y-axis fraction
+ *  @param fraction the new y fraction
+ *  @return string representation of the difference between original and fraction, using dB if appropriate.
+ */
+string
+AutomationLine::fraction_to_relative_string (double original, double fraction) const
+{
+       char buf[32];
+
+       if (original == fraction) {
+               return "0";
+       }
+
+       if (_uses_gain_mapping) {
+               if (original == 0.0) {
+                       /* there is no sensible representation of a relative
+                          change from -inf dB, so return an empty string.
+                       */
+                       return "";
+               } else if (fraction == 0.0) {
+                       snprintf (buf, sizeof (buf), "-inf");
                } else {
-                       snprintf (buf, sizeof (buf), "%.2f", fraction);
+                       double old_db = accurate_coefficient_to_dB (slider_position_to_gain_with_max (original, Config->get_max_gain()));
+                       double new_db = accurate_coefficient_to_dB (slider_position_to_gain_with_max (fraction, Config->get_max_gain()));
+                       snprintf (buf, sizeof (buf), "%.1f", new_db - old_db);
                }
+       } else {
+               view_to_model_coord_y (original);
+               view_to_model_coord_y (fraction);
+               return ARDOUR::value_as_string (_desc, fraction - original);
        }
 
        return buf;
 }
 
-
 /**
  *  @param s Value string in the form as returned by fraction_to_string.
  *  @return Corresponding y fraction.
@@ -361,8 +458,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<AutomationList> (memento_command_binder(), &get_state(), 0)
-               );
+               new MementoCommand<AutomationList> (memento_command_binder(), &get_state(), 0));
 
        _drag_points.clear ();
        _drag_points.push_back (cp);
@@ -388,10 +484,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<AutomationList> (memento_command_binder (), &get_state(), 0)
-               );
+               new MementoCommand<AutomationList> (memento_command_binder (), &get_state(), 0));
 
        _drag_points.clear ();
+
        for (uint32_t i = i1; i <= i2; i++) {
                _drag_points.push_back (nth (i));
        }
@@ -408,21 +504,105 @@ AutomationLine::start_drag_multiple (list<ControlPoint*> cp, float fraction, XML
 {
        trackview.editor().session()->begin_reversible_command (_("automation range move"));
        trackview.editor().session()->add_command (
-               new MementoCommand<AutomationList> (memento_command_binder(), state, 0)
-               );
+               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) {
+       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<ControlPoint*>::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)
@@ -436,86 +616,80 @@ AutomationLine::start_drag_common (double x, float fraction)
        _drag_had_movement = false;
        did_push = false;
 
-       _drag_points.sort (ControlPointSorter ());
+       /* they are probably ordered already, but we have to make sure */
 
-       /* 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;
-       }
+       _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<double, float>
-AutomationLine::drag_motion (double 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<ControlPoint*> 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<double,float> (x,fraction);
        }
 
        double dx = ignore_x ? 0 : (x - _drag_x);
        double dy = fraction - _last_drag_fraction;
 
-       /* 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) {
+       if (!_drag_had_movement) {
 
-                       /* clamp min x */
-                       double const a = (*i)->get_x() + dx;
-                       double const b = before_x + 1;
-                       if (a < b) {
-                               dx += b - a;
+               /* "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<ControlPoint*>::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;
+               }
 
-                       /* clamp max x */
-                       if (after) {
+               if (contiguous_points.back()->empty()) {
+                       contiguous_points.pop_back ();
+               }
 
-                               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;
-                                       }
-                               }
+               for (vector<CCP>::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.
+        */
+
+       if (dx < 0 || ((dx > 0) && !with_push)) {
+               for (vector<CCP>::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<ControlPoint*>::iterator i = points.begin(); i != points.end(); ++i) {
+       
+       for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
                double const y = ((_height - (*i)->get_y()) / _height) + dy;
                if (y < 0) {
                        dy -= y;
@@ -525,67 +699,76 @@ AutomationLine::drag_motion (double x, float fraction, bool ignore_x, bool with_
                }
        }
 
-       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);
-       }
+       if (dx || dy) {
 
-       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);
+               /* and now move each section */
+               
+               for (vector<CCP>::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)
+                */
 
+               if (line_points.size() > 1) {
+                       line->set_steps (line_points, is_stepped());
+               }
+       }
+       
+       _drag_distance += dx;
+       _drag_x += dx;
+       _last_drag_fraction = fraction;
        _drag_had_movement = true;
        did_push = with_push;
 
-       return clamped;
+       return pair<double, float> (_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<ControlPoint*> 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, trackview.editor().unit_to_frame (_drag_distance));
-
        alist->thaw ();
 
        update_pending = false;
 
        trackview.editor().session()->add_command (
-               new MementoCommand<AutomationList>(memento_command_binder (), 0, &alist->get_state())
-               );
+               new MementoCommand<AutomationList>(memento_command_binder (), 0, &alist->get_state()));
 
        trackview.editor().session()->set_dirty ();
        did_push = false;
+
+       contiguous_points.clear ();
 }
 
 void
-AutomationLine::sync_model_with_view_point (ControlPoint& cp, framecnt_t distance)
+AutomationLine::sync_model_with_view_point (ControlPoint& cp)
 {
        /* find out where the visual control point is.
           initial results are in canvas units. ask the
@@ -597,10 +780,10 @@ AutomationLine::sync_model_with_view_point (ControlPoint& cp, framecnt_t distanc
 
        /* if xval has not changed, set it directly from the model to avoid rounding errors */
 
-       if (view_x == trackview.editor().frame_to_unit (_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);
        }
 
@@ -609,11 +792,6 @@ AutomationLine::sync_model_with_view_point (ControlPoint& cp, framecnt_t distanc
        view_to_model_coord_y (view_y);
 
        alist->modify (cp.model(), view_x, view_y);
-
-       if (did_push) {
-               /* move all points after cp by the same distance */
-               alist->slide (cp.model()++, _time_converter->from (distance));
-       }
 }
 
 bool
@@ -623,7 +801,7 @@ AutomationLine::control_points_adjacent (double xval, uint32_t & before, uint32_
        ControlPoint *acp = 0;
        double unit_xval;
 
-       unit_xval = trackview.editor().frame_to_unit (xval);
+       unit_xval = trackview.editor().sample_to_pixel_unrounded (xval);
 
        for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
 
@@ -685,8 +863,7 @@ AutomationLine::remove_point (ControlPoint& cp)
        alist->erase (cp.model());
        
        trackview.editor().session()->add_command(
-               new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state())
-               );
+               new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state()));
 
        trackview.editor().session()->commit_reversible_command ();
        trackview.editor().session()->set_dirty ();
@@ -700,9 +877,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<Selectable*>& results
-       )
+AutomationLine::get_selectables (framepos_t start, framepos_t end, double botfrac, double topfrac, list<Selectable*>& results)
 {
        /* convert fractions to display coordinates with 0 at the top of the track */
        double const bot_track = (1 - topfrac) * trackview.current_height ();
@@ -740,12 +915,18 @@ AutomationLine::set_selected_points (PointSelection const & points)
                (*i)->set_selected (true);
        }
 
+       if (points.empty()) {
+               remove_visibility (SelectedControlPoints);
+       } else {
+               add_visibility (SelectedControlPoints);
+       }
+
        set_colors ();
 }
 
 void AutomationLine::set_colors ()
 {
-       set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
+       set_line_color (ARDOUR_UI::config()->get_AutomationLine());
        for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
                (*i)->set_color ();
        }
@@ -754,7 +935,12 @@ void AutomationLine::set_colors ()
 void
 AutomationLine::list_changed ()
 {
-       queue_reset ();
+       DEBUG_TRACE (DEBUG::Automation, string_compose ("\tline changed, existing update pending? %1\n", update_pending));
+
+       if (!update_pending) {
+               update_pending = true;
+               Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&AutomationLine::queue_reset, this));
+       }
 }
 
 void
@@ -793,9 +979,9 @@ AutomationLine::reset_callback (const Evoral::ControlList& events)
 
                model_to_view_coord (tx, ty);
 
-               if (std::isnan (tx) || std::isnan (ty)) {
+               if (isnan_local (tx) || isnan_local (ty)) {
                        warning << string_compose (_("Ignoring illegal points on AutomationLine \"%1\""),
-                                                  _name) << endmsg;
+                                                  _name) << endmsg;
                        continue;
                }
                
@@ -807,7 +993,7 @@ AutomationLine::reset_callback (const Evoral::ControlList& events)
                 * zoom and scroll into account).
                 */
                        
-               tx = trackview.editor().frame_to_unit (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)
@@ -836,7 +1022,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) {
@@ -844,15 +1030,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_steps (line_points, is_stepped());
 
-               if (_visible && alist->interpolation() != AutomationList::Discrete) {
-                       line->show();
-               }
+               update_visibility ();
        }
 
        set_selected_points (trackview.editor().get_selection().points);
@@ -861,7 +1045,9 @@ AutomationLine::reset_callback (const Evoral::ControlList& events)
 void
 AutomationLine::reset ()
 {
+       DEBUG_TRACE (DEBUG::Automation, "\t\tLINE RESET\n");
        update_pending = false;
+       have_timeout = false;
 
        if (no_draw) {
                return;
@@ -870,6 +1056,27 @@ AutomationLine::reset ()
        alist->apply_to_points (*this, &AutomationLine::reset_callback);
 }
 
+void
+AutomationLine::queue_reset ()
+{
+       /* this must be called from the GUI thread
+        */
+
+       if (trackview.editor().session()->transport_rolling() && alist->automation_write()) {
+               /* automation write pass ... defer to a timeout */
+               /* redraw in 1/4 second */
+               if (!have_timeout) {
+                       DEBUG_TRACE (DEBUG::Automation, "\tqueue timeout\n");
+                       Glib::signal_timeout().connect (sigc::bind_return (sigc::mem_fun (*this, &AutomationLine::reset), false), 250);
+                       have_timeout = true;
+               } else {
+                       DEBUG_TRACE (DEBUG::Automation, "\ttimeout already queued, change ignored\n");
+               }
+       } else {
+               reset ();
+       }
+}
+
 void
 AutomationLine::clear ()
 {
@@ -878,13 +1085,7 @@ AutomationLine::clear ()
        alist->clear();
 
        trackview.editor().session()->add_command (
-               new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state())
-               );
-}
-
-void
-AutomationLine::change_model (AutomationList::iterator /*i*/, double /*x*/, double /*y*/)
-{
+               new MementoCommand<AutomationList> (memento_command_binder (), &before, &alist->get_state()));
 }
 
 void
@@ -896,53 +1097,48 @@ AutomationLine::set_list (boost::shared_ptr<ARDOUR::AutomationList> list)
 }
 
 void
-AutomationLine::show_all_control_points ()
+AutomationLine::add_visibility (VisibleAspects va)
 {
-       if (_is_boolean) {
-               // show the line but don't allow any control points
-               return;
-       }
+       VisibleAspects old = _visible;
 
-       points_visible = true;
+       _visible = VisibleAspects (_visible | va);
 
-       for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-               if (!(*i)->visible()) {
-                       (*i)->show ();
-                       (*i)->set_visible (true);
-               }
+       if (old != _visible) {
+               update_visibility ();
        }
 }
 
 void
-AutomationLine::hide_all_but_selected_control_points ()
+AutomationLine::set_visibility (VisibleAspects va)
 {
-       if (alist->interpolation() == AutomationList::Discrete) {
-               return;
+       if (_visible != va) {
+               _visible = va;
+               update_visibility ();
        }
+}
 
-       points_visible = false;
+void
+AutomationLine::remove_visibility (VisibleAspects va)
+{
+       VisibleAspects old = _visible;
 
-       for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-               if (!(*i)->get_selected()) {
-                       (*i)->set_visible (false);
-               }
+       _visible = VisibleAspects (_visible & ~va);
+
+       if (old != _visible) {
+               update_visibility ();
        }
 }
 
 void
 AutomationLine::track_entered()
 {
-       if (alist->interpolation() != AutomationList::Discrete) {
-               show_all_control_points();
-       }
+       add_visibility (ControlPoints);
 }
 
 void
 AutomationLine::track_exited()
 {
-       if (alist->interpolation() != AutomationList::Discrete) {
-               hide_all_but_selected_control_points();
-       }
+       remove_visibility (ControlPoints);
 }
 
 XMLNode &
@@ -969,41 +1165,46 @@ AutomationLine::view_to_model_coord (double& x, double& y) const
 void
 AutomationLine::view_to_model_coord_y (double& y) const
 {
-       /* TODO: This should be more generic ... */
+       /* TODO: This should be more generic (use ParameterDescriptor) */
        if (alist->parameter().type() == GainAutomation ||
            alist->parameter().type() == EnvelopeAutomation) {
                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 ||
-                   alist->parameter().type() == PanElevationAutomation ||
-                   alist->parameter().type() == PanWidthAutomation) {
+                  alist->parameter().type() == PanElevationAutomation) {
                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 if (alist->parameter().type() == PanWidthAutomation) {
+               y = 2.0 * y - 1.0;
        } else {
-               y = rint (y * alist->parameter().max());
+               y = y * (double)(alist->get_max_y() - alist->get_min_y()) + alist->get_min_y();
+               if (_desc.toggled || _desc.integer_step) {
+                       y = round(y);
+               }
        }
 }
 
 void
-AutomationLine::model_to_view_coord (double& x, double& y) const
+AutomationLine::model_to_view_coord_y (double& y) const
 {
-       /* TODO: This should be more generic ... */
+       /* TODO: This should be more generic (use ParameterDescriptor) */
        if (alist->parameter().type() == GainAutomation ||
            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() == PluginAutomation) {
-               y = (y - alist->get_min_y()) / (double)(alist->get_max_y()- alist->get_min_y());
+       } else if (alist->parameter().type() == PanWidthAutomation) {
+               y = .5 + y * .5;
        } else {
-               y = y / (double)alist->parameter().max(); /* ... like this */
+               y = (y - alist->get_min_y()) / (double)(alist->get_max_y() - alist->get_min_y());
        }
+}
 
+void
+AutomationLine::model_to_view_coord (double& x, double& y) const
+{
+       model_to_view_coord_y (y);
        x = _time_converter->to (x) - _offset;
 }
 
@@ -1011,18 +1212,14 @@ AutomationLine::model_to_view_coord (double& x, double& y) const
 void
 AutomationLine::interpolation_changed (AutomationList::InterpolationStyle style)
 {
-       if (style == AutomationList::Discrete) {
-               show_all_control_points();
-               line->hide();
-       } else {
-               hide_all_but_selected_control_points();
-               line->show();
+       if (line_points.size() > 1) {
+               line->set_steps(line_points, is_stepped());
        }
 }
 
 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;
 
@@ -1060,13 +1257,10 @@ AutomationLine::add_visible_control_point (uint32_t view_index, uint32_t pi, dou
 
        /* finally, control visibility */
 
-       if (_visible && points_visible) {
+       if (_visible & ControlPoints) {
                control_points[view_index]->show ();
-               control_points[view_index]->set_visible (true);
        } else {
-               if (!points_visible) {
-                       control_points[view_index]->set_visible (false);
-               }
+               control_points[view_index]->hide ();
        }
 }
 
@@ -1078,8 +1272,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<AutomationList>*