Merge branch 'master' into windows
[ardour.git] / gtk2_ardour / automation_time_axis.cc
index 85ba4b378cc50906d7cea176c3d5dc1395f4e7b7..1621697335431eba00e7ff43569ab00d5b86c8ec 100644 (file)
@@ -19,6 +19,9 @@
 
 #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"
@@ -41,6 +44,7 @@
 #include "rgb_macros.h"
 #include "point_selection.h"
 #include "canvas_impl.h"
+#include "control_point.h"
 #include "utils.h"
 
 #include "i18n.h"
@@ -54,7 +58,6 @@ using namespace Editing;
 
 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.
@@ -85,6 +88,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        , _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"));
@@ -142,23 +146,23 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        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();
-
-       /* keep the parameter name short */
+       const string str = gui_property ("height");
+       if (!str.empty()) {
+               set_height (atoi (str));
+       } else {
+               set_height (preset_height (HeightNormal));
+       }
 
-       string shortpname = _name;
-       int ignore_width;
-       shortpname = fit_to_pixels (_name, 60, name_font, ignore_width, true);
+       /* repack the name label */
 
-       name_label.set_text (shortpname);
+       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);
 
        string tipname = nomparent;
        if (!tipname.empty()) {
@@ -169,12 +173,17 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 
        /* 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 ();
 
        if (_controller) {
+               _controller.get()->set_size_request(-1, 24);
                /* add bar controller */
-               controls_table.attach (*_controller.get(), 0, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               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 ();
@@ -186,21 +195,18 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        controls_base_unselected_name = X_("AutomationTrackControlsBase");
        controls_ebox.set_name (controls_base_unselected_name);
 
-       XMLNode* xml_node = get_state_node ();
-
-       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 ();
+               }
 
        } else {
                /* 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),
@@ -221,12 +227,13 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler));
 
        _route->DropReferences.connect (
-               _route_connections, invalidator (*this), ui_bind (&AutomationTimeAxisView::route_going_away, this), gui_context ()
+               _route_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::route_going_away, this), gui_context ()
                );
 }
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
 {
+       delete _view;
 }
 
 void
@@ -245,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,
@@ -268,15 +275,7 @@ AutomationTimeAxisView::set_automation_state (AutoState state)
        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);
 
@@ -294,17 +293,18 @@ AutomationTimeAxisView::automation_state_changed ()
 
        /* update button label */
 
-       if (_line) {
-               state = _control->alist()->automation_state ();
-       } else if (_view) {
+       if (_view) {
                state = _view->automation_state ();
+       } else if (_line) {
+               assert (_control);
+               state = _control->alist()->automation_state ();
        } else {
-               state = Off;
+               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);
@@ -379,6 +379,7 @@ AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle st
        if (_view) {
                _view->set_interpolation (style);
        } else {
+               assert (_control);
                _control->list()->set_interpolation (style);
        }
 }
@@ -407,11 +408,8 @@ 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 = _control->extra_xml ("GUI");
-
        TimeAxisView::set_height (h);
+
        _base_rect->property_y2() = h;
 
        if (_line) {
@@ -423,35 +421,18 @@ AutomationTimeAxisView::set_height (uint32_t 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)) {
-                       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.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) {
@@ -479,12 +460,12 @@ AutomationTimeAxisView::set_samples_per_unit (double 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);
 }
 
@@ -512,25 +493,25 @@ 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));
 
@@ -550,13 +531,13 @@ 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 = 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());
+               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));
@@ -569,12 +550,21 @@ AutomationTimeAxisView::build_display_menu ()
 }
 
 void
-AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/, framepos_t when, double y)
+AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double y)
 {
        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;
 
        _canvas_display->w2i (x, y);
@@ -587,181 +577,17 @@ 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);
-
-       XMLNode& after = _control->alist()->get_state();
-       _session->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->alist(), &before, &after));
-
-       _session->set_dirty ();
-}
-
-void
-AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp 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_one (**i, selection, op);
-       }
-}
 
-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());
-
-       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;
-       }
-
-       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;
-               }
-       }
-}
-
-void
-AutomationTimeAxisView::reset_objects (PointSelection& 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
-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);
-       }
-}
-
-void
-AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp 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);
-       }
-}
-
-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());
-
-       XMLNode &before = alist->get_state();
-
-       for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) {
-
-               if ((*i).track != this) {
-                       continue;
-               }
-
-               switch (op) {
-               case Delete:
-                       if (alist->cut ((*i).start, (*i).end) != 0) {
-                               _session->add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
-                       }
-                       break;
-               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()));
-                       }
-                       break;
-               case Copy:
-                       if ((what_we_got = alist->copy ((*i).start, (*i).end)) != 0) {
-                               _editor.get_cut_buffer().add (what_we_got);
-                       }
-                       break;
+       _editor.snap_to_with_modifier (when, event);
 
-               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()));
-                       }
-                       break;
-               }
-       }
+       _session->begin_reversible_command (_("add automation event"));
+       XMLNode& before = list->get_state();
 
-       delete &before;
+       list->add (when, y);
 
-       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;
-               }
-       }
+       XMLNode& after = list->get_state();
+       _session->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList> (*list, &before, &after));
+       _session->set_dirty ();
 }
 
 /** Paste a selection.
@@ -794,31 +620,21 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, framepos_t pos, float t
        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()) {
+       if (_session->transport_rolling() && alist->automation_write()) {
+               /* do not paste if this control is in write mode and we're rolling */
                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 (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth) {}
 
-       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;
+       if (p == selection.lines.end()) {
+               return false;
        }
 
        double const model_pos = line.time_converter().from (pos - line.time_converter().origin_b ());
 
        XMLNode &before = alist->get_state();
-       alist->paste (copy, model_pos, times);
+       alist->paste (**p, model_pos, times);
        _session->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
 
        return true;
@@ -897,27 +713,26 @@ AutomationTimeAxisView::clear_lines ()
 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 (
-               _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()
-               );
+       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
@@ -944,57 +759,29 @@ AutomationTimeAxisView::color_handler ()
        }
 }
 
-int
-AutomationTimeAxisView::set_state (const XMLNode& node, int version)
-{
-       TimeAxisView::set_state (node, version);
-
-       if (version < 3000) {
-               return set_state_2X (node, version);
-       }
-
-       XMLProperty const * prop = node.property ("shown");
-
-       if (prop) {
-               set_visibility (string_is_affirmative (prop->value()));
-       } else {
-               set_visibility (false);
-       }
-
-       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 (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;
 }
 
-XMLNode*
-AutomationTimeAxisView::get_state_node ()
-{
-       return _control->extra_xml ("GUI", true);
-}
-
-void
-AutomationTimeAxisView::update_extra_xml_shown (bool shown)
+int
+AutomationTimeAxisView::set_state (const XMLNode&, int /*version*/)
 {
-       XMLNode* xml_node = get_state_node();
-       if (xml_node) {
-               xml_node->add_property ("shown", shown ? "yes" : "no");
-       }
+       return 0;
 }
 
 void
@@ -1028,53 +815,154 @@ AutomationTimeAxisView::what_has_visible_automation (const boost::shared_ptr<Aut
        }
 }
 
-guint32
-AutomationTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent)
-{
-       if (!canvas_item_visible (_canvas_display)) {
-               update_extra_xml_shown (true);
-       }
 
-       return TimeAxisView::show_at (y, nth, parent);
+/** @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()) );
 }
 
-void
-AutomationTimeAxisView::show ()
+list<boost::shared_ptr<AutomationLine> >
+AutomationTimeAxisView::lines () const
 {
-       if (!canvas_item_visible (_canvas_display)) {
-               update_extra_xml_shown (true);
+       list<boost::shared_ptr<AutomationLine> > lines;
+
+       if (_line) {
+               lines.push_back (_line);
+       } else if (_view) {
+               lines = _view->get_lines ();
        }
 
-       return TimeAxisView::show ();
+       return lines;
 }
 
-void
-AutomationTimeAxisView::hide ()
+string
+AutomationTimeAxisView::state_id() const
 {
-       if (canvas_item_visible (_canvas_display)) {
-               update_extra_xml_shown (false);
-       }
-
-       TimeAxisView::hide ();
-}
+       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 true if this view has any automation data to display */
 bool
-AutomationTimeAxisView::has_automation () const
+AutomationTimeAxisView::parse_state_id (
+       string const & state_id,
+       PBD::ID & route_id,
+       bool & has_parameter,
+       Evoral::Parameter & parameter)
 {
-       return ( (_line && _line->npoints() > 0) || (_view && _view->has_automation()) );
+       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;
 }
 
-list<boost::shared_ptr<AutomationLine> >
-AutomationTimeAxisView::lines () const
+void
+AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 {
        list<boost::shared_ptr<AutomationLine> > lines;
-
        if (_line) {
                lines.push_back (_line);
        } else if (_view) {
                lines = _view->get_lines ();
        }
 
-       return lines;
+       for (list<boost::shared_ptr<AutomationLine> >::iterator i = lines.begin(); i != lines.end(); ++i) {
+               cut_copy_clear_one (**i, selection, op);
+       }
+}
+
+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());
+
+       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;
+       }
+
+       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;
+               }
+       }
 }