X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.cc;h=844063a22726ac7b6a3d04b75c1a6885482b063c;hb=50dd880d7e75b49e7c80c79f32165a756839651c;hp=b87a71ca875aa1699dc861659856f08371a4ec0b;hpb=fe13d08874f08b723df53116e5655c3d229a657e;p=ardour.git

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index b87a71ca87..844063a227 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2003 Paul Davis 
+    Copyright (C) 2002-2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,21 +15,25 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cmath>
 #include <climits>
 #include <vector>
+#include <fstream>
 
-#include <pbd/stl_delete.h>
+#include "pbd/stl_delete.h"
+#include "pbd/memento_command.h"
+#include "pbd/stacktrace.h"
 
-#include <ardour/automation_event.h>
-#include <ardour/curve.h>
-#include <ardour/dB.h>
+#include "ardour/automation_list.h"
+#include "ardour/dB.h"
+#include "evoral/Curve.hpp"
 
 #include "simplerect.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"
@@ -41,192 +45,32 @@
 #include "automation_time_axis.h"
 #include "public_editor.h"
 
-#include <ardour/session.h>
+#include "ardour/event_type_map.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
 using namespace Gnome; // for Canvas
 
-ControlPoint::ControlPoint (AutomationLine& al)
-	: line (al)
-{
-	model = al.the_list().end();
-	view_index = 0;
-	can_slide = true;
-	_x = 0;
-	_y = 0;
-	_shape = Full;
-	_size = 4.0;
-	selected = false;
-
-	item = new Canvas::SimpleRect (line.canvas_group());
-	item->property_draw() = true;
-	item->property_fill() = false;
-	item->property_fill_color_rgba() =  color_map[cControlPointFill];
-	item->property_outline_color_rgba() = color_map[cControlPointOutline];
-	item->property_outline_pixels() = 1;
-	item->set_data ("control_point", this);
-	item->signal_event().connect (mem_fun (this, &ControlPoint::event_handler));
-
-	hide ();
-	set_visible (false);
-}
-
-ControlPoint::ControlPoint (const ControlPoint& other, bool dummy_arg_to_force_special_copy_constructor)
-	: line (other.line)
-{
-	if (&other == this) {
-		return;
-	}
-
-	model = other.model;
-	view_index = other.view_index;
-	can_slide = other.can_slide;
-	_x = other._x;
-	_y = other._y;
-	_shape = other._shape;
-	_size = other._size;
-	selected = false;
-
-	item = new Canvas::SimpleRect (line.canvas_group());
-	item->property_fill() = false;
-	item->property_outline_color_rgba() = color_map[cEnteredControlPointOutline];
-	item->property_outline_pixels() = 1;
-	
-	/* NOTE: no event handling in copied ControlPoints */
-
-	hide ();
-	set_visible (false);
-}
-
-ControlPoint::~ControlPoint ()
-{
-	delete item;
-}
-
-bool
-ControlPoint::event_handler (GdkEvent* event)
-{
-	return PublicEditor::instance().canvas_control_point_event (event, item, this);
-}
-
-void
-ControlPoint::hide ()
-{
-	item->hide();
-}
-
-void
-ControlPoint::show()
-{
-	item->show();
-}
-
-void
-ControlPoint::set_visible (bool yn)
-{
-	item->property_draw() = (gboolean) yn;
-}
+static const Evoral::IdentityConverter<double, sframes_t> default_converter;
 
-void
-ControlPoint::reset (double x, double y, AutomationList::iterator mi, uint32_t vi, ShapeType shape)
-{
-	model = mi;
-	view_index = vi;
-	move_to (x, y, shape);
-}
-
-void
-ControlPoint::show_color (bool entered, bool hide_too)
-{
-	if (entered) {
-		if (selected) {
-			item->property_outline_color_rgba() = color_map[cEnteredControlPointSelected];
-			set_visible(true);
-		} else {
-			item->property_outline_color_rgba() = color_map[cEnteredControlPoint];
-			if (hide_too) {
-				set_visible(false);
-			}
-		}
-
-	} else {
-		if (selected) {
-			item->property_outline_color_rgba() = color_map[cControlPointSelected];
-			set_visible(true);
-		} else {
-			item->property_outline_color_rgba() = color_map[cControlPoint];
-			if (hide_too) {
-				set_visible(false);
-			}
-		}
-	}
-}
-
-void
-ControlPoint::set_size (double sz)
-{
-	_size = sz;
-
-#if 0	
-	if (_size > 6.0) {
-		item->property_fill() = (gboolean) TRUE;
-	} else {
-		item->property_fill() = (gboolean) FALSE;
-	}
-#endif
-
-	move_to (_x, _y, _shape);
-}
-
-void
-ControlPoint::move_to (double x, double y, ShapeType shape)
-{
-	double x1 = 0;
-	double x2 = 0;
-	double half_size = rint(_size/2.0);
-
-	switch (shape) {
-	case Full:
-		x1 = x - half_size;
-		x2 = x + half_size;
-		break;
-	case Start:
-		x1 = x;
-		x2 = x + half_size;
-		break;
-	case End:
-		x1 = x - half_size;
-		x2 = x;
-		break;
-	}
-
-	item->property_x1() = x1;
-	item->property_x2() = x2;
-	item->property_y1() = y - half_size;
-	item->property_y2() = y + half_size;
-
-	_x = x;
-	_y = y;
-	_shape = shape;
-}
-
-/*****/
-
-AutomationLine::AutomationLine (const string & name, TimeAxisView& tv, ArdourCanvas::Group& parent, AutomationList& al)
-	: trackview (tv),
-	  _name (name),
-	  alist (al),
-	  _parent_group (parent)
+AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Group& parent,
+		boost::shared_ptr<AutomationList> al,
+		const Evoral::TimeConverter<double, sframes_t>* converter)
+	: trackview (tv)
+	, _name (name)
+	, alist (al)
+	, _parent_group (parent)
+	, _time_converter (converter ? (*converter) : default_converter)
 {
+	_interpolation = al->interpolation();
 	points_visible = false;
 	update_pending = false;
-	_vc_uses_gain_mapping = false;
+	_uses_gain_mapping = false;
 	no_draw = false;
 	_visible = true;
 	terminal_points_can_slide = true;
@@ -240,9 +84,18 @@ AutomationLine::AutomationLine (const string & name, TimeAxisView& tv, ArdourCan
 	line->property_width_pixels() = (guint)1;
 	line->set_data ("line", this);
 
-	line->signal_event().connect (mem_fun (*this, &AutomationLine::event_handler));
+	line->signal_event().connect (sigc::mem_fun (*this, &AutomationLine::event_handler));
+
+	alist->StateChanged.connect (_state_connection, invalidator (*this), boost::bind (&AutomationLine::list_changed, this), gui_context());
 
-	alist.StateChanged.connect (mem_fun(*this, &AutomationLine::list_changed));
+	trackview.session()->register_with_memento_command_factory(alist->id(), this);
+
+	if (alist->parameter().type() == GainAutomation ||
+	    alist->parameter().type() == EnvelopeAutomation) {
+		set_uses_gain_mapping (true);
+	}
+
+	set_interpolation(alist->interpolation());
 }
 
 AutomationLine::~AutomationLine ()
@@ -262,22 +115,16 @@ AutomationLine::queue_reset ()
 {
 	if (!update_pending) {
 		update_pending = true;
-		Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &AutomationLine::reset));
+		Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&AutomationLine::reset, this));
 	}
 }
 
 void
-AutomationLine::set_point_size (double sz)
+AutomationLine::show ()
 {
-	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-		(*i)->set_size (sz);
+	if (_interpolation != AutomationList::Discrete) {
+		line->show();
 	}
-}	
-
-void
-AutomationLine::show () 
-{
-	line->show();
 
 	if (points_visible) {
 		for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
@@ -289,7 +136,7 @@ AutomationLine::show ()
 }
 
 void
-AutomationLine::hide () 
+AutomationLine::hide ()
 {
 	line->hide();
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
@@ -298,18 +145,32 @@ AutomationLine::hide ()
 	_visible = false;
 }
 
+double
+AutomationLine::control_point_box_size ()
+{
+	if (_interpolation == AutomationList::Discrete) {
+		return max((_height*4.0) / (double)(alist->parameter().max() - alist->parameter().min()),
+				4.0);
+	}
+
+	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<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+			(*i)->set_size (bsz);
 		}
 
 		reset ();
@@ -324,10 +185,10 @@ AutomationLine::set_line_color (uint32_t color)
 }
 
 void
-AutomationLine::set_verbose_cursor_uses_gain_mapping (bool yn)
+AutomationLine::set_uses_gain_mapping (bool yn)
 {
-	if (yn != _vc_uses_gain_mapping) {
-		_vc_uses_gain_mapping = yn;
+	if (yn != _uses_gain_mapping) {
+		_uses_gain_mapping = yn;
 		reset ();
 	}
 }
@@ -343,23 +204,8 @@ AutomationLine::nth (uint32_t n)
 }
 
 void
-AutomationLine::modify_view (ControlPoint& cp, double x, double y, bool with_push)
+AutomationLine::modify_point_y (ControlPoint& cp, double y)
 {
-	modify_view_point (cp, x, y, with_push);
-	update_line ();
-}
-
-void
-AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, 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.
 	*/
@@ -368,128 +214,46 @@ AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool wi
 	y = min (1.0, y);
 	y = _height - (y * _height);
 
-	if (cp.can_slide) {
-
-		/* 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 {
+	double const x = trackview.editor().frame_to_unit (_time_converter.to((*cp.model())->when));
 
-		/* leave the x-coordinate alone */
+	trackview.editor().session()->begin_reversible_command (_("automation event move"));
+	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &get_state(), 0));
 
-		x = trackview.editor.frame_to_unit ((*cp.model)->when);
+	cp.move_to (x, y, ControlPoint::Full);
+	reset_line_coords (cp);
 
+	if (line_points.size() > 1) {
+		line->property_points() = line_points;
 	}
 
-	if (!with_push) {
+	alist->freeze ();
+	sync_model_with_view_point (cp, false, 0);
+	alist->thaw ();
 
-		cp.move_to (x, y, ControlPoint::Full);
-		reset_line_coords (cp);
-
-	} else {
+	update_pending = false;
 
-		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);
-			}
-		}
-	}
+	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), 0, &alist->get_state()));
+	trackview.editor().session()->commit_reversible_command ();
+	trackview.editor().session()->set_dirty ();
 }
 
 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
-AutomationLine::sync_model_with_view_line (uint32_t start, uint32_t end)
+AutomationLine::sync_model_with_view_points (list<ControlPoint*> cp, bool did_push, int64_t distance)
 {
-
-	ControlPoint *p;
-
 	update_pending = true;
 
-	for (uint32_t i = start; i <= end; ++i) {
-		p = nth(i);
-		sync_model_with_view_point(*p);
+	for (list<ControlPoint*>::iterator i = cp.begin(); i != cp.end(); ++i) {
+		sync_model_with_view_point (**i, did_push, distance);
 	}
-	
-	
 }
 
 void
@@ -499,31 +263,28 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr)
 	   initial results are in canvas units. ask the
 	   line to convert them to something relevant.
 	*/
-	
-	mr.xval = (jack_nframes_t) floor (cp.get_x());
-	mr.yval = 1.0 - (cp.get_y() / _height);
 
+	mr.xval = 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 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;
+	if (mr.xval == trackview.editor().frame_to_unit(_time_converter.to((*cp.model())->when))) {
+		mr.xval = (*cp.model())->when;
 	} else {
-		mr.xval = trackview.editor.unit_to_frame (mr.xval);
+		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.
+	/* convert to model units
 	*/
-	
-	view_to_model_y (mr.yval);
+
+	view_to_model_coord (mr.xval, mr.yval);
 
 	/* part 2: find out where the model point is now
 	 */
 
-	mr.xpos = (jack_nframes_t) (*cp.model)->when;
-	mr.ypos = (*cp.model)->value;
+	mr.xpos = (*cp.model())->when;
+	mr.ypos = (*cp.model())->value;
 
 	/* part 3: get the position of the visual control
 	   points before and after us.
@@ -532,143 +293,50 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr)
 	ControlPoint* before;
 	ControlPoint* after;
 
-	if (cp.view_index) {
-		before = nth (cp.view_index - 1);
+	if (cp.view_index()) {
+		before = nth (cp.view_index() - 1);
 	} else {
 		before = 0;
 	}
 
-	after = nth (cp.view_index + 1);
+	after = nth (cp.view_index() + 1);
 
 	if (before) {
-		mr.xmin = (jack_nframes_t) (*before->model)->when;
-		mr.ymin = (*before->model)->value;
-		mr.start = before->model;
+		mr.xmin = (*before->model())->when;
+		mr.ymin = (*before->model())->value;
+		mr.start = before->model();
 		++mr.start;
 	} else {
 		mr.xmin = mr.xpos;
 		mr.ymin = mr.ypos;
-		mr.start = cp.model;
+		mr.start = cp.model();
 	}
 
 	if (after) {
-		mr.end = after->model;
+		mr.end = after->model();
 	} else {
 		mr.xmax = mr.xpos;
 		mr.ymax = mr.ypos;
-		mr.end = cp.model;
+		mr.end = cp.model();
 		++mr.end;
 	}
 }
 
-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)
 {
 	uint32_t view_index, pi, n;
 	AutomationList::iterator model;
 	uint32_t npoints;
-	double last_control_point_x = 0.0;
-	double last_control_point_y = 0.0;
 	uint32_t this_rx = 0;
 	uint32_t prev_rx = 0;
 	uint32_t this_ry = 0;
- 	uint32_t prev_ry = 0;	
+	uint32_t prev_ry = 0;
 	double* slope;
+	uint32_t box_size;
 
 	/* hide all existing points, and the line */
-	
+
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
 		(*i)->hide();
 	}
@@ -691,15 +359,31 @@ 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;
 
-	for (model = alist.begin(), pi = 0; pi < npoints; ++model, ++pi) {
+	for (model = alist->begin(), pi = 0; pi < npoints; ++model, ++pi) {
 
 		double tx = points[pi].x;
 		double ty = points[pi].y;
 
+		if (find (_always_in_view.begin(), _always_in_view.end(), (*model)->when) != _always_in_view.end()) {
+			add_visible_control_point (view_index, pi, tx, ty, model, npoints);
+			prev_rx = this_rx;
+			prev_ry = this_ry;
+			++view_index;
+			continue;
+		}
+
+		if (isnan (tx) || isnan (ty)) {
+			warning << string_compose (_("Ignoring illegal points on AutomationLine \"%1\""),
+						   _name) << endmsg;
+			continue;
+		}
+
 		/* now ensure that the control_points vector reflects the current curve
 		   state, but don't plot control points too close together. also, don't
 		   plot a series of points all with the same value.
@@ -718,11 +402,11 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
 			if (slope[pi] == slope[pi-1]) {
 
 				/* no reason to display this point */
-				
+
 				continue;
 			}
 		}
-		
+
 		/* need to round here. the ultimate coordinates are integer
 		   pixels, so tiny deltas in the coords will be eliminated
 		   and we end up with "colinear" line segments. since the
@@ -732,72 +416,22 @@ 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)) {
- 
-  			continue;
-		} 
+		this_ry = (uint32_t) rint (ty);
 
-		/* ok, we should display this point */
-
-		if (view_index >= control_points.size()) {
-			/* 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);
-			}
-
-			control_points.push_back (ncp);
-		}
-
-		ControlPoint::ShapeType shape;
-
-		if (!terminal_points_can_slide) {
-			if (pi == 0) {
-				control_points[view_index]->can_slide = false;
-				if (tx == 0) {
-					shape = ControlPoint::Start;
-				} else {
-					shape = ControlPoint::Full;
-				}
-			} else if (pi == npoints - 1) {
-				control_points[view_index]->can_slide = false;
-				shape = ControlPoint::End;
-			} else {
-				control_points[view_index]->can_slide = true;
-				shape = ControlPoint::Full;
-			}
-		} else {
-			control_points[view_index]->can_slide = true;
-			shape = ControlPoint::Full;
+		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;
 		}
 
-		last_control_point_x = tx;
-		last_control_point_y = ty;
-
-		control_points[view_index]->reset (tx, ty, model, view_index, shape);
+		/* 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;
 
-		/* finally, control visibility */
-		
-		if (_visible && points_visible) {
-			control_points[view_index]->show ();
-			control_points[view_index]->set_visible (true);
-		} else {
-			if (!points_visible) {
-				control_points[view_index]->set_visible (false);
-			}
-		}
-
 		view_index++;
 	}
 
@@ -810,7 +444,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
 	}
 
 	if (!terminal_points_can_slide) {
-		control_points.back()->can_slide = false;
+		control_points.back()->set_can_slide(false);
 	}
 
 	delete [] slope;
@@ -818,46 +452,97 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
 	if (view_index > 1) {
 
 		npoints = view_index;
-		
+
 		/* reset the line coordinates */
 
 		while (line_points.size() < npoints) {
 			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());
 		}
-		
+
 		line->property_points() = line_points;
 
-		if (_visible) {
-			line->show ();
+		if (_visible && _interpolation != AutomationList::Discrete) {
+			line->show();
 		}
-	} 
 
-	set_selected_points (trackview.editor.get_selection().points);
+	}
+
+	set_selected_points (trackview.editor().get_selection().points);
+}
+
+string
+AutomationLine::get_verbose_cursor_string (double fraction) const
+{
+	std::string s = fraction_to_string (fraction);
+	if (_uses_gain_mapping) {
+		s += " dB";
+	}
+
+	return s;
 }
 
+/**
+ *  @param fraction y fraction
+ *  @return string representation of this value, using dB if appropriate.
+ */
 string
-AutomationLine::get_verbose_cursor_string (float fraction)
+AutomationLine::fraction_to_string (double fraction) const
 {
 	char buf[32];
 
-	if (_vc_uses_gain_mapping) {
+	if (_uses_gain_mapping) {
 		if (fraction == 0.0) {
-			snprintf (buf, sizeof (buf), "-inf dB");
+			snprintf (buf, sizeof (buf), "-inf");
 		} else {
-			snprintf (buf, sizeof (buf), "%.1fdB", coefficient_to_dB (slider_position_to_gain (fraction)));
+			snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain (fraction)));
 		}
 	} else {
-		snprintf (buf, sizeof (buf), "%.2f", fraction);
+		double dummy = 0.0;
+		view_to_model_coord (dummy, fraction);
+		if (EventTypeMap::instance().is_integer (alist->parameter())) {
+			snprintf (buf, sizeof (buf), "%d", (int)fraction);
+		} else {
+			snprintf (buf, sizeof (buf), "%.2f", fraction);
+		}
 	}
 
 	return buf;
 }
 
+
+/**
+ *  @param s Value string in the form as returned by fraction_to_string.
+ *  @return Corresponding y fraction.
+ */
+double
+AutomationLine::string_to_fraction (string const & s) const
+{
+	if (s == "-inf") {
+		return 0;
+	}
+
+	double v;
+	sscanf (s.c_str(), "%lf", &v);
+
+	if (_uses_gain_mapping) {
+		v = gain_to_slider_position (dB_to_coefficient (v));
+	} else {
+		double dummy = 0.0;
+		model_to_view_coord (dummy, v);
+	}
+
+	return v;
+}
+
 bool
 AutomationLine::invalid_point (ALPoints& p, uint32_t index)
 {
@@ -871,100 +556,321 @@ AutomationLine::invalidate_point (ALPoints& p, uint32_t index)
 	p[index].y = DBL_MAX;
 }
 
+/** 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 (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 (ControlPoint* cp, float fraction) 
+AutomationLine::start_drag_single (ControlPoint* cp, double x, float fraction)
 {
-	if (trackview.editor.current_session() == 0) { /* how? */
-		return;
+	trackview.editor().session()->begin_reversible_command (_("automation event move"));
+	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &get_state(), 0));
+
+	_drag_points.clear ();
+	_drag_points.push_back (cp);
+
+	if (cp->selected ()) {
+		for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+			if (*i != cp && (*i)->selected()) {
+				_drag_points.push_back (*i);
+			}
+		}
 	}
+	
+	start_drag_common (x, fraction);
+}
 
-	string str;
+/** Start dragging a line vertically (with no change in x)
+ *  @param i1 Control point index of the `left' point on the line.
+ *  @param i2 Control point index of the `right' point on the line.
+ *  @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_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));
 
-	if (cp) {
-		str = _("automation event move");
-	} else {
-		str = _("automation range drag");
+	_drag_points.clear ();
+	for (uint32_t i = i1; i <= i2; i++) {
+		_drag_points.push_back (nth (i));
 	}
 
-	trackview.editor.current_session()->begin_reversible_command (str);
-	trackview.editor.current_session()->add_undo (get_memento());
-	
-	first_drag_fraction = fraction;
-	last_drag_fraction = fraction;
-	drags = 0;
+	start_drag_common (0, fraction);
 }
 
+/** Start dragging multiple points (with no change in x)
+ *  @param cp Points to drag.
+ *  @param fraction Initial y position (as a fraction of the track height, where 0 is the bottom and 1 the top)
+ */
 void
-AutomationLine::point_drag (ControlPoint& cp, jack_nframes_t x, float fraction, bool with_push) 
+AutomationLine::start_drag_multiple (list<ControlPoint*> cp, float fraction, XMLNode* state)
 {
-	modify_view (cp, x, fraction, with_push);
-	drags++;
+	trackview.editor().session()->begin_reversible_command (_("automation range move"));
+	trackview.editor().session()->add_command (new MementoCommand<AutomationList>(*alist.get(), 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 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::line_drag (uint32_t i1, uint32_t i2, float fraction, bool with_push) 
+AutomationLine::start_drag_common (double x, float fraction)
 {
-	double ydelta = fraction - last_drag_fraction;
-	
-	last_drag_fraction = fraction;
+	_drag_x = x;
+	_drag_distance = 0;
+	_last_drag_fraction = fraction;
+	_drag_had_movement = false;
+	did_push = false;
 
-	line_drag_cp1 = i1;
-	line_drag_cp2 = i2;
-	
-	ControlPoint *cp;
+	_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 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)
+{
+	/* 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;
+
+	/* 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;
+		}
+		if (y > 1) {
+			dy -= (y - 1);
+		}
+	}
+
+	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 (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);
+		}
+	}
 
-	for (uint32_t i = i1 ; i <= i2; i++) {
-		cp = nth (i);
-		modify_view_point (*cp, trackview.editor.unit_to_frame (cp->get_x()), ((_height - cp->get_y()) /_height) + ydelta, with_push);
+	if (line_points.size() > 1) {
+		line->property_points() = line_points;
 	}
 
-	update_line ();
+	_drag_had_movement = true;
+	did_push = with_push;
 
-	drags++;
+	return clamped;
 }
 
+/** Should be called to indicate the end of a drag */
 void
-AutomationLine::end_drag (ControlPoint* cp) 
+AutomationLine::end_drag ()
 {
-	if (drags) {
+	if (!_drag_had_movement) {
+		return;
+	}
 
-		if (cp) {
-			sync_model_from (*cp);
-		} else {
-			sync_model_with_view_line (line_drag_cp1, line_drag_cp2);
+	alist->freeze ();
+
+	/* 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()->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);
 
-		update_pending = false;
+		/* all later points move by the same distance along the x-axis as the main point */
 
-		trackview.editor.current_session()->add_redo_no_execute (get_memento());
-		trackview.editor.current_session()->commit_reversible_command ();
-		trackview.editor.current_session()->set_dirty ();
+		if (delta) {
+			alist->modify (i, (*i)->when + distance, (*i)->value + delta);
+		}
+
+		++i;
+	}
+
+	if (did_push) {
+
+		/* move all points after the range represented by the view by the same distance
+		   as the main point moved.
+		*/
+
+		alist->slide (mr.end, distance);
 	}
 }
 
-bool 
+bool
 AutomationLine::control_points_adjacent (double xval, uint32_t & before, uint32_t& after)
 {
 	ControlPoint *bcp = 0;
 	ControlPoint *acp = 0;
 	double unit_xval;
 
-	/* xval is in frames */
-
-	unit_xval = trackview.editor.frame_to_unit (xval);
+	unit_xval = trackview.editor().frame_to_unit (xval);
 
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-		
+
 		if ((*i)->get_x() <= unit_xval) {
 
 			if (!bcp || (*i)->get_x() > bcp->get_x()) {
 				bcp = *i;
-				before = bcp->view_index;
-			} 
+				before = bcp->view_index();
+			}
 
 		} else if ((*i)->get_x() > unit_xval) {
 			acp = *i;
-			after = acp->view_index;
+			after = acp->view_index();
 			break;
 		}
 	}
@@ -981,10 +887,10 @@ AutomationLine::is_last_point (ControlPoint& cp)
 
 	// If the list is not empty, and the point is the last point in the list
 
-	if (!alist.empty() && mr.end == alist.end()) {
+	if (!alist->empty() && mr.end == alist->end()) {
 		return true;
 	}
-	
+
 	return false;
 }
 
@@ -997,10 +903,10 @@ AutomationLine::is_first_point (ControlPoint& cp)
 
 	// If the list is not empty, and the point is the first point in the list
 
-	if (!alist.empty() && mr.start == alist.begin()) {
+	if (!alist->empty() && mr.start == alist->begin()) {
 		return true;
 	}
-	
+
 	return false;
 }
 
@@ -1012,41 +918,41 @@ AutomationLine::remove_point (ControlPoint& cp)
 
 	model_representation (cp, mr);
 
-	trackview.editor.current_session()->begin_reversible_command (_("remove control point"));
-	trackview.editor.current_session()->add_undo (get_memento());
+	trackview.editor().session()->begin_reversible_command (_("remove control point"));
+	XMLNode &before = alist->get_state();
 
-	alist.erase (mr.start, mr.end);
+	alist->erase (mr.start, mr.end);
 
-	trackview.editor.current_session()->add_redo_no_execute (get_memento());
-	trackview.editor.current_session()->commit_reversible_command ();
-	trackview.editor.current_session()->set_dirty ();
+	trackview.editor().session()->add_command(new MementoCommand<AutomationList>(
+			*alist.get(), &before, &alist->get_state()));
+	trackview.editor().session()->commit_reversible_command ();
+	trackview.editor().session()->set_dirty ();
 }
 
 void
-AutomationLine::get_selectables (jack_nframes_t& start, jack_nframes_t& end,
-				 double botfrac, double topfrac, list<Selectable*>& results)
+AutomationLine::get_selectables (nframes_t& start, nframes_t& end,
+		double botfrac, double topfrac, list<Selectable*>& results)
 {
 
 	double top;
 	double bot;
-	jack_nframes_t nstart;
-	jack_nframes_t nend;
+	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;
 
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-		
-		jack_nframes_t when = (jack_nframes_t) (*(*i)->model)->when;
+		double when = (*(*i)->model())->when;
 
 		if (when >= start && when <= end) {
-			
+
 			if ((*i)->get_y() >= bot && (*i)->get_y() <= top) {
 
 				(*i)->show();
@@ -1056,10 +962,10 @@ AutomationLine::get_selectables (jack_nframes_t& start, jack_nframes_t& end,
 				nend = max (nend, when);
 
 			} else {
-				
+
 				if (collecting) {
 
-					results.push_back (new AutomationSelectable (nstart, nend, botfrac, topfrac, trackview));
+					results.push_back (new AutomationSelectable (nstart, nend, botfrac, topfrac, &trackview));
 					collecting = false;
 					nstart = max_frames;
 					nend = 0;
@@ -1069,119 +975,86 @@ AutomationLine::get_selectables (jack_nframes_t& start, jack_nframes_t& end,
 	}
 
 	if (collecting) {
-		results.push_back (new AutomationSelectable (nstart, nend, botfrac, topfrac, trackview));
+		results.push_back (new AutomationSelectable (nstart, nend, botfrac, topfrac, &trackview));
 	}
 
 }
 
 void
-AutomationLine::get_inverted_selectables (Selection&, list<Selectable*>& results)
+AutomationLine::get_inverted_selectables (Selection&, list<Selectable*>& /*results*/)
 {
 	// 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)->selected = false;
-	}
-
-	if (points.empty()) {
-		goto out;
-	} 
+	list<ControlPoint*> cp;
 	
-	for (PointSelection::iterator r = points.begin(); r != points.end(); ++r) {
-		
-		if (&(*r).track != &trackview) {
+	for (PointSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
+
+		if (i->track != &trackview) {
 			continue;
 		}
 
 		/* Curse X11 and its inverted coordinate system! */
 
-		bot = (1.0 - (*r).high_fract) * _height;
-		top = (1.0 - (*r).low_fract) * _height;
+		double const bot = (1.0 - i->high_fract) * _height;
+		double const top = (1.0 - i->low_fract) * _height;
 
-		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) {
-				
-				if ((*i)->get_y() >= bot && (*i)->get_y() <= top) {
-					
-					(*i)->selected = true;
+		for (vector<ControlPoint*>::iterator j = control_points.begin(); j != control_points.end(); ++j) {
+
+			double const rstart = trackview.editor().frame_to_unit (i->start);
+			double const rend = trackview.editor().frame_to_unit (i->end);
+
+			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);
 	}
 
+	return cp;
 }
 
 void
-AutomationLine::show_selection ()
+AutomationLine::set_selected_points (PointSelection& points)
 {
-	TimeSelection& time (trackview.editor.get_selection().time);
-
-	// cerr << "show selection\n";
-
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-		
-		(*i)->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)->selected = true;
-				break;
-			}
+		(*i)->set_selected (false);
+	}
+
+	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);
 	}
-}
 
-void
-AutomationLine::hide_selection ()
-{
-	// cerr << "hide selection\n";
-//	show_selection ();
+	set_colors ();
 }
 
-
-// This is copied into AudioRegionGainLine
-UndoAction
-AutomationLine::get_memento ()
+void AutomationLine::set_colors ()
 {
-	return alist.get_memento();
+	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
-AutomationLine::list_changed (Change ignored)
+AutomationLine::list_changed ()
 {
 	queue_reset ();
 }
 
 void
-AutomationLine::reset_callback (const AutomationList& events)
+AutomationLine::reset_callback (const Evoral::ControlList& events)
 {
-        ALPoints tmp_points;
+	ALPoints tmp_points;
 	uint32_t npoints = events.size();
 
 	if (npoints == 0) {
@@ -1195,20 +1068,26 @@ AutomationLine::reset_callback (const AutomationList& events)
 
 	AutomationList::const_iterator ai;
 
-	for (ai = events.const_begin(); ai != events.const_end(); ++ai) {
+	for (ai = events.begin(); ai != events.end(); ++ai) {
 
-		double translated_y;
-		
-		translated_y = (*ai)->value;
-		model_to_view_y (translated_y);
+		double translated_x = (*ai)->when;
+		double translated_y = (*ai)->value;
+		model_to_view_coord (translated_x, translated_y);
 
-		tmp_points.push_back (ALPoint (trackview.editor.frame_to_unit ((*ai)->when),
-					       _height - (translated_y * _height)));
+		add_model_point (tmp_points, (*ai)->when, translated_y);
 	}
-	
+
 	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)));
+}
+
 void
 AutomationLine::reset ()
 {
@@ -1218,30 +1097,31 @@ AutomationLine::reset ()
 		return;
 	}
 
-	alist.apply_to_points (*this, &AutomationLine::reset_callback);
+	alist->apply_to_points (*this, &AutomationLine::reset_callback);
 }
 
 void
 AutomationLine::clear ()
 {
 	/* parent must create command */
-	trackview.editor.current_session()->add_undo (get_memento());
-	alist.clear();
-	trackview.editor.current_session()->add_redo_no_execute (get_memento());
-	trackview.editor.current_session()->commit_reversible_command ();
-	trackview.editor.current_session()->set_dirty ();
+	XMLNode &before = 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 ();
 }
 
 void
-AutomationLine::change_model (AutomationList::iterator i, double x, double y)
+AutomationLine::change_model (AutomationList::iterator /*i*/, double /*x*/, double /*y*/)
 {
-	alist.modify (i, (jack_nframes_t) x, y);
 }
 
 void
-AutomationLine::change_model_range (AutomationList::iterator start, AutomationList::iterator end, double xdelta, float ydelta)
+AutomationLine::set_list(boost::shared_ptr<ARDOUR::AutomationList> list)
 {
-	alist.move_range (start, end, xdelta, ydelta);
+	alist = list;
+	queue_reset();
 }
 
 void
@@ -1250,19 +1130,174 @@ AutomationLine::show_all_control_points ()
 	points_visible = true;
 
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-		(*i)->show ();
-		(*i)->set_visible (true);
+		if (!(*i)->visible()) {
+			(*i)->show ();
+			(*i)->set_visible (true);
+		}
 	}
 }
 
 void
 AutomationLine::hide_all_but_selected_control_points ()
 {
+	if (alist->interpolation() == AutomationList::Discrete) {
+		return;
+	}
+
 	points_visible = false;
 
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-		if (!(*i)->selected) {
+		if (!(*i)->selected()) {
 			(*i)->set_visible (false);
 		}
 	}
 }
+
+void
+AutomationLine::track_entered()
+{
+	if (alist->interpolation() != AutomationList::Discrete) {
+		show_all_control_points();
+	}
+}
+
+void
+AutomationLine::track_exited()
+{
+	if (alist->interpolation() != AutomationList::Discrete) {
+		hide_all_but_selected_control_points();
+	}
+}
+
+XMLNode &
+AutomationLine::get_state (void)
+{
+	/* function as a proxy for the model */
+	return alist->get_state();
+}
+
+int
+AutomationLine::set_state (const XMLNode &node, int version)
+{
+	/* function as a proxy for the model */
+	return alist->set_state (node, version);
+}
+
+void
+AutomationLine::view_to_model_coord (double& x, 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 = max (0.0, y);
+		y = min (2.0, y);
+	} else if (alist->parameter().type() == PanAutomation) {
+		// vertical coordinate axis reversal
+		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());
+	}
+
+	x = _time_converter.from(x);
+}
+
+void
+AutomationLine::model_to_view_coord (double& x, double& y) const
+{
+	/* 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) {
+		// vertical coordinate axis reversal
+		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 {
+		y = y / (double)alist->parameter().max(); /* ... like this */
+	}
+
+	x = _time_converter.to(x);
+}
+
+
+void
+AutomationLine::set_interpolation(AutomationList::InterpolationStyle style)
+{
+	_interpolation = style;
+
+	if (style == AutomationList::Discrete) {
+		show_all_control_points();
+		line->hide();
+	} else {
+		hide_all_but_selected_control_points();
+		line->show();
+	}
+}
+
+void
+AutomationLine::add_visible_control_point (uint32_t view_index, uint32_t pi, double tx, double ty, AutomationList::iterator model, uint32_t npoints)
+{
+	if (view_index >= control_points.size()) {
+
+		/* make sure we have enough control points */
+
+		ControlPoint* ncp = new ControlPoint (*this);
+		ncp->set_size (control_point_box_size ());
+
+		control_points.push_back (ncp);
+	}
+
+	ControlPoint::ShapeType shape;
+
+	if (!terminal_points_can_slide) {
+		if (pi == 0) {
+			control_points[view_index]->set_can_slide(false);
+			if (tx == 0) {
+				shape = ControlPoint::Start;
+			} else {
+				shape = ControlPoint::Full;
+			}
+		} else if (pi == npoints - 1) {
+			control_points[view_index]->set_can_slide(false);
+			shape = ControlPoint::End;
+		} else {
+			control_points[view_index]->set_can_slide(true);
+			shape = ControlPoint::Full;
+		}
+	} else {
+		control_points[view_index]->set_can_slide(true);
+		shape = ControlPoint::Full;
+	}
+
+	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);
+	} else {
+		if (!points_visible) {
+			control_points[view_index]->set_visible (false);
+		}
+	}
+}
+
+void
+AutomationLine::add_always_in_view (double x)
+{
+	_always_in_view.push_back (x);
+	alist->apply_to_points (*this, &AutomationLine::reset_callback);
+}
+
+void
+AutomationLine::clear_always_in_view ()
+{
+	_always_in_view.clear ();
+	alist->apply_to_points (*this, &AutomationLine::reset_callback);
+}
+