rename mezzo-piano dynamics icon for consistency
[ardour.git] / gtk2_ardour / automation_time_axis.cc
index 00bba2ba1b15698756f6e653695f335bdd0f0233..0eaa1aefc803377bfa4e29dea5cd8054b285d036 100644 (file)
 #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 "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,7 +58,7 @@ 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,
+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)
@@ -100,11 +101,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 +119,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 */
 
@@ -151,7 +154,7 @@ 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"));
@@ -170,7 +173,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 */
@@ -183,8 +186,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 
        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");
@@ -194,7 +197,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
                        _control->parameter());
 
        if (xml_node) {
-               set_state (*xml_node);
+               set_state (*xml_node, Stateful::loading_state_version);
        }
 
        /* ask for notifications of any new RegionViews */
@@ -219,7 +222,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 +239,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)));
        }
 
@@ -253,7 +256,9 @@ void
 AutomationTimeAxisView::set_automation_state (AutoState state)
 {
        if (!ignore_state_request) {
-               _automatable->set_parameter_automation_state (_control->parameter(), state);
+               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);
@@ -266,6 +271,11 @@ AutomationTimeAxisView::set_automation_state (AutoState 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 ();
        }
 }
 
@@ -276,10 +286,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)) {
@@ -333,13 +345,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 {
@@ -347,38 +358,46 @@ 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);
@@ -387,8 +406,9 @@ AutomationTimeAxisView::set_height (uint32_t h)
        TimeAxisView::set_height (h);
        _base_rect->property_y2() = h;
 
-       if (_line)
+       if (_line) {
                _line->set_height(h);
+       }
 
        if (_view) {
                _view->set_height(h);
@@ -405,7 +425,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) {
@@ -426,7 +446,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) {
@@ -443,13 +463,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 */
+               }
        }
 }
 
@@ -458,11 +480,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
@@ -482,10 +506,6 @@ AutomationTimeAxisView::build_display_menu ()
 {
        using namespace Menu_Helpers;
 
-       /* get the size menu ready */
-
-       build_size_menu ();
-
        /* prepare it */
 
        TimeAxisView::build_display_menu ();
@@ -494,11 +514,9 @@ AutomationTimeAxisView::build_display_menu ()
 
        MenuList& items = display_menu->items();
 
-       items.push_back (MenuElem (_("Height"), *size_menu));
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Hide"), mem_fun(*this, &AutomationTimeAxisView::hide_clicked)));
+       items.push_back (MenuElem (_("Hide"), sigc::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 */
@@ -507,23 +525,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());
 
@@ -531,7 +549,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(_control->parameter())) {
 
                Menu* auto_mode_menu = manage (new Menu);
                auto_mode_menu->set_name ("ArdourContextMenu");
@@ -539,20 +560,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));
        }
@@ -560,7 +578,7 @@ AutomationTimeAxisView::build_display_menu ()
        /* make sure the automation menu state is correct */
 
        automation_state_changed ();
-       interpolation_changed ();
+       interpolation_changed (s);
 }
 
 void
@@ -581,51 +599,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::sframes_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;
        }
@@ -639,14 +668,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
@@ -654,11 +690,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;
                }
 
@@ -666,24 +702,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;
                }
 
@@ -691,8 +735,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:
@@ -703,8 +746,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;
                }
@@ -721,18 +763,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());
@@ -758,25 +816,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) {
 
@@ -793,32 +859,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
@@ -828,8 +902,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);
@@ -865,9 +944,9 @@ AutomationTimeAxisView::color_handler ()
 }
 
 int
-AutomationTimeAxisView::set_state (const XMLNode& node)
+AutomationTimeAxisView::set_state (const XMLNode& node, int version)
 {
-       TimeAxisView::set_state (node);
+       TimeAxisView::set_state (node, version);
 
        XMLProperty const * type = node.property ("automation-id");
        if (type && type->value () == ARDOUR::EventTypeMap::instance().to_symbol (_control->parameter())) {
@@ -922,3 +1001,21 @@ 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()) );
+}