update selection clock
[ardour.git] / gtk2_ardour / automation_time_axis.cc
index ba76f68e18dfdcca621ab361da63502af654d43d..60552ce14eaafb4d3dbb5742ff4faf7d1a81b84d 100644 (file)
 
 #include <utility>
 #include <gtkmm2ext/barcontroller.h>
+#include <gtkmm2ext/utils.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+
+#include "pbd/error.h"
 #include "pbd/memento_command.h"
+#include "pbd/stacktrace.h"
+
 #include "ardour/automation_control.h"
 #include "ardour/event_type_map.h"
+#include "ardour/parameter_types.h"
+#include "ardour/profile.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
 
+#include "canvas/debug.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 "paste_context.h"
 #include "public_editor.h"
-#include "simplerect.h"
 #include "selection.h"
 #include "rgb_macros.h"
 #include "point_selection.h"
-#include "canvas_impl.h"
+#include "control_point.h"
 #include "utils.h"
+#include "item_counts.h"
 
 #include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace Editing;
 
-Pango::FontDescription* AutomationTimeAxisView::name_font = 0;
+Pango::FontDescription AutomationTimeAxisView::name_font;
 bool AutomationTimeAxisView::have_name_font = false;
-const string AutomationTimeAxisView::state_node_name = "AutomationChild";
 
 
 /** \a a the automatable object this time axis is to display data for.
@@ -58,26 +71,49 @@ 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 (new ArdourCanvas::Rectangle (_canvas_display))
+       , _name (nom)
+       , _view (show_regions ? new AutomationStreamView (*this) : 0)
+       , auto_button (X_("")) /* force addition of a label */
+       , _show_regions (show_regions)
+{
+
+       CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for auto %2/%1", _name, r->name()));
+       CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for auto %2/%1", _name, r->name()));
+       CANVAS_DEBUG_NAME (_ghost_group, string_compose ("ghosts for auto %2/%1", _name, r->name()));
+
        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->desc(), _control);
+       }
+
+       const std::string fill_color_name = (dynamic_cast<MidiTimeAxisView*>(&parent)
+                                            ? "midi automation track fill"
+                                            : "audio automation track fill");
+
        automation_menu = 0;
        auto_off_item = 0;
        auto_touch_item = 0;
@@ -89,30 +125,21 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session* s, boost::shared_ptr<Ro
        ignore_state_request = false;
        first_call_to_set_height = true;
 
-       _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;
-       _base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackOutline.get();
-
-       /* outline ends and bottom */
-       _base_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);
-       _base_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackFill.get();
-
+       CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name));
+       _base_rect->set_x1 (ArdourCanvas::COORD_MAX);
+       _base_rect->set_outline (false);
+       _base_rect->set_fill_color (ARDOUR_UI::config()->color_mod (fill_color_name, "automation track fill"));
        _base_rect->set_data ("trackview", this);
-
-       _base_rect->signal_event().connect (sigc::bind (
-                       sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event),
-                       _base_rect, this));
-
+       _base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this));
        if (!a) {
                _base_rect->lower_to_bottom();
        }
 
-       hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
+       hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::CloseCross));
+       hide_button.set_tweaks(ArdourButton::TrackHeader);
 
-       auto_button.set_name ("TrackVisualButton");
-       hide_button.set_name ("TrackRemoveButton");
+       auto_button.set_name ("route button");
+       hide_button.set_name ("route button");
 
        auto_button.unset_flags (Gtk::CAN_FOCUS);
        hide_button.unset_flags (Gtk::CAN_FOCUS);
@@ -122,98 +149,119 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session* s, boost::shared_ptr<Ro
        ARDOUR_UI::instance()->set_tip(auto_button, _("automation state"));
        ARDOUR_UI::instance()->set_tip(hide_button, _("hide track"));
 
-       /* rearrange the name display */
-
-       /* we never show these for automation tracks, so make
-          life easier and remove them.
-       */
-
-       hide_name_entry();
+       const string str = gui_property ("height");
+       if (!str.empty()) {
+               set_height (atoi (str));
+       } else {
+               set_height (preset_height (HeightNormal));
+       }
 
-       /* move the name label over a bit */
+       //name label isn't editable on an automation track; remove the tooltip
+       ARDOUR_UI::instance()->set_tip (name_label, X_(""));
 
-       string shortpname = _name;
-       bool shortened = false;
+       /* repack the name label */
 
-       int ignore_width;
-       shortpname = fit_to_pixels (_name, 60, *name_font, ignore_width, true);
+       if (name_label.get_parent()) {
+               name_label.get_parent()->remove (name_label);
+       }
+       
+       name_label.set_text (_name);
+       name_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+       name_label.set_name (X_("TrackParameterName"));
+       name_label.set_ellipsize (Pango::ELLIPSIZE_END);
 
-       if (shortpname != _name ){
-               shortened = true;
+       string tipname = nomparent;
+       if (!tipname.empty()) {
+               tipname += ": ";
        }
+       tipname += _name;
+       ARDOUR_UI::instance()->set_tip(controls_ebox, tipname);
 
-       name_label.set_text (shortpname);
-       name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
+       /* add the buttons */
+       controls_table.set_border_width (1);
+       controls_table.remove (name_hbox);
+       controls_table.attach (hide_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+       controls_table.attach (name_label,  2, 3, 1, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 2, 0);
+       controls_table.attach (auto_button, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 
-       if (nomparent.length()) {
+       Gtk::DrawingArea *blank0 = manage (new Gtk::DrawingArea());
+       Gtk::DrawingArea *blank1 = manage (new Gtk::DrawingArea());
 
-               /* limit the plug name string */
+       RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&parent);
+       // TODO use rtv->controls_base_unselected_name
+       // subscribe to route_active_changed, ...
+       if (rtv && rtv->is_audio_track()) {
+               blank0->set_name ("AudioTrackControlsBaseUnselected");
+       }
+       else if (rtv && rtv->is_midi_track()) {
+               blank0->set_name ("MidiTrackControlsBaseUnselected");
+       }
+       else {
+               blank0->set_name ("AudioBusControlsBaseUnselected");
+       }
+       blank0->set_size_request (-1, -1);
+       blank1->set_size_request (1, 0);
+       VSeparator* separator = manage (new VSeparator());
+       separator->set_name("TrackSeparator");
+       separator->set_size_request (1, -1);
 
-               string pname = fit_to_pixels (nomparent, 60, *name_font, ignore_width, true);
-               if (pname != nomparent) {
-                       shortened = true;
-               }
+       controls_button_size_group->add_widget(hide_button);
+       controls_button_size_group->add_widget(*blank0);
 
-               plugname = new Label (pname);
-               plugname->set_name (X_("TrackPlugName"));
-               plugname->show();
-               name_label.set_name (X_("TrackParameterName"));
-               controls_table.remove (name_hbox);
-               controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               plugname_packed = true;
-               controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       } else {
-               plugname = 0;
-               plugname_packed = false;
-       }
+       time_axis_hbox.pack_start (*blank0, false, false);
+       time_axis_hbox.pack_start (*separator, false, false);
+       time_axis_hbox.reorder_child (*blank0, 0);
+       time_axis_hbox.reorder_child (*separator, 1);
+       time_axis_hbox.reorder_child (time_axis_vbox, 2);
 
-       if (shortened) {
-               string tipname = nomparent;
-               if (!tipname.empty()) {
-                       tipname += ": ";
-               }
-               tipname += _name;
-               ARDOUR_UI::instance()->set_tip(controls_ebox, tipname);
+       if (!ARDOUR::Profile->get_mixbus() ) {
+               time_axis_hbox.pack_start (*blank1, false, false);
        }
 
-       /* add the buttons */
-       controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       blank0->show();
+       separator->show();
+       name_label.show ();
+       hide_button.show ();
 
-       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) {
+               _controller->disable_vertical_scroll ();
+               controls_table.attach (*_controller.get(), 2, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       }
 
        controls_table.show_all ();
 
-       hide_button.signal_clicked().connect (sigc::mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
-       auto_button.signal_clicked().connect (sigc::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());
-
-       if (xml_node) {
-               set_state (*xml_node, Stateful::loading_state_version);
-       }
+       controls_ebox.set_name (controls_base_unselected_name);
+       time_axis_frame.set_name (controls_base_unselected_name);
 
        /* ask for notifications of any new RegionViews */
        if (show_regions) {
 
-               assert(_view);
-               _view->attach ();
+               if (_view) {
+                       _view->attach ();
+               }
 
-       /* no regions, just a single line for the entire track (e.g. bus gain) */
        } else {
-               boost::shared_ptr<AutomationLine> line(new AutomationLine (
-                                       ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()),
-                                       *this,
-                                       *_canvas_display,
-                                       _control->alist()));
+               /* no regions, just a single line for the entire track (e.g. bus gain) */
+
+               assert (_control);
 
-               line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get());
+               boost::shared_ptr<AutomationLine> line (
+                       new AutomationLine (
+                               ARDOUR::EventTypeMap::instance().to_symbol(_parameter),
+                               *this,
+                               *_canvas_display,
+                               _control->alist(),
+                               _control->desc()
+                               )
+                       );
+
+               line->set_line_color (ARDOUR_UI::config()->color ("processor automation line"));
                line->queue_reset ();
                add_line (line);
        }
@@ -222,10 +270,21 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session* s, boost::shared_ptr<Ro
 
        automation_state_changed ();
        ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler));
+
+       _route->DropReferences.connect (
+               _route_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::route_going_away, this), gui_context ()
+               );
 }
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
 {
+       delete _view;
+}
+
+void
+AutomationTimeAxisView::route_going_away ()
+{
+       _route.reset ();
 }
 
 void
@@ -238,8 +297,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,
@@ -259,20 +318,12 @@ AutomationTimeAxisView::set_automation_state (AutoState 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);
+               _automatable->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'.
                */
@@ -287,17 +338,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_text (S_("Automation|Manual"));
                if (auto_off_item) {
                        ignore_state_request = true;
                        auto_off_item->set_active (true);
@@ -308,7 +360,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Play:
-               auto_button.set_label (_("Play"));
+               auto_button.set_text (_("Play"));
                if (auto_play_item) {
                        ignore_state_request = true;
                        auto_play_item->set_active (true);
@@ -319,7 +371,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Write:
-               auto_button.set_label (_("Write"));
+               auto_button.set_text (_("Write"));
                if (auto_write_item) {
                        ignore_state_request = true;
                        auto_write_item->set_active (true);
@@ -330,7 +382,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Touch:
-               auto_button.set_label (_("Touch"));
+               auto_button.set_text (_("Touch"));
                if (auto_touch_item) {
                        ignore_state_request = true;
                        auto_touch_item->set_active (true);
@@ -341,7 +393,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        default:
-               auto_button.set_label (_("???"));
+               auto_button.set_text (_("???"));
                break;
        }
 }
@@ -368,10 +420,11 @@ AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle st
        /* Tell our view's list, if we have one, otherwise tell our own.
         * Everything else will be signalled back from that.
         */
-       
+
        if (_view) {
                _view->set_interpolation (style);
        } else {
+               assert (_control);
                _control->list()->set_interpolation (style);
        }
 }
@@ -380,16 +433,16 @@ void
 AutomationTimeAxisView::clear_clicked ()
 {
        assert (_line || _view);
-       
-       _session->begin_reversible_command (_("clear automation"));
-       
+
+       _editor.begin_reversible_command (_("clear automation"));
+
        if (_line) {
                _line->clear ();
        } else if (_view) {
                _view->clear ();
        }
 
-       _session->commit_reversible_command ();
+       _editor.commit_reversible_command ();
        _session->set_dirty ();
 }
 
@@ -400,12 +453,9 @@ AutomationTimeAxisView::set_height (uint32_t h)
        uint32_t const normal = preset_height (HeightNormal);
        bool const changed_between_small_and_normal = ( (height < normal && h >= normal) || (height >= normal || h < normal) );
 
-       TimeAxisView* state_parent = get_parent_with_state ();
-       assert(state_parent);
-       XMLNode* xml_node = state_parent->get_automation_child_xml_node (_control->parameter());
-
        TimeAxisView::set_height (h);
-       _base_rect->property_y2() = h;
+
+       _base_rect->set_y1 (h);
 
        if (_line) {
                _line->set_height(h);
@@ -416,60 +466,24 @@ 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)) {
-                       controls_table.remove (name_hbox);
-
-                       if (plugname) {
-                               if (plugname_packed) {
-                                       controls_table.remove (*plugname);
-                                       plugname_packed = false;
-                               }
-                               controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-                               plugname_packed = true;
-                               controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-                       } else {
-                               controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-                       }
-                       hide_name_entry ();
-                       show_name_label ();
-                       name_hbox.show_all ();
-
                        auto_button.show();
-                       hide_button.show_all();
+                       name_label.show();
+                       hide_button.show();
 
                } else if (h >= preset_height (HeightSmall)) {
-                       controls_table.remove (name_hbox);
-                       if (plugname) {
-                               if (plugname_packed) {
-                                       controls_table.remove (*plugname);
-                                       plugname_packed = false;
-                               }
-                       }
-                       controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                        controls_table.hide_all ();
-                       hide_name_entry ();
-                       show_name_label ();
-                       name_hbox.show_all ();
-
                        auto_button.hide();
-                       hide_button.hide();
+                       name_label.hide();
                }
-       } else if (h >= preset_height (HeightNormal)) {
-               cerr << "track grown, but neither changed_between_small_and_normal nor first_call_to_set_height set!" << endl;
        }
 
        if (changed) {
-               if (canvas_item_visible (_canvas_display)) {
+               if (_canvas_display->visible() && _route) {
                        /* only emit the signal if the height really changed and we were visible */
                        _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
                }
@@ -477,28 +491,28 @@ AutomationTimeAxisView::set_height (uint32_t h)
 }
 
 void
-AutomationTimeAxisView::set_samples_per_unit (double spu)
+AutomationTimeAxisView::set_samples_per_pixel (double fpp)
 {
-       TimeAxisView::set_samples_per_unit (spu);
+       TimeAxisView::set_samples_per_pixel (fpp);
 
        if (_line) {
                _line->reset ();
        }
 
        if (_view) {
-               _view->set_samples_per_unit (spu);
+               _view->set_samples_per_pixel (fpp);
        }
 }
 
 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);
 }
 
@@ -526,25 +540,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));
 
@@ -553,7 +567,7 @@ AutomationTimeAxisView::build_display_menu ()
        /* current interpolation state */
        AutomationList::InterpolationStyle const s = _view ? _view->interpolation() : _control->list()->interpolation ();
 
-       if (EventTypeMap::instance().is_midi_parameter(_control->parameter())) {
+       if (ARDOUR::parameter_is_midi((AutomationType)_parameter.type())) {
 
                Menu* auto_mode_menu = manage (new Menu);
                auto_mode_menu->set_name ("ArdourContextMenu");
@@ -564,13 +578,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));
@@ -583,14 +597,24 @@ AutomationTimeAxisView::build_display_menu ()
 }
 
 void
-AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/, nframes_t when, double y)
+AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double y, bool with_guard_points)
 {
-       if (!_line)
+       if (!_line) {
                return;
+       }
+
+       boost::shared_ptr<AutomationList> list = _line->the_list ();
+       
+       if (list->in_write_pass()) {
+               /* do not allow the GUI to add automation events during an
+                  automation write pass.
+               */
+               return;
+       }
 
        double x = 0;
 
-       _canvas_display->w2i (x, y);
+       _canvas_display->canvas_to_item (x, y);
 
        /* compute vertical fractional position */
 
@@ -600,234 +624,76 @@ 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();
+       _editor.snap_to_with_modifier (when, event);
 
-       /* 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 (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;
+       _editor.begin_reversible_command (_("add automation event"));
+       XMLNode& before = list->get_state();
 
-       case Clear:
-               if ((what_we_got = alist->cut (start, end)) != 0) {
-                       _session->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
-               }
-               break;
-       }
+       list->add (when, y, with_guard_points);
 
-       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);
-       }
+       XMLNode& after = list->get_state();
+       _session->add_command (new MementoCommand<ARDOUR::AutomationList> (*list, &before, &after));
+       _editor.commit_reversible_command ();
+       _session->set_dirty ();
 }
 
-void
-AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp op)
+bool
+AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx)
 {
-       list<boost::shared_ptr<AutomationLine> > lines;
        if (_line) {
-               lines.push_back (_line);
+               return paste_one (pos, ctx.count, ctx.times, selection, ctx.counts, ctx.greedy);
        } 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 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);
+               AutomationSelection::const_iterator l = selection.lines.get_nth(_parameter, ctx.counts.n_lines(_parameter));
+               if (l == selection.lines.end()) {
+                       if (ctx.greedy && selection.lines.size() == 1) {
+                               l = selection.lines.begin();
                        }
-                       break;
-
-               case Clear:
-                       if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) {
-                               _session->add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
-                       }
-                       break;
                }
-       }
-
-       delete &before;
-
-       if (what_we_got) {
-               for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) {
-                       double when = (*x)->when;
-                       double val  = (*x)->value;
-                       line.model_to_view_coord (when, val);
-                       (*x)->when = when;
-                       (*x)->value = val;
+               if (l != selection.lines.end() && _view->paste (pos, ctx.count, ctx.times, *l)) {
+                       ctx.counts.increase_n_lines(_parameter);
+                       return true;
                }
        }
+
+       return false;
 }
 
-/** 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 (framepos_t pos, float times, Selection& selection, size_t nth)
+AutomationTimeAxisView::paste_one (framepos_t pos, unsigned paste_count, float times, const Selection& selection, ItemCounts& counts, bool greedy)
 {
-       boost::shared_ptr<AutomationLine> line;
-       
-       if (_line) {
-               line = _line;
-       } else if (_view) {
-               line = _view->paste_line (pos);
-       }
+       boost::shared_ptr<AutomationList> alist(_line->the_list());
 
-       if (!line) {
+       if (_session->transport_rolling() && alist->automation_write()) {
+               /* do not paste if this control is in write mode and we're rolling */
                return false;
        }
-       
-       return paste_one (*line, pos, times, selection, nth);
-}
-
-bool
-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());
-
-       for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth) {}
 
+       /* Get appropriate list from selection. */
+       AutomationSelection::const_iterator p = selection.lines.get_nth(_parameter, counts.n_lines(_parameter));
        if (p == selection.lines.end()) {
-               return false;
+               if (greedy && selection.lines.size() == 1) {
+                       p = selection.lines.begin();
+               } else {
+                       return false;
+               }
        }
+       counts.increase_n_lines(_parameter);
 
-       /* 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.
-       */
+       /* add multi-paste offset if applicable */
+       pos += _editor.get_paste_offset(pos, paste_count, (*p)->length());
 
-       AutomationList copy (**p);
-
-       for (AutomationList::iterator x = copy.begin(); x != copy.end(); ++x) {
-               double when = (*x)->when;
-               double val  = (*x)->value;
-               line.view_to_model_coord (when, val);
-               (*x)->when = when;
-               (*x)->value = val;
-       }
-
-       double const model_pos = line.time_converter().from (pos - line.time_converter().origin_b ());
+       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;
 }
 
 void
-AutomationTimeAxisView::get_selectables (framepos_t start, framepos_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, bool /*within*/)
 {
        if (!_line && !_view) {
                return;
@@ -899,41 +765,42 @@ 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
 AutomationTimeAxisView::entered()
 {
-       if (_line)
+       if (_line) {
                _line->track_entered();
+       }
 }
 
 void
 AutomationTimeAxisView::exited ()
 {
-       if (_line)
+       if (_line) {
                _line->track_exited();
+       }
 }
 
 void
@@ -945,114 +812,211 @@ AutomationTimeAxisView::color_handler ()
 }
 
 int
-AutomationTimeAxisView::set_state (const XMLNode& node, int version)
+AutomationTimeAxisView::set_state_2X (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())) {
-               XMLProperty const * shown = node.property ("shown");
-               if (shown && shown->value () == "yes") {
-                       set_marked_for_display (true);
-                       _canvas_display->show (); /* FIXME: necessary? show_at? */
+       if (node.name() == X_("gain") && _parameter == Evoral::Parameter (GainAutomation)) {
+               XMLProperty const * shown = node.property (X_("shown"));
+               if (shown) {
+                       bool yn = string_is_affirmative (shown->value ());
+                       if (yn) {
+                               _canvas_display->show (); /* FIXME: necessary? show_at? */
+                       }
+                       set_gui_property ("visible", yn);
+               } else {
+                       set_gui_property ("visible", false);
                }
        }
 
-       if (!_marked_for_display) {
-               hide();
-       }
-
        return 0;
 }
 
 int
-AutomationTimeAxisView::set_state_2X (const XMLNode& node, int version)
+AutomationTimeAxisView::set_state (const XMLNode&, int /*version*/)
 {
-       if (node.name() == X_("gain") && _control->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 ()
+void
+AutomationTimeAxisView::what_has_visible_automation (const boost::shared_ptr<Automatable>& automatable, set<Evoral::Parameter>& visible)
 {
-       TimeAxisView* state_parent = get_parent_with_state ();
+       /* this keeps "knowledge" of how we store visibility information
+          in XML private to this class.
+       */
 
-       if (state_parent) {
-               return state_parent->get_automation_child_xml_node (_control->parameter());
-       } else {
-               return 0;
+       assert (automatable);
+
+       Automatable::Controls& controls (automatable->controls());
+       
+       for (Automatable::Controls::iterator i = controls.begin(); i != controls.end(); ++i) {
+               
+               boost::shared_ptr<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl> (i->second);
+
+               if (ac && ac->alist()) {
+                       
+                       const XMLNode* gui_node = ac->extra_xml ("GUI");
+                       
+                       if (gui_node) {
+                               const XMLProperty* prop = gui_node->property ("shown");
+                               if (prop) {
+                                       if (string_is_affirmative (prop->value())) {
+                                               visible.insert (i->first);
+                                       }
+                               }
+                       }
+               }
        }
 }
 
-void
-AutomationTimeAxisView::update_extra_xml_shown (bool editor_shown)
+
+/** @return true if this view has any automation data to display */
+bool
+AutomationTimeAxisView::has_automation () const
 {
-       XMLNode* xml_node = get_state_node();
-       if (xml_node) {
-               xml_node->add_property ("shown", editor_shown ? "yes" : "no");
-       }
+       return ( (_line && _line->npoints() > 0) || (_view && _view->has_automation()) );
 }
 
-guint32
-AutomationTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent)
+list<boost::shared_ptr<AutomationLine> >
+AutomationTimeAxisView::lines () const
 {
-       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_at (y, nth, parent);
+       return lines;
 }
 
-void
-AutomationTimeAxisView::hide ()
+string
+AutomationTimeAxisView::state_id() const
 {
-       update_extra_xml_shown (false);
-
-       TimeAxisView::hide ();
+       if (_automatable != _route && _control) {
+               return string_compose ("automation %1", _control->id().to_s());
+       } else if (_parameter) {
+               return string_compose ("automation %1 %2/%3/%4", 
+                                      _route->id(), 
+                                      _parameter.type(),
+                                      _parameter.id(),
+                                      (int) _parameter.channel());
+       } else {
+               error << "Automation time axis has no state ID" << endmsg;
+               return "";
+       }
 }
 
+/** 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.
+ */
+
 bool
-AutomationTimeAxisView::set_visibility (bool yn)
+AutomationTimeAxisView::parse_state_id (
+       string const & state_id,
+       PBD::ID & route_id,
+       bool & has_parameter,
+       Evoral::Parameter & parameter)
 {
-       bool changed = TimeAxisView::set_visibility (yn);
+       stringstream s;
+       s << state_id;
 
-       if (changed) {
-               get_state_node()->add_property ("shown", yn ? X_("yes") : X_("no"));
+       string a, b, c;
+       s >> a >> b >> c;
+
+       if (a != X_("automation")) {
+               return false;
        }
 
-       return changed;
-}
+       route_id = PBD::ID (b);
 
-/** @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()) );
+       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;
+               }
+       }
 }