X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=a92ac3853077f70de8bb4cb3d261ed341557575b;hb=718b2eab6706f304e398f036e3d817567cd746e8;hp=e6186387fe5593353517dab8fa03174839e48c5d;hpb=e1ca7942c80597325a7f01153b809c4956757dce;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index e6186387fe..a92ac38530 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -23,17 +23,19 @@
 #include "ardour/automation_control.h"
 #include "ardour/event_type_map.h"
 #include "ardour/route.h"
+#include "ardour/session.h"
 
 #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"
 #include "public_editor.h"
 #include "simplerect.h"
 #include "selection.h"
 #include "rgb_macros.h"
-#include "automation_selectable.h"
 #include "point_selection.h"
 #include "canvas_impl.h"
 #include "utils.h"
@@ -57,26 +59,39 @@ 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 */
 {
 	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;
@@ -91,7 +106,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 */
@@ -100,11 +118,13 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 
 	_base_rect->set_data ("trackview", this);
 
-	_base_rect->signal_event().connect (bind (
-			mem_fun (_editor, &PublicEditor::canvas_automation_track_event),
+	_base_rect->signal_event().connect (sigc::bind (
+			sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event),
 			_base_rect, this));
 
-	// _base_rect->lower_to_bottom();
+	if (!a) {
+		_base_rect->lower_to_bottom();
+	}
 
 	hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
 
@@ -116,8 +136,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 
 	controls_table.set_no_show_all();
 
-	ARDOUR_UI::instance()->tooltips().set_tip(auto_button, _("automation state"));
-	ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("hide track"));
+	ARDOUR_UI::instance()->set_tip(auto_button, _("automation state"));
+	ARDOUR_UI::instance()->set_tip(hide_button, _("hide track"));
 
 	/* rearrange the name display */
 
@@ -141,6 +161,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 
 	name_label.set_text (shortpname);
 	name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
+        name_label.set_name (X_("TrackParameterName"));
 
 	if (nomparent.length()) {
 
@@ -151,10 +172,9 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 			shortened = true;
 		}
 
- 		plugname = new Label (pname);
+		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;
@@ -170,7 +190,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 			tipname += ": ";
 		}
 		tipname += _name;
-		ARDOUR_UI::instance()->tooltips().set_tip(controls_ebox, tipname);
+		ARDOUR_UI::instance()->set_tip(controls_ebox, tipname);
 	}
 
 	/* add the buttons */
@@ -178,20 +198,21 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 
 	controls_table.attach (auto_button, 5, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 
-	/* add bar controller */
-	controls_table.attach (*_controller.get(), 0, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+	if (_controller) {
+		/* add bar controller */
+		controls_table.attach (*_controller.get(), 0, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+	}
 
 	controls_table.show_all ();
 
-	hide_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
-	auto_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::auto_clicked));
+	hide_button.signal_clicked().connect (sigc::mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
+	auto_button.signal_clicked().connect (sigc::mem_fun(*this, &AutomationTimeAxisView::auto_clicked));
 
 	controls_base_selected_name = X_("AutomationTrackControlsBaseSelected");
 	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());
+	XMLNode* xml_node = get_parent_with_state()->get_automation_child_xml_node (_parameter);
 
 	if (xml_node) {
 		set_state (*xml_node, Stateful::loading_state_version);
@@ -203,13 +224,17 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 		assert(_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) */
+		
+		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 ();
@@ -219,7 +244,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	/* make sure labels etc. are correct */
 
 	automation_state_changed ();
-	ColorsChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler));
+	ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler));
 }
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
@@ -236,13 +261,13 @@ AutomationTimeAxisView::auto_clicked ()
 		automation_menu->set_name ("ArdourContextMenu");
 		MenuList& items (automation_menu->items());
 
-		items.push_back (MenuElem (_("Manual"), bind (mem_fun(*this,
+		items.push_back (MenuElem (_("Manual"), sigc::bind (sigc::mem_fun(*this,
 				&AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
-		items.push_back (MenuElem (_("Play"), bind (mem_fun(*this,
+		items.push_back (MenuElem (_("Play"), sigc::bind (sigc::mem_fun(*this,
 				&AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
-		items.push_back (MenuElem (_("Write"), bind (mem_fun(*this,
+		items.push_back (MenuElem (_("Write"), sigc::bind (sigc::mem_fun(*this,
 				&AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
-		items.push_back (MenuElem (_("Touch"), bind (mem_fun(*this,
+		items.push_back (MenuElem (_("Touch"), sigc::bind (sigc::mem_fun(*this,
 				&AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
 	}
 
@@ -252,22 +277,29 @@ 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 (_control->list())
-			_control->alist()->set_automation_state(state);
-#endif
+	if (ignore_state_request) {
+		return;
 	}
 
+	if (_automatable) {
+		_automatable->set_parameter_automation_state (_parameter, state);
+	}
+#if 0
+	if (_route == _automatable) { // This is a time axis for route (not region) automation
+		_route->set_parameter_automation_state (_parameter, state);
+	}
+	
+	if (_control->list()) {
+		_control->alist()->set_automation_state(state);
+	}
+#endif
 	if (_view) {
 		_view->set_automation_state (state);
+		
+		/* AutomationStreamViews don't signal when their automation state changes, so handle
+		   our updates `manually'.
+		*/
+		automation_state_changed ();
 	}
 }
 
@@ -278,10 +310,12 @@ AutomationTimeAxisView::automation_state_changed ()
 
 	/* update button label */
 
-	if (!_line) {
-		state = Off;
-	} else {
+	if (_line) {
 		state = _control->alist()->automation_state ();
+	} else if (_view) {
+		state = _view->automation_state ();
+	} else {
+		state = Off;
 	}
 
 	switch (state & (Off|Play|Touch|Write)) {
@@ -335,13 +369,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 {
@@ -349,48 +382,57 @@ 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 {
+		_control->list()->set_interpolation (style);
 	}
 }
 
 void
 AutomationTimeAxisView::clear_clicked ()
 {
-	_session.begin_reversible_command (_("clear automation"));
+	assert (_line || _view);
+	
+	_session->begin_reversible_command (_("clear automation"));
+	
 	if (_line) {
 		_line->clear ();
+	} else if (_view) {
+		_view->clear ();
 	}
-	_session.commit_reversible_command ();
+
+	_session->commit_reversible_command ();
+	_session->set_dirty ();
 }
 
 void
 AutomationTimeAxisView::set_height (uint32_t h)
 {
-	bool changed = (height != (uint32_t) h) || first_call_to_set_height;
-	bool changed_between_small_and_normal = (
-		   (height < hNormal && h >= hNormal)
-		|| (height >= hNormal || h < hNormal) );
+	bool const changed = (height != (uint32_t) h) || first_call_to_set_height;
+	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());
+	XMLNode* xml_node = state_parent->get_automation_child_xml_node (_parameter);
 
 	TimeAxisView::set_height (h);
 	_base_rect->property_y2() = h;
 
-	if (_line)
+	if (_line) {
 		_line->set_height(h);
+	}
 
 	if (_view) {
 		_view->set_height(h);
@@ -407,7 +449,7 @@ AutomationTimeAxisView::set_height (uint32_t h)
 
 		first_call_to_set_height = false;
 
-		if (h >= hNormal) {
+		if (h >= preset_height (HeightNormal)) {
 			controls_table.remove (name_hbox);
 
 			if (plugname) {
@@ -428,7 +470,7 @@ AutomationTimeAxisView::set_height (uint32_t h)
 			auto_button.show();
 			hide_button.show_all();
 
-		} else if (h >= hSmall) {
+		} else if (h >= preset_height (HeightSmall)) {
 			controls_table.remove (name_hbox);
 			if (plugname) {
 				if (plugname_packed) {
@@ -445,13 +487,15 @@ AutomationTimeAxisView::set_height (uint32_t h)
 			auto_button.hide();
 			hide_button.hide();
 		}
-	} else if (h >= hNormal){
+	} 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) {
-		/* only emit the signal if the height really changed */
-		_route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+		if (canvas_item_visible (_canvas_display)) {
+			/* only emit the signal if the height really changed and we were visible */
+			_route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+		}
 	}
 }
 
@@ -460,11 +504,13 @@ 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
@@ -484,10 +530,6 @@ AutomationTimeAxisView::build_display_menu ()
 {
 	using namespace Menu_Helpers;
 
-	/* get the size menu ready */
-
-	build_size_menu ();
-
 	/* prepare it */
 
 	TimeAxisView::build_display_menu ();
@@ -496,11 +538,9 @@ AutomationTimeAxisView::build_display_menu ()
 
 	MenuList& items = display_menu->items();
 
-	items.push_back (MenuElem (_("Height"), *size_menu));
+	items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &AutomationTimeAxisView::hide_clicked)));
 	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Hide"), mem_fun(*this, &AutomationTimeAxisView::hide_clicked)));
-	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Clear"), mem_fun(*this, &AutomationTimeAxisView::clear_clicked)));
+	items.push_back (MenuElem (_("Clear"), sigc::mem_fun(*this, &AutomationTimeAxisView::clear_clicked)));
 	items.push_back (SeparatorElem());
 
 	/* state menu */
@@ -509,23 +549,23 @@ AutomationTimeAxisView::build_display_menu ()
 	auto_state_menu->set_name ("ArdourContextMenu");
 	MenuList& as_items = auto_state_menu->items();
 
-	as_items.push_back (CheckMenuElem (_("Manual"), bind (
-			mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
+	as_items.push_back (CheckMenuElem (_("Manual"), sigc::bind (
+			sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
 			(AutoState) Off)));
 	auto_off_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
-	as_items.push_back (CheckMenuElem (_("Play"), bind (
-			mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
+	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());
 
-	as_items.push_back (CheckMenuElem (_("Write"), bind (
-			mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
+	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());
 
-	as_items.push_back (CheckMenuElem (_("Touch"), bind (
-			mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
+	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());
 
@@ -533,7 +573,10 @@ AutomationTimeAxisView::build_display_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");
@@ -541,20 +584,17 @@ AutomationTimeAxisView::build_display_menu ()
 
 		RadioMenuItem::Group group;
 
-		am_items.push_back (RadioMenuElem (group, _("Discrete"), bind (
-						mem_fun(*this, &AutomationTimeAxisView::set_interpolation),
-						AutomationList::Discrete)));
+		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);
-
-		// For discrete types we dont allow the linear option since it makes no sense for those Controls
-		if (EventTypeMap::instance().interpolation_of(_control->parameter()) == Evoral::ControlList::Linear) {
-			am_items.push_back (RadioMenuElem (group, _("Line"), bind (
-							mem_fun(*this, &AutomationTimeAxisView::set_interpolation),
-							AutomationList::Linear)));
-			mode_line_item = dynamic_cast<CheckMenuItem*>(&am_items.back());
-			mode_line_item->set_active(_control->list()->interpolation() == AutomationList::Linear);
-		}
+		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());
+		mode_line_item->set_active (s == AutomationList::Linear);
 
 		items.push_back (MenuElem (_("Mode"), *auto_mode_menu));
 	}
@@ -562,14 +602,15 @@ 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 (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/, framepos_t when, double y)
 {
-	if (!_line)
+	if (!_line) {
 		return;
+	}
 
 	double x = 0;
 
@@ -583,51 +624,62 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* /*item*/, GdkE
 
 	_line->view_to_model_coord (x, y);
 
-	_session.begin_reversible_command (_("add automation event"));
+	_session->begin_reversible_command (_("add automation event"));
 	XMLNode& before = _control->alist()->get_state();
 
 	_control->alist()->add (when, y);
 
 	XMLNode& after = _control->alist()->get_state();
-	_session.commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->alist(), &before, &after));
+	_session->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->alist(), &before, &after));
 
-	_session.set_dirty ();
+	_session->set_dirty ();
 }
 
-
-bool
+void
 AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 {
-	return (_line ? cut_copy_clear_one (*_line, selection, op) : false);
+	list<boost::shared_ptr<AutomationLine> > lines;
+	if (_line) {
+		lines.push_back (_line);
+	} else if (_view) {
+		lines = _view->get_lines ();
+	}
+
+	for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
+		cut_copy_clear_one (**i, selection, op);
+	}
 }
 
-bool
+void
 AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& selection, CutCopyOp op)
 {
 	boost::shared_ptr<Evoral::ControlList> what_we_got;
 	boost::shared_ptr<AutomationList> alist (line.the_list());
-	bool ret = false;
 
 	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 Cut:
-		if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) {
+		
+		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()));
-			ret = true;
+			_session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
 		}
 		break;
 	case Copy:
-		if ((what_we_got = alist->copy (selection.time.front().start, selection.time.front().end)) != 0) {
+		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 (selection.time.front().start, selection.time.front().end)) != 0) {
-			_session.add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
-			ret = true;
+		if ((what_we_got = alist->cut (start, end)) != 0) {
+			_session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
 		}
 		break;
 	}
@@ -641,14 +693,21 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
 			(*x)->value = val;
 		}
 	}
-
-	return ret;
 }
 
 void
 AutomationTimeAxisView::reset_objects (PointSelection& selection)
 {
-	reset_objects_one (*_line, selection);
+	list<boost::shared_ptr<AutomationLine> > lines;
+	if (_line) {
+		lines.push_back (_line);
+	} else if (_view) {
+		lines = _view->get_lines ();
+	}
+
+	for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
+		reset_objects_one (**i, selection);
+	}
 }
 
 void
@@ -656,11 +715,11 @@ AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection&
 {
 	boost::shared_ptr<AutomationList> alist(line.the_list());
 
-	_session.add_command (new MementoCommand<AutomationList>(*alist.get(), &alist->get_state(), 0));
+	_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) {
+		if ((*i).track != this) {
 			continue;
 		}
 
@@ -668,24 +727,32 @@ AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection&
 	}
 }
 
-bool
+void
 AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp op)
 {
-	return cut_copy_clear_objects_one (*_line, selection, op);
+	list<boost::shared_ptr<AutomationLine> > lines;
+	if (_line) {
+		lines.push_back (_line);
+	} else if (_view) {
+		lines = _view->get_lines ();
+	}
+
+	for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
+		cut_copy_clear_objects_one (**i, selection, op);
+	}
 }
 
-bool
+void
 AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointSelection& selection, CutCopyOp op)
 {
 	boost::shared_ptr<Evoral::ControlList> what_we_got;
 	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) {
+		if ((*i).track != this) {
 			continue;
 		}
 
@@ -693,8 +760,7 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 		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;
+				_session->add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
 			}
 			break;
 		case Copy:
@@ -705,8 +771,7 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 
 		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;
+				_session->add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
 			}
 			break;
 		}
@@ -723,18 +788,34 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 			(*x)->value = val;
 		}
 	}
-
-	return ret;
 }
 
+/** 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::paste (nframes_t pos, float times, Selection& selection, size_t nth)
+AutomationTimeAxisView::paste (framepos_t pos, float times, Selection& selection, size_t nth)
 {
-	return paste_one (*_line, pos, times, selection, nth);
+	boost::shared_ptr<AutomationLine> line;
+	
+	if (_line) {
+		line = _line;
+	} else if (_view) {
+		line = _view->paste_line (pos);
+	}
+
+	if (!line) {
+		return false;
+	}
+	
+	return paste_one (*line, pos, times, selection, nth);
 }
 
 bool
-AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float times, Selection& selection, size_t nth)
+AutomationTimeAxisView::paste_one (AutomationLine& line, framepos_t pos, float times, Selection& selection, size_t nth)
 {
 	AutomationSelection::iterator p;
 	boost::shared_ptr<AutomationList> alist(line.the_list());
@@ -760,25 +841,33 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti
 		(*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);
-	_session.add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
+	alist->paste (copy, 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) {
 
@@ -795,32 +884,40 @@ 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
 AutomationTimeAxisView::set_selected_points (PointSelection& points)
 {
-	if (_line)
+	if (_line) {
 		_line->set_selected_points (points);
+	} else if (_view) {
+		_view->set_selected_points (points);
+	}
 }
 
 void
 AutomationTimeAxisView::clear_lines ()
 {
 	_line.reset();
-	automation_connection.disconnect ();
+	_list_connections.drop_connections ();
 }
 
 void
@@ -830,8 +927,13 @@ AutomationTimeAxisView::add_line (boost::shared_ptr<AutomationLine> line)
 	assert(!_line);
 	assert(line->the_list() == _control->list());
 
-	automation_connection = _control->alist()->automation_state_changed.connect
-		(mem_fun(*this, &AutomationTimeAxisView::automation_state_changed));
+	_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);
@@ -847,15 +949,17 @@ AutomationTimeAxisView::add_line (boost::shared_ptr<AutomationLine> line)
 void
 AutomationTimeAxisView::entered()
 {
-	if (_line)
+	if (_line) {
 		_line->track_entered();
+	}
 }
 
 void
 AutomationTimeAxisView::exited ()
 {
-	if (_line)
+	if (_line) {
 		_line->track_exited();
+	}
 }
 
 void
@@ -871,8 +975,12 @@ AutomationTimeAxisView::set_state (const XMLNode& node, int version)
 {
 	TimeAxisView::set_state (node, version);
 
+	if (version < 3000) {
+		return set_state_2X (node, version);
+	}
+	
 	XMLProperty const * type = node.property ("automation-id");
-	if (type && type->value () == ARDOUR::EventTypeMap::instance().to_symbol (_control->parameter())) {
+	if (type && type->value () == ARDOUR::EventTypeMap::instance().to_symbol (_parameter)) {
 		XMLProperty const * shown = node.property ("shown");
 		if (shown && shown->value () == "yes") {
 			set_marked_for_display (true);
@@ -887,13 +995,32 @@ AutomationTimeAxisView::set_state (const XMLNode& node, int version)
 	return 0;
 }
 
+int
+
+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 && string_is_affirmative (shown->value ())) {
+			set_marked_for_display (true);
+			_canvas_display->show (); /* FIXME: necessary? show_at? */
+		}
+	}
+
+	if (!_marked_for_display) {
+		hide ();
+	}
+
+	return 0;
+}
+
 XMLNode*
 AutomationTimeAxisView::get_state_node ()
 {
 	TimeAxisView* state_parent = get_parent_with_state ();
 
 	if (state_parent) {
-		return state_parent->get_automation_child_xml_node (_control->parameter());
+		return state_parent->get_automation_child_xml_node (_parameter);
 	} else {
 		return 0;
 	}
@@ -924,3 +1051,35 @@ AutomationTimeAxisView::hide ()
 	TimeAxisView::hide ();
 }
 
+bool
+AutomationTimeAxisView::set_visibility (bool yn)
+{
+	bool changed = TimeAxisView::set_visibility (yn);
+
+	if (changed) {
+		get_state_node()->add_property ("shown", yn ? X_("yes") : X_("no"));
+	}
+
+	return changed;
+}
+
+/** @return true if this view has any automation data to display */
+bool
+AutomationTimeAxisView::has_automation () const
+{
+	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;
+}