X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.cc;h=102a3fd29ca172c472ce28a7a981b07f87f5af2b;hb=f93ca1349ce3d56ecd9b90c1b6e88971d46d9952;hp=44c100fd3760aac4c0eb7c37f341f8bc3105b45e;hpb=2bf3ed423f7aecdaabf5fbb078d9e2f20d26880c;p=ardour.git

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 44c100fd37..102a3fd29c 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -15,22 +15,24 @@
     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/memento_command.h>
+#include <pbd/stacktrace.h>
 
-#include <ardour/automation_event.h>
-#include <ardour/curve.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 "rgb_macros.h"
 #include "ardour_ui.h"
 #include "public_editor.h"
@@ -53,181 +55,16 @@ 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;
-}
-
-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)
+AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Group& parent, boost::shared_ptr<AutomationList> al)
 	: trackview (tv),
 	  _name (name),
 	  alist (al),
 	  _parent_group (parent)
 {
+	_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;
@@ -243,10 +80,16 @@ AutomationLine::AutomationLine (const string & name, TimeAxisView& tv, ArdourCan
 
 	line->signal_event().connect (mem_fun (*this, &AutomationLine::event_handler));
 
-	alist.StateChanged.connect (mem_fun(*this, &AutomationLine::list_changed));
+	alist->StateChanged.connect (mem_fun(*this, &AutomationLine::list_changed));
+
+	trackview.session().register_with_memento_command_factory(alist->id(), this);
 
-        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 ()
@@ -273,7 +116,9 @@ AutomationLine::queue_reset ()
 void
 AutomationLine::show () 
 {
-	line->show();
+	if (_interpolation != AutomationList::Discrete) {
+		line->show();
+	}
 
 	if (points_visible) {
 		for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
@@ -297,6 +142,11 @@ AutomationLine::hide ()
 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) {
@@ -329,10 +179,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 ();
 	}
 }
@@ -348,12 +198,40 @@ 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 ();
+	/* clamp y-coord appropriately. y is supposed to be a normalized fraction (0.0-1.0),
+	   and needs to be converted to a canvas unit distance.
+	*/
+
+	y = max (0.0, y);
+	y = min (1.0, y);
+	y = _height - (y * _height);
+
+	double const x = trackview.editor().frame_to_unit ((*cp.model())->when);
+
+	trackview.editor().current_session()->begin_reversible_command (_("automation event move"));
+	trackview.editor().current_session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &get_state(), 0));
+
+	cp.move_to (x, y, ControlPoint::Full);
+	reset_line_coords (cp);
+
+	if (line_points.size() > 1) {
+		line->property_points() = line_points;
+	}
+
+	alist->freeze ();
+	sync_model_with_view_point (cp, false, 0);
+	alist->thaw ();
+
+	update_pending = false;
+
+	trackview.editor().current_session()->add_command (new MementoCommand<AutomationList>(*alist.get(), 0, &alist->get_state()));
+	trackview.editor().current_session()->commit_reversible_command ();
+	trackview.editor().current_session()->set_dirty ();
 }
 
+
 void
 AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool with_push)
 {
@@ -373,21 +251,21 @@ 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) {
+	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);
+		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);
+		if (cp.view_index()) {
+			before = nth (cp.view_index() - 1);
 			x = max (x, before->get_x()+1.0);
 		} else {
 			before = &cp;
@@ -395,9 +273,9 @@ AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool wi
 
 
 		if (!with_push) {
-			if (cp.view_index < control_points.size() - 1) {
+			if (cp.view_index() < control_points.size() - 1) {
 		
-				after = nth (cp.view_index + 1);
+				after = nth (cp.view_index() + 1);
 		
 				/*if it is a "spike" leave the x alone */
  
@@ -416,11 +294,11 @@ AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool wi
 			ControlPoint* after;
 			
 			/* find the first point that can't move */
-			
-			for (uint32_t n = cp.view_index + 1; (after = nth (n)) != 0; ++n) {
-				if (!after->can_slide) {
+
+			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;
+					last_movable = after->view_index();
 					break;
 				}
 			}
@@ -432,7 +310,7 @@ AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool wi
 
 		/* leave the x-coordinate alone */
 
-		x = trackview.editor.frame_to_unit ((*cp.model)->when);
+		x = trackview.editor().frame_to_unit ((*cp.model())->when);
 
 	}
 
@@ -455,11 +333,11 @@ AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool wi
 		/* now move all subsequent control points, to reflect the motion.
 		 */
 		
-		for (uint32_t i = cp.view_index + 1; i < limit; ++i) {
+		for (uint32_t i = cp.view_index() + 1; i < limit; ++i) {
 			ControlPoint *p = nth (i);
 			double new_x;
 
-			if (p->can_slide) {
+			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);
@@ -471,14 +349,10 @@ AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool wi
 void
 AutomationLine::reset_line_coords (ControlPoint& cp)
 {	
-	line_points[cp.view_index].set_x (cp.get_x());
-	line_points[cp.view_index].set_y (cp.get_y());
-}
-
-void
-AutomationLine::update_line ()
-{
-	line->property_points() = line_points;
+	if (cp.view_index() < line_points.size()) {
+		line_points[cp.view_index()].set_x (cp.get_x());
+		line_points[cp.view_index()].set_y (cp.get_y());
+	}
 }
 
 void
@@ -491,10 +365,8 @@ AutomationLine::sync_model_with_view_line (uint32_t start, uint32_t end)
 
 	for (uint32_t i = start; i <= end; ++i) {
 		p = nth(i);
-		sync_model_with_view_point(*p);
+		sync_model_with_view_point (*p, false, 0);
 	}
-	
-	
 }
 
 void
@@ -508,16 +380,14 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr)
 	mr.xval = (nframes_t) floor (cp.get_x());
 	mr.yval = 1.0 - (cp.get_y() / _height);
 
+	/* if xval has not changed, set it directly from the model to avoid rounding errors */
 
-        /* if 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 = (nframes_t) (*cp.model)->when;
+	if (mr.xval == trackview.editor().frame_to_unit((*cp.model())->when)) {
+		mr.xval = (nframes_t) (*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.
 	*/
@@ -527,8 +397,8 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr)
 	/* part 2: find out where the model point is now
 	 */
 
-	mr.xpos = (nframes_t) (*cp.model)->when;
-	mr.ypos = (*cp.model)->value;
+	mr.xpos = (nframes_t) (*cp.model())->when;
+	mr.ypos = (*cp.model())->value;
 
 	/* part 3: get the position of the visual control
 	   points before and after us.
@@ -537,127 +407,35 @@ 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 = (nframes_t) (*before->model)->when;
-		mr.ymin = (*before->model)->value;
-		mr.start = before->model;
+		mr.xmin = (nframes_t) (*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)
 {
@@ -707,10 +485,16 @@ AutomationLine::determine_visible_control_points (ALPoints& 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 (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
@@ -748,10 +532,10 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
  
  		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)) &&  /* too close horizontally */
-		      ((abs ((int)(this_ry - prev_ry)) < (int) (box_size + 2)))))) { /* too close vertically */
+		     (((this_rx - prev_rx) < (box_size + 2)) &&  /* not identical, but still too close horizontally */
+		      (abs ((int)(this_ry - prev_ry)) < (int) (box_size + 2))))) { /* too close vertically */
   			continue;
-		}
+		} 
 
 		/* ok, we should display this point */
 
@@ -771,21 +555,21 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
 
 		if (!terminal_points_can_slide) {
 			if (pi == 0) {
-				control_points[view_index]->can_slide = false;
+				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]->can_slide = false;
+				control_points[view_index]->set_can_slide(false);
 				shape = ControlPoint::End;
 			} else {
-				control_points[view_index]->can_slide = true;
+				control_points[view_index]->set_can_slide(true);
 				shape = ControlPoint::Full;
 			}
 		} else {
-			control_points[view_index]->can_slide = true;
+			control_points[view_index]->set_can_slide(true);
 			shape = ControlPoint::Full;
 		}
 
@@ -810,7 +594,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
 
 		view_index++;
 	}
-
+	
 	/* discard extra CP's to avoid confusing ourselves */
 
 	while (control_points.size() > view_index) {
@@ -820,7 +604,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;
@@ -846,32 +630,80 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
 		
 		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 (float fraction)
+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::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", coefficient_to_dB (slider_position_to_gain (fraction)));
 		}
 	} else {
-		snprintf (buf, sizeof (buf), "%.2f", fraction);
+		view_to_model_y (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 {
+		model_to_view_y (v);
+	}
+
+	return v;
+}
+
 bool
 AutomationLine::invalid_point (ALPoints& p, uint32_t index)
 {
@@ -886,9 +718,9 @@ AutomationLine::invalidate_point (ALPoints& p, uint32_t index)
 }
 
 void
-AutomationLine::start_drag (ControlPoint* cp, float fraction) 
+AutomationLine::start_drag (ControlPoint* cp, nframes_t x, float fraction) 
 {
-	if (trackview.editor.current_session() == 0) { /* how? */
+	if (trackview.editor().current_session() == 0) { /* how? */
 		return;
 	}
 
@@ -900,25 +732,44 @@ AutomationLine::start_drag (ControlPoint* cp, float fraction)
 		str = _("automation range drag");
 	}
 
-	trackview.editor.current_session()->begin_reversible_command (str);
-	trackview.editor.current_session()->add_command (new MementoCommand<AutomationLine>(*this, &get_state(), 0));
+	trackview.editor().current_session()->begin_reversible_command (str);
+	trackview.editor().current_session()->add_command (new MementoCommand<AutomationList>(*alist.get(), &get_state(), 0));
 	
+	drag_x = x;
+	drag_distance = 0;
 	first_drag_fraction = fraction;
 	last_drag_fraction = fraction;
 	drags = 0;
+	did_push = false;
 }
 
 void
 AutomationLine::point_drag (ControlPoint& cp, nframes_t x, float fraction, bool with_push) 
 {
-	modify_view (cp, x, fraction, with_push);
+	if (x > drag_x) {
+		drag_distance += (x - drag_x);
+	} else {
+		drag_distance -= (drag_x - x);
+	}
+
+	drag_x = x;
+
+	modify_view_point (cp, x, fraction, with_push);
+
+	if (line_points.size() > 1) {
+		line->property_points() = line_points;
+	}
+
 	drags++;
+	did_push = with_push;
 }
 
 void
 AutomationLine::line_drag (uint32_t i1, uint32_t i2, float fraction, bool with_push) 
 {
 	double ydelta = fraction - last_drag_fraction;
+
+	did_push = with_push;
 	
 	last_drag_fraction = fraction;
 
@@ -929,10 +780,12 @@ AutomationLine::line_drag (uint32_t i1, uint32_t i2, float fraction, bool with_p
 
 	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);
+		modify_view_point (*cp, trackview.editor().unit_to_frame (cp->get_x()), ((_height - cp->get_y()) /_height) + ydelta, with_push);
 	}
 
-	update_line ();
+	if (line_points.size() > 1) {
+		line->property_points() = line_points;
+	}
 
 	drags++;
 }
@@ -940,20 +793,95 @@ AutomationLine::line_drag (uint32_t i1, uint32_t i2, float fraction, bool with_p
 void
 AutomationLine::end_drag (ControlPoint* cp) 
 {
-	if (drags) {
+	if (!drags) {
+		return;
+	}
 
-		if (cp) {
-			sync_model_from (*cp);
-		} else {
-			sync_model_with_view_line (line_drag_cp1, line_drag_cp2);
+	alist->freeze ();
+
+	if (cp) {
+		sync_model_with_view_point (*cp, did_push, drag_distance);
+	} else {
+		sync_model_with_view_line (line_drag_cp1, line_drag_cp2);
+	}
+	
+	alist->thaw ();
+
+	update_pending = false;
+
+	trackview.editor().current_session()->add_command (new MementoCommand<AutomationList>(*alist.get(), 0, &alist->get_state()));
+	trackview.editor().current_session()->commit_reversible_command ();
+	trackview.editor().current_session()->set_dirty ();
+}
+
+
+void
+AutomationLine::sync_model_with_view_point (ControlPoint& cp, bool did_push, int64_t distance)
+{
+	ModelRepresentation mr;
+	double ydelta;
+
+	model_representation (cp, mr);
+
+	/* how much are we changing the central point by */ 
+
+	ydelta = mr.yval - mr.ypos;
+
+	/*
+	   apply the full change to the central point, and interpolate
+	   on both axes to cover all model points represented
+	   by the control point.
+	*/
+
+	/* change all points before the primary point */
+
+	for (AutomationList::iterator i = mr.start; i != cp.model(); ++i) {
+		
+		double fract = ((*i)->when - mr.xmin) / (mr.xpos - mr.xmin);
+		double y_delta = ydelta * fract;
+		double x_delta = distance * fract;
+
+		/* interpolate */
+		
+		if (y_delta || x_delta) {
+			alist->modify (i, (*i)->when + x_delta, mr.ymin + y_delta);
 		}
+	}
 
-		update_pending = false;
+	/* change the primary point */
 
-		trackview.editor.current_session()->add_command (new MementoCommand<AutomationLine>(*this, 0, &get_state()));
-		trackview.editor.current_session()->commit_reversible_command ();
-		trackview.editor.current_session()->set_dirty ();
+	update_pending = true;
+	alist->modify (cp.model(), mr.xval, mr.yval);
+
+
+	/* change later points */
+	
+	AutomationList::iterator i = cp.model();
+	
+	++i;
+	
+	while (i != mr.end) {
+		
+		double delta = ydelta * (mr.xmax - (*i)->when) / (mr.xmax - mr.xpos);
+
+		/* all later points move by the same distance along the x-axis as the main point */
+		
+		if (delta) {
+			alist->modify (i, (*i)->when + distance, (*i)->value + delta);
+		}
+		
+		++i;
 	}
+		
+	if (did_push) {
+
+		/* move all points after the range represented by the view by the same distance
+		   as the main point moved.
+		*/
+
+		alist->slide (mr.end, drag_distance);
+	}
+
 }
 
 bool 
@@ -965,7 +893,7 @@ AutomationLine::control_points_adjacent (double xval, uint32_t & before, uint32_
 
 	/* 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) {
 		
@@ -973,12 +901,12 @@ AutomationLine::control_points_adjacent (double xval, uint32_t & before, uint32_
 
 			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;
 		}
 	}
@@ -995,7 +923,7 @@ 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;
 	}
 	
@@ -1011,7 +939,7 @@ 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;
 	}
 	
@@ -1026,14 +954,15 @@ AutomationLine::remove_point (ControlPoint& cp)
 
 	model_representation (cp, mr);
 
-	trackview.editor.current_session()->begin_reversible_command (_("remove control point"));
-        XMLNode &before = get_state();
+	trackview.editor().current_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_command(new MementoCommand<AutomationLine>(*this, &before, &get_state()));
-	trackview.editor.current_session()->commit_reversible_command ();
-	trackview.editor.current_session()->set_dirty ();
+	trackview.editor().current_session()->add_command(new MementoCommand<AutomationList>(
+			*alist.get(), &before, &alist->get_state()));
+	trackview.editor().current_session()->commit_reversible_command ();
+	trackview.editor().current_session()->set_dirty ();
 }
 
 void
@@ -1057,7 +986,7 @@ AutomationLine::get_selectables (nframes_t& start, nframes_t& end,
 
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
 		
-		nframes_t when = (nframes_t) (*(*i)->model)->when;
+		nframes_t when = (nframes_t) (*(*i)->model())->when;
 
 		if (when >= start && when <= end) {
 			
@@ -1101,7 +1030,7 @@ AutomationLine::set_selected_points (PointSelection& points)
 	double bot;
 
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-			(*i)->selected = false;
+			(*i)->set_selected(false);
 	}
 
 	if (points.empty()) {
@@ -1123,14 +1052,14 @@ AutomationLine::set_selected_points (PointSelection& points)
 			
 			double rstart, rend;
 			
-			rstart = trackview.editor.frame_to_unit ((*r).start);
-			rend = trackview.editor.frame_to_unit ((*r).end);
+			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;
+					(*i)->set_selected(true);
 				}
 			}
 
@@ -1144,25 +1073,30 @@ AutomationLine::set_selected_points (PointSelection& points)
 
 }
 
+void AutomationLine::set_colors() {
+	set_line_color( ARDOUR_UI::config()->canvasvar_AutomationLine.get() );
+	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+		(*i)->show_color (false, !points_visible);
+	}
+}
+
 void
 AutomationLine::show_selection ()
 {
-	TimeSelection& time (trackview.editor.get_selection().time);
-
-	// cerr << "show selection\n";
+	TimeSelection& time (trackview.editor().get_selection().time);
 
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
 		
-		(*i)->selected = false;
+		(*i)->set_selected(false);
 
 		for (list<AudioRange>::iterator r = time.begin(); r != time.end(); ++r) {
 			double rstart, rend;
 			
-			rstart = trackview.editor.frame_to_unit ((*r).start);
-			rend = trackview.editor.frame_to_unit ((*r).end);
+			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;
+				(*i)->set_selected(true);
 				break;
 			}
 		}
@@ -1174,7 +1108,6 @@ AutomationLine::show_selection ()
 void
 AutomationLine::hide_selection ()
 {
-	// cerr << "hide selection\n";
 //	show_selection ();
 }
 
@@ -1185,9 +1118,9 @@ AutomationLine::list_changed ()
 }
 
 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) {
@@ -1201,18 +1134,25 @@ 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 = (*ai)->value;
 		model_to_view_y (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 (frame),
+				       _height - (yfract * _height)));
+}
+
 void
 AutomationLine::reset ()
 {
@@ -1222,30 +1162,30 @@ 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 */
-        XMLNode &before = get_state();
-	alist.clear();
-	trackview.editor.current_session()->add_command (new MementoCommand<AutomationLine>(*this, &before, &get_state()));
-	trackview.editor.current_session()->commit_reversible_command ();
-	trackview.editor.current_session()->set_dirty ();
+	XMLNode &before = get_state();
+	alist->clear();
+	trackview.editor().current_session()->add_command (new MementoCommand<AutomationLine>(*this, &before, &get_state()));
+	trackview.editor().current_session()->commit_reversible_command ();
+	trackview.editor().current_session()->set_dirty ();
 }
 
 void
 AutomationLine::change_model (AutomationList::iterator i, double x, double y)
 {
-	alist.modify (i, (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
@@ -1254,6 +1194,7 @@ AutomationLine::show_all_control_points ()
 	points_visible = true;
 
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+		(*i)->show_color((_interpolation != AutomationList::Discrete), false);
 		(*i)->show ();
 		(*i)->set_visible (true);
 	}
@@ -1262,25 +1203,97 @@ AutomationLine::show_all_control_points ()
 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();
+	return alist->get_state();
 }
 
 int 
 AutomationLine::set_state (const XMLNode &node)
 {
 	/* function as a proxy for the model */
-	return alist.set_state (node);
+	return alist->set_state (node);
+}
+
+void
+AutomationLine::view_to_model_y (double& y) const
+{
+	/* TODO: This should be more generic ... */
+	if (alist->parameter().type() == GainAutomation ||
+	    alist->parameter().type() == EnvelopeAutomation) {
+		y = slider_position_to_gain (y);
+		y = 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());
+	}
+}
+
+void
+AutomationLine::model_to_view_y (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 */
+	}
+}
+
+	
+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();
+	}
 }
+