X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=1621697335431eba00e7ff43569ab00d5b86c8ec;hb=0013feddbf260f0b57ee74786c316739806ea47a;hp=d2b43d33f925aa1fc8c2e87727ffc367a66e95d6;hpb=7e6014a07759c93dc3c4f65456eb1fd2b4a7dc3a;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index d2b43d33f9..1621697335 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -19,7 +19,13 @@
 
 #include <utility>
 #include <gtkmm2ext/barcontroller.h>
+#include <gtkmm2ext/utils.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+
 #include "pbd/memento_command.h"
+#include "pbd/stacktrace.h"
+
 #include "ardour/automation_control.h"
 #include "ardour/event_type_map.h"
 #include "ardour/route.h"
@@ -28,6 +34,7 @@
 #include "ardour_ui.h"
 #include "automation_time_axis.h"
 #include "automation_streamview.h"
+#include "global_signals.h"
 #include "gui_thread.h"
 #include "route_time_axis.h"
 #include "automation_line.h"
@@ -35,9 +42,9 @@
 #include "simplerect.h"
 #include "selection.h"
 #include "rgb_macros.h"
-#include "automation_selectable.h"
 #include "point_selection.h"
 #include "canvas_impl.h"
+#include "control_point.h"
 #include "utils.h"
 
 #include "i18n.h"
@@ -49,9 +56,8 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace Editing;
 
-Pango::FontDescription* AutomationTimeAxisView::name_font = 0;
+Pango::FontDescription AutomationTimeAxisView::name_font;
 bool AutomationTimeAxisView::have_name_font = false;
-const string AutomationTimeAxisView::state_node_name = "AutomationChild";
 
 
 /** \a a the automatable object this time axis is to display data for.
@@ -59,26 +65,40 @@ const string AutomationTimeAxisView::state_node_name = "AutomationChild";
  * For route child (e.g. plugin) automation, pass the child for \a.
  * For region automation (e.g. MIDI CC), pass null for \a.
  */
-AutomationTimeAxisView::AutomationTimeAxisView (Session* s, boost::shared_ptr<Route> r,
-		boost::shared_ptr<Automatable> a, boost::shared_ptr<AutomationControl> c,
-		PublicEditor& e, TimeAxisView& parent, bool show_regions,
-		ArdourCanvas::Canvas& canvas, const string & nom, const string & nomparent)
-	: AxisView (s),
-	  TimeAxisView (s, e, &parent, canvas),
-	  _route (r),
-	  _control (c),
-	  _automatable (a),
-	  _controller(AutomationController::create(a, c->parameter(), c)),
-	  _base_rect (0),
-	  _view (show_regions ? new AutomationStreamView(*this) : NULL),
-	  _name (nom),
-	  auto_button (X_("")) /* force addition of a label */
+AutomationTimeAxisView::AutomationTimeAxisView (
+	Session* s,
+	boost::shared_ptr<Route> r,
+	boost::shared_ptr<Automatable> a,
+	boost::shared_ptr<AutomationControl> c,
+	Evoral::Parameter p,
+	PublicEditor& e,
+	TimeAxisView& parent,
+	bool show_regions,
+	ArdourCanvas::Canvas& canvas,
+	const string & nom,
+	const string & nomparent
+	)
+	: AxisView (s)
+	, TimeAxisView (s, e, &parent, canvas)
+	, _route (r)
+	, _control (c)
+	, _automatable (a)
+	, _parameter (p)
+	, _base_rect (0)
+	, _view (show_regions ? new AutomationStreamView (*this) : 0)
+	, _name (nom)
+	, auto_button (X_("")) /* force addition of a label */
+	, _show_regions (show_regions)
 {
 	if (!have_name_font) {
 		name_font = get_font_for_style (X_("AutomationTrackName"));
 		have_name_font = true;
 	}
 
+	if (_automatable && _control) {
+		_controller = AutomationController::create (_automatable, _control->parameter(), _control);
+	}
+
 	automation_menu = 0;
 	auto_off_item = 0;
 	auto_touch_item = 0;
@@ -93,7 +113,10 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session* s, boost::shared_ptr<Ro
 	_base_rect = new SimpleRect(*_canvas_display);
 	_base_rect->property_x1() = 0.0;
 	_base_rect->property_y1() = 0.0;
-	_base_rect->property_x2() = LONG_MAX - 2;
+	/** gnomecanvas sometimes converts this value to int or adds 2 to it, so it must be
+	    set correctly to avoid overflow.
+	*/
+	_base_rect->property_x2() = INT_MAX - 2;
 	_base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackOutline.get();
 
 	/* outline ends and bottom */
@@ -123,67 +146,45 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session* s, boost::shared_ptr<Ro
 	ARDOUR_UI::instance()->set_tip(auto_button, _("automation state"));
 	ARDOUR_UI::instance()->set_tip(hide_button, _("hide track"));
 
-	/* rearrange the name display */
-
-	/* we never show these for automation tracks, so make
-	   life easier and remove them.
-	*/
-
-	hide_name_entry();
-
-	/* move the name label over a bit */
-
-	string shortpname = _name;
-	bool shortened = false;
-
-	int ignore_width;
-	shortpname = fit_to_pixels (_name, 60, *name_font, ignore_width, true);
-
-	if (shortpname != _name ){
-		shortened = true;
+	const string str = gui_property ("height");
+	if (!str.empty()) {
+		set_height (atoi (str));
+	} else {
+		set_height (preset_height (HeightNormal));
 	}
 
-	name_label.set_text (shortpname);
-	name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
-
-	if (nomparent.length()) {
-
-		/* limit the plug name string */
-
-		string pname = fit_to_pixels (nomparent, 60, *name_font, ignore_width, true);
-		if (pname != nomparent) {
-			shortened = true;
-		}
+	/* repack the name label */
 
-		plugname = new Label (pname);
-		plugname->set_name (X_("TrackPlugName"));
-		plugname->show();
-		name_label.set_name (X_("TrackParameterName"));
-		controls_table.remove (name_hbox);
-		controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-		plugname_packed = true;
-		controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-	} else {
-		plugname = 0;
-		plugname_packed = false;
+	if (name_label.get_parent()) {
+		name_label.get_parent()->remove (name_label);
 	}
+	
+	name_label.set_text (_name);
+	name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
+        name_label.set_name (X_("TrackParameterName"));
+	name_label.set_ellipsize (Pango::ELLIPSIZE_END);
 
-	if (shortened) {
-		string tipname = nomparent;
-		if (!tipname.empty()) {
-			tipname += ": ";
-		}
-		tipname += _name;
-		ARDOUR_UI::instance()->set_tip(controls_ebox, tipname);
+	string tipname = nomparent;
+	if (!tipname.empty()) {
+		tipname += ": ";
 	}
+	tipname += _name;
+	ARDOUR_UI::instance()->set_tip(controls_ebox, tipname);
 
 	/* add the buttons */
 	controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+	controls_table.attach (name_label, 0, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+	controls_table.attach (auto_button, 6, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 
-	controls_table.attach (auto_button, 5, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+	name_label.show ();
 
-	/* add bar controller */
-	controls_table.attach (*_controller.get(), 0, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+	if (_controller) {
+		_controller.get()->set_size_request(-1, 24);
+		/* add bar controller */
+		controls_table.attach (*_controller.get(), 1, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+		/* note that this handler connects *before* the default handler */
+		_controller->event_widget().signal_scroll_event().connect (mem_fun (*this, &AutomationTimeAxisView::controls_ebox_scroll), false);
+	}
 
 	controls_table.show_all ();
 
@@ -194,26 +195,26 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session* s, boost::shared_ptr<Ro
 	controls_base_unselected_name = X_("AutomationTrackControlsBase");
 	controls_ebox.set_name (controls_base_unselected_name);
 
-	XMLNode* xml_node = get_parent_with_state()->get_automation_child_xml_node (
-			_control->parameter());
-
-	if (xml_node) {
-		set_state (*xml_node, Stateful::loading_state_version);
-	}
-
 	/* ask for notifications of any new RegionViews */
 	if (show_regions) {
 
-		assert(_view);
-		_view->attach ();
+		if (_view) {
+			_view->attach ();
+		}
 
-	/* no regions, just a single line for the entire track (e.g. bus gain) */
 	} else {
-		boost::shared_ptr<AutomationLine> line(new AutomationLine (
-					ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()),
-					*this,
-					*_canvas_display,
-					_control->alist()));
+		/* no regions, just a single line for the entire track (e.g. bus gain) */
+
+		assert (_control);
+
+		boost::shared_ptr<AutomationLine> line (
+			new AutomationLine (
+				ARDOUR::EventTypeMap::instance().to_symbol(_parameter),
+				*this,
+				*_canvas_display,
+				_control->alist()
+				)
+			);
 
 		line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get());
 		line->queue_reset ();
@@ -224,10 +225,21 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session* s, boost::shared_ptr<Ro
 
 	automation_state_changed ();
 	ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler));
+
+	_route->DropReferences.connect (
+		_route_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::route_going_away, this), gui_context ()
+		);
 }
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
 {
+	delete _view;
+}
+
+void
+AutomationTimeAxisView::route_going_away ()
+{
+	_route.reset ();
 }
 
 void
@@ -240,8 +252,8 @@ AutomationTimeAxisView::auto_clicked ()
 		automation_menu->set_name ("ArdourContextMenu");
 		MenuList& items (automation_menu->items());
 
-		items.push_back (MenuElem (_("Manual"), sigc::bind (sigc::mem_fun(*this,
-				&AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
+		items.push_back (MenuElem (S_("Automation|Manual"), sigc::bind (sigc::mem_fun(*this,
+											      &AutomationTimeAxisView::set_automation_state), (AutoState) ARDOUR::Off)));
 		items.push_back (MenuElem (_("Play"), sigc::bind (sigc::mem_fun(*this,
 				&AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
 		items.push_back (MenuElem (_("Write"), sigc::bind (sigc::mem_fun(*this,
@@ -256,22 +268,21 @@ AutomationTimeAxisView::auto_clicked ()
 void
 AutomationTimeAxisView::set_automation_state (AutoState state)
 {
-	if (!ignore_state_request) {
-		if (_automatable) {
-			_automatable->set_parameter_automation_state (_control->parameter(), state);
-		}
-#if 0
-		if (_route == _automatable) { // This is a time axis for route (not region) automation
-			_route->set_parameter_automation_state (_control->parameter(), state);
-		}
+	if (ignore_state_request) {
+		return;
+	}
 
-		if (_control->list())
-			_control->alist()->set_automation_state(state);
-#endif
+	if (_automatable) {
+		_automatable->set_parameter_automation_state (_parameter, state);
 	}
 
 	if (_view) {
 		_view->set_automation_state (state);
+
+		/* AutomationStreamViews don't signal when their automation state changes, so handle
+		   our updates `manually'.
+		*/
+		automation_state_changed ();
 	}
 }
 
@@ -282,15 +293,18 @@ AutomationTimeAxisView::automation_state_changed ()
 
 	/* update button label */
 
-	if (!_line) {
-		state = Off;
-	} else {
+	if (_view) {
+		state = _view->automation_state ();
+	} else if (_line) {
+		assert (_control);
 		state = _control->alist()->automation_state ();
+	} else {
+		state = ARDOUR::Off;
 	}
 
-	switch (state & (Off|Play|Touch|Write)) {
-	case Off:
-		auto_button.set_label (_("Manual"));
+	switch (state & (ARDOUR::Off|Play|Touch|Write)) {
+	case ARDOUR::Off:
+		auto_button.set_label (S_("Automation|Manual"));
 		if (auto_off_item) {
 			ignore_state_request = true;
 			auto_off_item->set_active (true);
@@ -339,13 +353,12 @@ AutomationTimeAxisView::automation_state_changed ()
 	}
 }
 
+/** The interpolation style of our AutomationList has changed, so update */
 void
-AutomationTimeAxisView::interpolation_changed ()
+AutomationTimeAxisView::interpolation_changed (AutomationList::InterpolationStyle s)
 {
-	AutomationList::InterpolationStyle style = _control->list()->interpolation();
-
 	if (mode_line_item && mode_discrete_item) {
-		if (style == AutomationList::Discrete) {
+		if (s == AutomationList::Discrete) {
 			mode_discrete_item->set_active(true);
 			mode_line_item->set_active(false);
 		} else {
@@ -353,29 +366,39 @@ AutomationTimeAxisView::interpolation_changed ()
 			mode_discrete_item->set_active(false);
 		}
 	}
-
-	if (_line) {
-		_line->set_interpolation(style);
-	}
 }
 
+/** A menu item has been selected to change our interpolation mode */
 void
 AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle style)
 {
-	_control->list()->set_interpolation(style);
-	if (_line) {
-		_line->set_interpolation(style);
+	/* Tell our view's list, if we have one, otherwise tell our own.
+	 * Everything else will be signalled back from that.
+	 */
+
+	if (_view) {
+		_view->set_interpolation (style);
+	} else {
+		assert (_control);
+		_control->list()->set_interpolation (style);
 	}
 }
 
 void
 AutomationTimeAxisView::clear_clicked ()
 {
+	assert (_line || _view);
+
 	_session->begin_reversible_command (_("clear automation"));
+
 	if (_line) {
 		_line->clear ();
+	} else if (_view) {
+		_view->clear ();
 	}
+
 	_session->commit_reversible_command ();
+	_session->set_dirty ();
 }
 
 void
@@ -385,75 +408,35 @@ AutomationTimeAxisView::set_height (uint32_t h)
 	uint32_t const normal = preset_height (HeightNormal);
 	bool const changed_between_small_and_normal = ( (height < normal && h >= normal) || (height >= normal || h < normal) );
 
-	TimeAxisView* state_parent = get_parent_with_state ();
-	assert(state_parent);
-	XMLNode* xml_node = state_parent->get_automation_child_xml_node (_control->parameter());
-
 	TimeAxisView::set_height (h);
+
 	_base_rect->property_y2() = h;
 
-	if (_line)
+	if (_line) {
 		_line->set_height(h);
+	}
 
 	if (_view) {
 		_view->set_height(h);
 		_view->update_contents_height();
 	}
 
-	char buf[32];
-	snprintf (buf, sizeof (buf), "%u", height);
-	if (xml_node) {
-		xml_node->add_property ("height", buf);
-	}
-
 	if (changed_between_small_and_normal || first_call_to_set_height) {
 
 		first_call_to_set_height = false;
 
 		if (h >= preset_height (HeightNormal)) {
-			controls_table.remove (name_hbox);
-
-			if (plugname) {
-				if (plugname_packed) {
-					controls_table.remove (*plugname);
-					plugname_packed = false;
-				}
-				controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-				plugname_packed = true;
-				controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-			} else {
-				controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-			}
-			hide_name_entry ();
-			show_name_label ();
-			name_hbox.show_all ();
-
 			auto_button.show();
 			hide_button.show_all();
 
 		} else if (h >= preset_height (HeightSmall)) {
-			controls_table.remove (name_hbox);
-			if (plugname) {
-				if (plugname_packed) {
-					controls_table.remove (*plugname);
-					plugname_packed = false;
-				}
-			}
-			controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 			controls_table.hide_all ();
-			hide_name_entry ();
-			show_name_label ();
-			name_hbox.show_all ();
-
 			auto_button.hide();
-			hide_button.hide();
 		}
-	} else if (h >= preset_height (HeightNormal)) {
-		cerr << "track grown, but neither changed_between_small_and_normal nor first_call_to_set_height set!" << endl;
 	}
 
 	if (changed) {
-		if (canvas_item_visible (_canvas_display)) {
+		if (canvas_item_visible (_canvas_display) && _route) {
 			/* only emit the signal if the height really changed and we were visible */
 			_route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 		}
@@ -465,22 +448,24 @@ AutomationTimeAxisView::set_samples_per_unit (double spu)
 {
 	TimeAxisView::set_samples_per_unit (spu);
 
-	if (_line)
+	if (_line) {
 		_line->reset ();
+	}
 
-	if (_view)
+	if (_view) {
 		_view->set_samples_per_unit (spu);
+	}
 }
 
 void
 AutomationTimeAxisView::hide_clicked ()
 {
-	// LAME fix for refreshing the hide button
 	hide_button.set_sensitive(false);
-
 	set_marked_for_display (false);
-	hide ();
-
+	RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(parent);
+	if (rtv) {
+		rtv->request_redraw ();
+	}
 	hide_button.set_sensitive(true);
 }
 
@@ -508,31 +493,34 @@ AutomationTimeAxisView::build_display_menu ()
 	auto_state_menu->set_name ("ArdourContextMenu");
 	MenuList& as_items = auto_state_menu->items();
 
-	as_items.push_back (CheckMenuElem (_("Manual"), sigc::bind (
+	as_items.push_back (CheckMenuElem (S_("Automation|Manual"), sigc::bind (
 			sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
-			(AutoState) Off)));
-	auto_off_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
+			(AutoState) ARDOUR::Off)));
+	auto_off_item = dynamic_cast<Gtk::CheckMenuItem*>(&as_items.back());
 
 	as_items.push_back (CheckMenuElem (_("Play"), sigc::bind (
 			sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
 			(AutoState) Play)));
-	auto_play_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
+	auto_play_item = dynamic_cast<Gtk::CheckMenuItem*>(&as_items.back());
 
 	as_items.push_back (CheckMenuElem (_("Write"), sigc::bind (
 			sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
 			(AutoState) Write)));
-	auto_write_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
+	auto_write_item = dynamic_cast<Gtk::CheckMenuItem*>(&as_items.back());
 
 	as_items.push_back (CheckMenuElem (_("Touch"), sigc::bind (
 			sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
 			(AutoState) Touch)));
-	auto_touch_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
+	auto_touch_item = dynamic_cast<Gtk::CheckMenuItem*>(&as_items.back());
 
 	items.push_back (MenuElem (_("State"), *auto_state_menu));
 
 	/* mode menu */
 
-	if (EventTypeMap::instance().is_midi_parameter(_control->parameter())) {
+	/* current interpolation state */
+	AutomationList::InterpolationStyle const s = _view ? _view->interpolation() : _control->list()->interpolation ();
+
+	if (EventTypeMap::instance().is_midi_parameter(_parameter)) {
 
 		Menu* auto_mode_menu = manage (new Menu);
 		auto_mode_menu->set_name ("ArdourContextMenu");
@@ -543,18 +531,14 @@ AutomationTimeAxisView::build_display_menu ()
 		am_items.push_back (RadioMenuElem (group, _("Discrete"), sigc::bind (
 				sigc::mem_fun(*this, &AutomationTimeAxisView::set_interpolation),
 				AutomationList::Discrete)));
-		mode_discrete_item = dynamic_cast<CheckMenuItem*>(&am_items.back());
-		mode_discrete_item->set_active(_control->list()->interpolation() == AutomationList::Discrete);
+		mode_discrete_item = dynamic_cast<Gtk::CheckMenuItem*>(&am_items.back());
+		mode_discrete_item->set_active (s == AutomationList::Discrete);
 
 		am_items.push_back (RadioMenuElem (group, _("Linear"), sigc::bind (
 				sigc::mem_fun(*this, &AutomationTimeAxisView::set_interpolation),
 				AutomationList::Linear)));
-		mode_line_item = dynamic_cast<CheckMenuItem*>(&am_items.back());
-
-		// Set default interpolation type to linear if this isn't a (usually) discrete controller
-		if (EventTypeMap::instance().interpolation_of(_control->parameter()) == Evoral::ControlList::Linear) {
-			mode_line_item->set_active(_control->list()->interpolation() == AutomationList::Linear);
-		}
+		mode_line_item = dynamic_cast<Gtk::CheckMenuItem*>(&am_items.back());
+		mode_line_item->set_active (s == AutomationList::Linear);
 
 		items.push_back (MenuElem (_("Mode"), *auto_mode_menu));
 	}
@@ -562,14 +546,24 @@ AutomationTimeAxisView::build_display_menu ()
 	/* make sure the automation menu state is correct */
 
 	automation_state_changed ();
-	interpolation_changed ();
+	interpolation_changed (s);
 }
 
 void
-AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/, nframes_t when, double y)
+AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double y)
 {
-	if (!_line)
+	if (!_line) {
+		return;
+	}
+
+	boost::shared_ptr<AutomationList> list = _line->the_list ();
+	
+	if (list->in_write_pass()) {
+		/* do not allow the GUI to add automation events during an
+		   automation write pass.
+		*/
 		return;
+	}
 
 	double x = 0;
 
@@ -583,201 +577,87 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* /*item*/, GdkE
 
 	_line->view_to_model_coord (x, y);
 
-	_session->begin_reversible_command (_("add automation event"));
-	XMLNode& before = _control->alist()->get_state();
 
-	_control->alist()->add (when, y);
+	_editor.snap_to_with_modifier (when, event);
 
-	XMLNode& after = _control->alist()->get_state();
-	_session->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->alist(), &before, &after));
+	_session->begin_reversible_command (_("add automation event"));
+	XMLNode& before = list->get_state();
 
-	_session->set_dirty ();
-}
+	list->add (when, y);
 
-bool
-AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
-{
-	return (_line ? cut_copy_clear_one (*_line, selection, op) : false);
+	XMLNode& after = list->get_state();
+	_session->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList> (*list, &before, &after));
+	_session->set_dirty ();
 }
 
+/** Paste a selection.
+ *  @param pos Position to paste to (session frames).
+ *  @param times Number of times to paste.
+ *  @param selection Selection to paste.
+ *  @param nth Index of the AutomationList within the selection to paste from.
+ */
 bool
-AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& selection, CutCopyOp op)
+AutomationTimeAxisView::paste (framepos_t pos, float times, Selection& selection, size_t nth)
 {
-	boost::shared_ptr<Evoral::ControlList> what_we_got;
-	boost::shared_ptr<AutomationList> alist (line.the_list());
-	bool ret = false;
-
-	XMLNode &before = alist->get_state();
-
-	switch (op) {
-	case Cut:
-		if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) {
-			_editor.get_cut_buffer().add (what_we_got);
-			_session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
-			ret = true;
-		}
-		break;
-	case Copy:
-		if ((what_we_got = alist->copy (selection.time.front().start, selection.time.front().end)) != 0) {
-			_editor.get_cut_buffer().add (what_we_got);
-		}
-		break;
-
-	case Clear:
-		if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) {
-			_session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
-			ret = true;
-		}
-		break;
-	}
+	boost::shared_ptr<AutomationLine> line;
 
-	if (what_we_got) {
-		for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) {
-			double when = (*x)->when;
-			double val  = (*x)->value;
-			line.model_to_view_coord (when, val);
-			(*x)->when = when;
-			(*x)->value = val;
-		}
+	if (_line) {
+		line = _line;
+	} else if (_view) {
+		line = _view->paste_line (pos);
 	}
 
-	return ret;
-}
-
-void
-AutomationTimeAxisView::reset_objects (PointSelection& selection)
-{
-	reset_objects_one (*_line, selection);
-}
-
-void
-AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection& selection)
-{
-	boost::shared_ptr<AutomationList> alist(line.the_list());
-
-	_session->add_command (new MementoCommand<AutomationList>(*alist.get(), &alist->get_state(), 0));
-
-	for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) {
-
-		if ((*i).track != this) {
-			continue;
-		}
-
-		alist->reset_range ((*i).start, (*i).end);
+	if (!line) {
+		return false;
 	}
-}
 
-bool
-AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp op)
-{
-	return cut_copy_clear_objects_one (*_line, selection, op);
+	return paste_one (*line, pos, times, selection, nth);
 }
 
 bool
-AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointSelection& selection, CutCopyOp op)
+AutomationTimeAxisView::paste_one (AutomationLine& line, framepos_t pos, float times, Selection& selection, size_t nth)
 {
-	boost::shared_ptr<Evoral::ControlList> what_we_got;
+	AutomationSelection::iterator p;
 	boost::shared_ptr<AutomationList> alist(line.the_list());
-	bool ret = false;
-
-	XMLNode &before = alist->get_state();
-
-	for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) {
-
-		if ((*i).track != this) {
-			continue;
-		}
-
-		switch (op) {
-		case Cut:
-			if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) {
-				_editor.get_cut_buffer().add (what_we_got);
-				_session->add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
-				ret = true;
-			}
-			break;
-		case Copy:
-			if ((what_we_got = alist->copy ((*i).start, (*i).end)) != 0) {
-				_editor.get_cut_buffer().add (what_we_got);
-			}
-			break;
 
-		case Clear:
-			if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) {
-				_session->add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
-				ret = true;
-			}
-			break;
-		}
-	}
-
-	delete &before;
-
-	if (what_we_got) {
-		for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) {
-			double when = (*x)->when;
-			double val  = (*x)->value;
-			line.model_to_view_coord (when, val);
-			(*x)->when = when;
-			(*x)->value = val;
-		}
+	if (_session->transport_rolling() && alist->automation_write()) {
+		/* do not paste if this control is in write mode and we're rolling */
+		return false;
 	}
 
-	return ret;
-}
-
-bool
-AutomationTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth)
-{
-	return paste_one (*_line, pos, times, selection, nth);
-}
-
-bool
-AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float times, Selection& selection, size_t nth)
-{
-	AutomationSelection::iterator p;
-	boost::shared_ptr<AutomationList> alist(line.the_list());
-
 	for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth) {}
 
 	if (p == selection.lines.end()) {
 		return false;
 	}
 
-	/* Make a copy of the list because we have to scale the
-	   values from view coordinates to model coordinates, and we're
-	   not supposed to modify the points in the selection.
-	*/
-
-	AutomationList copy (**p);
-
-	for (AutomationList::iterator x = copy.begin(); x != copy.end(); ++x) {
-		double when = (*x)->when;
-		double val  = (*x)->value;
-		line.view_to_model_coord (when, val);
-		(*x)->when = when;
-		(*x)->value = val;
-	}
+	double const model_pos = line.time_converter().from (pos - line.time_converter().origin_b ());
 
 	XMLNode &before = alist->get_state();
-	alist->paste (copy, pos, times);
+	alist->paste (**p, model_pos, times);
 	_session->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
 
 	return true;
 }
 
 void
-AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
+AutomationTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list<Selectable*>& results)
 {
-	if (_line && touched (top, bot)) {
-		double topfrac;
-		double botfrac;
+	if (!_line && !_view) {
+		return;
+	}
+
+	if (touched (top, bot)) {
 
 		/* remember: this is X Window - coordinate space starts in upper left and moves down.
 		   _y_position is the "origin" or "top" of the track.
 		*/
 
-		double mybot = _y_position + height;
+		/* bottom of our track */
+		double const mybot = _y_position + height;
+
+		double topfrac;
+		double botfrac;
 
 		if (_y_position >= top && mybot <= bot) {
 
@@ -794,18 +674,23 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double
 
 			topfrac = 1.0 - ((top - _y_position) / height);
 			botfrac = 1.0 - ((bot - _y_position) / height);
+
 		}
 
-		if (_line)
+		if (_line) {
 			_line->get_selectables (start, end, botfrac, topfrac, results);
+		} else if (_view) {
+			_view->get_selectables (start, end, botfrac, topfrac, results);
+		}
 	}
 }
 
 void
 AutomationTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& result)
 {
-	if (_line)
+	if (_line) {
 		_line->get_inverted_selectables (sel, result);
+	}
 }
 
 void
@@ -813,6 +698,8 @@ AutomationTimeAxisView::set_selected_points (PointSelection& points)
 {
 	if (_line) {
 		_line->set_selected_points (points);
+	} else if (_view) {
+		_view->set_selected_points (points);
 	}
 }
 
@@ -820,41 +707,48 @@ void
 AutomationTimeAxisView::clear_lines ()
 {
 	_line.reset();
-	automation_connection.disconnect ();
+	_list_connections.drop_connections ();
 }
 
 void
 AutomationTimeAxisView::add_line (boost::shared_ptr<AutomationLine> line)
 {
-	assert(line);
-	assert(!_line);
-	assert(line->the_list() == _control->list());
-
-	_control->alist()->automation_state_changed.connect (automation_connection, invalidator (*this), boost::bind (&AutomationTimeAxisView::automation_state_changed, this), gui_context());
+	if (_control && line) {
+		assert(line->the_list() == _control->list());
+		
+		_control->alist()->automation_state_changed.connect (
+			_list_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::automation_state_changed, this), gui_context()
+			);
+		
+		_control->alist()->InterpolationChanged.connect (
+			_list_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::interpolation_changed, this, _1), gui_context()
+			);
+	}
 
 	_line = line;
-	//_controller = AutomationController::create(_session, line->the_list(), _control);
 
 	line->set_height (height);
 
 	/* pick up the current state */
 	automation_state_changed ();
 
-	line->show();
+	line->add_visibility (AutomationLine::Line);
 }
 
 void
 AutomationTimeAxisView::entered()
 {
-	if (_line)
+	if (_line) {
 		_line->track_entered();
+	}
 }
 
 void
 AutomationTimeAxisView::exited ()
 {
-	if (_line)
+	if (_line) {
 		_line->track_exited();
+	}
 }
 
 void
@@ -866,71 +760,209 @@ AutomationTimeAxisView::color_handler ()
 }
 
 int
-AutomationTimeAxisView::set_state (const XMLNode& node, int version)
-{
-	TimeAxisView::set_state (node, version);
-
-	XMLProperty const * type = node.property ("automation-id");
-	if (type && type->value () == ARDOUR::EventTypeMap::instance().to_symbol (_control->parameter())) {
-		XMLProperty const * shown = node.property ("shown");
-		if (shown && shown->value () == "yes") {
-			set_marked_for_display (true);
-			_canvas_display->show (); /* FIXME: necessary? show_at? */
+AutomationTimeAxisView::set_state_2X (const XMLNode& node, int /*version*/)
+{
+	if (node.name() == X_("gain") && _parameter == Evoral::Parameter (GainAutomation)) {
+		XMLProperty const * shown = node.property (X_("shown"));
+		if (shown) {
+			bool yn = string_is_affirmative (shown->value ());
+			if (yn) {
+				_canvas_display->show (); /* FIXME: necessary? show_at? */
+			}
+			set_gui_property ("visible", yn);
+		} else {
+			set_gui_property ("visible", false);
 		}
 	}
 
-	if (!_marked_for_display) {
-		hide();
-	}
+	return 0;
+}
 
+int
+AutomationTimeAxisView::set_state (const XMLNode&, int /*version*/)
+{
 	return 0;
 }
 
-XMLNode*
-AutomationTimeAxisView::get_state_node ()
+void
+AutomationTimeAxisView::what_has_visible_automation (const boost::shared_ptr<Automatable>& automatable, set<Evoral::Parameter>& visible)
 {
-	TimeAxisView* state_parent = get_parent_with_state ();
+	/* this keeps "knowledge" of how we store visibility information
+	   in XML private to this class.
+	*/
 
-	if (state_parent) {
-		return state_parent->get_automation_child_xml_node (_control->parameter());
-	} else {
-		return 0;
+	assert (automatable);
+
+	Automatable::Controls& controls (automatable->controls());
+	
+	for (Automatable::Controls::iterator i = controls.begin(); i != controls.end(); ++i) {
+		
+		boost::shared_ptr<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl> (i->second);
+
+		if (ac) {
+			
+			const XMLNode* gui_node = ac->extra_xml ("GUI");
+			
+			if (gui_node) {
+				const XMLProperty* prop = gui_node->property ("shown");
+				if (prop) {
+					if (string_is_affirmative (prop->value())) {
+						visible.insert (i->first);
+					}
+				}
+			}
+		}
 	}
 }
 
-void
-AutomationTimeAxisView::update_extra_xml_shown (bool editor_shown)
+
+/** @return true if this view has any automation data to display */
+bool
+AutomationTimeAxisView::has_automation () const
 {
-	XMLNode* xml_node = get_state_node();
-	if (xml_node) {
-		xml_node->add_property ("shown", editor_shown ? "yes" : "no");
+	return ( (_line && _line->npoints() > 0) || (_view && _view->has_automation()) );
+}
+
+list<boost::shared_ptr<AutomationLine> >
+AutomationTimeAxisView::lines () const
+{
+	list<boost::shared_ptr<AutomationLine> > lines;
+
+	if (_line) {
+		lines.push_back (_line);
+	} else if (_view) {
+		lines = _view->get_lines ();
 	}
+
+	return lines;
 }
 
-guint32
-AutomationTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent)
+string
+AutomationTimeAxisView::state_id() const
 {
-	update_extra_xml_shown (true);
+	if (_control) {
+		return string_compose ("automation %1", _control->id().to_s());
+	} else {
+		assert (_parameter);
+		return string_compose ("automation %1 %2/%3/%4", 
+				       _route->id(), 
+				       _parameter.type(),
+				       _parameter.id(),
+				       (int) _parameter.channel());
+	}
+}
+
+/** Given a state id string, see if it is one generated by
+ *  this class.  If so, parse it into its components.
+ *  @param state_id State ID string to parse.
+ *  @param route_id Filled in with the route's ID if the state ID string is parsed.
+ *  @param has_parameter Filled in with true if the state ID has a parameter, otherwise false.
+ *  @param parameter Filled in with the state ID's parameter, if it has one.
+ *  @return true if this is a state ID generated by this class, otherwise false.
+ */
 
-	return TimeAxisView::show_at (y, nth, parent);
+bool
+AutomationTimeAxisView::parse_state_id (
+	string const & state_id,
+	PBD::ID & route_id,
+	bool & has_parameter,
+	Evoral::Parameter & parameter)
+{
+	stringstream s;
+	s << state_id;
+
+	string a, b, c;
+	s >> a >> b >> c;
+
+	if (a != X_("automation")) {
+		return false;
+	}
+
+	route_id = PBD::ID (b);
+
+	if (c.empty ()) {
+		has_parameter = false;
+		return true;
+	}
+
+	has_parameter = true;
+
+	vector<string> p;
+	boost::split (p, c, boost::is_any_of ("/"));
+
+	assert (p.size() == 3);
+
+	parameter = Evoral::Parameter (
+		boost::lexical_cast<int> (p[0]),
+		boost::lexical_cast<int> (p[2]),
+		boost::lexical_cast<int> (p[1])
+		);
+
+	return true;
 }
 
 void
-AutomationTimeAxisView::hide ()
+AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 {
-	update_extra_xml_shown (false);
+	list<boost::shared_ptr<AutomationLine> > lines;
+	if (_line) {
+		lines.push_back (_line);
+	} else if (_view) {
+		lines = _view->get_lines ();
+	}
 
-	TimeAxisView::hide ();
+	for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
+		cut_copy_clear_one (**i, selection, op);
+	}
 }
 
-bool
-AutomationTimeAxisView::set_visibility (bool yn)
+void
+AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& selection, CutCopyOp op)
 {
-	bool changed = TimeAxisView::set_visibility (yn);
+	boost::shared_ptr<Evoral::ControlList> what_we_got;
+	boost::shared_ptr<AutomationList> alist (line.the_list());
 
-	if (changed) {
-		get_state_node()->add_property ("shown", yn ? X_("yes") : X_("no"));
+	XMLNode &before = alist->get_state();
+
+	/* convert time selection to automation list model coordinates */
+	const Evoral::TimeConverter<double, ARDOUR::framepos_t>& tc = line.time_converter ();
+	double const start = tc.from (selection.time.front().start - tc.origin_b ());
+	double const end = tc.from (selection.time.front().end - tc.origin_b ());
+
+	switch (op) {
+	case Delete:
+		if (alist->cut (start, end) != 0) {
+			_session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
+		}
+		break;
+
+	case Cut:
+
+		if ((what_we_got = alist->cut (start, end)) != 0) {
+			_editor.get_cut_buffer().add (what_we_got);
+			_session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
+		}
+		break;
+	case Copy:
+		if ((what_we_got = alist->copy (start, end)) != 0) {
+			_editor.get_cut_buffer().add (what_we_got);
+		}
+		break;
+
+	case Clear:
+		if ((what_we_got = alist->cut (start, end)) != 0) {
+			_session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
+		}
+		break;
 	}
 
-	return changed;
+	if (what_we_got) {
+		for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) {
+			double when = (*x)->when;
+			double val  = (*x)->value;
+			line.model_to_view_coord (when, val);
+			(*x)->when = when;
+			(*x)->value = val;
+		}
+	}
 }