Fix insane formatting (how did this even happen? copy paste from an email diff or...
[ardour.git] / gtk2_ardour / automation_time_axis.cc
index 099a36c8224bb9f59e806ef914119899e4e27f0f..57f2f8a21d4f07a8d7adeb5d1ad5a5720abf2618 100644 (file)
 */
 
 #include <utility>
-#include <ardour/route.h>
-#include <ardour/automation_control.h>
-#include <pbd/memento_command.h>
 #include <gtkmm2ext/barcontroller.h>
+#include <pbd/memento_command.h>
+#include <ardour/automation_control.h>
+#include <ardour/event_type_map.h>
+#include <ardour/route.h>
 
 #include "ardour_ui.h"
 #include "automation_time_axis.h"
@@ -49,21 +50,25 @@ Pango::FontDescription* AutomationTimeAxisView::name_font = 0;
 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.
+ * For route/track automation (e.g. gain) pass the route for both \r and \a.
+ * 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->list(), c)),
+         _controller(AutomationController::create(a, c->parameter(), c)),
          _base_rect (0),
          _view (show_regions ? new AutomationStreamView(*this) : NULL),
          _name (nom),
-         height_button (_("h")),
          clear_button (_("clear")),
          auto_button (X_("")) /* force addition of a label */
 {
@@ -83,10 +88,10 @@ 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 = new SimpleRect(*_canvas_display);
        _base_rect->property_x1() = 0.0;
        _base_rect->property_y1() = 0.0;
-       _base_rect->property_x2() = editor.frame_to_pixel (max_frames);
+       _base_rect->property_x2() = LONG_MAX - 2;
        _base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackOutline.get();
        
        /* outline ends and bottom */
@@ -95,21 +100,24 @@ 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, this));
+       _base_rect->signal_event().connect (bind (
+                       mem_fun (_editor, &PublicEditor::canvas_automation_track_event),
+                       _base_rect, this));
 
        _base_rect->lower_to_bottom();
 
        hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
 
-       height_button.set_name ("TrackSizeButton");
        auto_button.set_name ("TrackVisualButton");
        clear_button.set_name ("TrackVisualButton");
        hide_button.set_name ("TrackRemoveButton");
 
+       auto_button.unset_flags (Gtk::CAN_FOCUS);
+       clear_button.unset_flags (Gtk::CAN_FOCUS);
+       hide_button.unset_flags (Gtk::CAN_FOCUS);
+
        controls_table.set_no_show_all();
 
-       ARDOUR_UI::instance()->tooltips().set_tip(height_button, _("track height"));
        ARDOUR_UI::instance()->tooltips().set_tip(auto_button, _("automation state"));
        ARDOUR_UI::instance()->tooltips().set_tip(clear_button, _("clear track"));
        ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("hide track"));
@@ -170,7 +178,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
        
        /* add the buttons */
        controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (height_button, 0, 1, 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);
        controls_table.attach (clear_button, 5, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
@@ -180,7 +187,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 
        controls_table.show_all ();
 
-       height_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::height_clicked));
        clear_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::clear_clicked));
        hide_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
        auto_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::auto_clicked));
@@ -206,12 +212,11 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
        
        /* no regions, just a single line for the entire track (e.g. bus gain) */
        } else {
-       
                boost::shared_ptr<AutomationLine> line(new AutomationLine (
-                                       _control->parameter().to_string(),
+                                       ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()),
                                        *this,
-                                       *canvas_display,
-                                       _control->list()));
+                                       *_canvas_display,
+                                       _control->alist()));
 
                line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get());
                line->queue_reset ();
@@ -238,14 +243,14 @@ AutomationTimeAxisView::auto_clicked ()
                automation_menu->set_name ("ArdourContextMenu");
                MenuList& items (automation_menu->items());
 
-               items.push_back (MenuElem (_("Manual"), 
-                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
-               items.push_back (MenuElem (_("Play"),
-                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
-               items.push_back (MenuElem (_("Write"),
-                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
-               items.push_back (MenuElem (_("Touch"),
-                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
+               items.push_back (MenuElem (_("Manual"), bind (mem_fun(*this,
+                               &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
+               items.push_back (MenuElem (_("Play"), bind (mem_fun(*this,
+                               &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
+               items.push_back (MenuElem (_("Write"), bind (mem_fun(*this,
+                               &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
+               items.push_back (MenuElem (_("Touch"), bind (mem_fun(*this,
+                               &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
        }
 
        automation_menu->popup (1, gtk_get_current_event_time());
@@ -255,15 +260,15 @@ void
 AutomationTimeAxisView::set_automation_state (AutoState state)
 {
        if (!ignore_state_request) {
-               if (_route == _automatable) { // FIXME: ew
-                       _route->set_parameter_automation_state (
-                                       _control->parameter(),
-                                       state);
+               if (_route == _automatable) { // This is a time axis for route (not region) automation
+                       _route->set_parameter_automation_state (_control->parameter(), state);
                }
 
-               _control->list()->set_automation_state(state);
-
+               if (_control->list())
+                       _control->alist()->set_automation_state(state);
        }
+       if (_view)
+               _view->set_automation_state (state);
 }
 
 void
@@ -276,9 +281,9 @@ AutomationTimeAxisView::automation_state_changed ()
        if (!_line) {
                state = Off;
        } else {
-               state = _control->list()->automation_state ();
+               state = _control->alist()->automation_state ();
        }
-
+       
        switch (state & (Off|Play|Touch|Write)) {
        case Off:
                auto_button.set_label (_("Manual"));
@@ -345,97 +350,66 @@ AutomationTimeAxisView::interpolation_changed ()
                }
        }
        
-       if (_line)
+       if (_line) {
                _line->set_interpolation(style);
+       }
 }
 
 void
 AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle style)
 {
        _control->list()->set_interpolation(style);
-               if (_line)
-       _line->set_interpolation(style);
-}
-
-void
-AutomationTimeAxisView::height_clicked ()
-{
-       popup_size_menu (0);
+       if (_line) {
+               _line->set_interpolation(style);
+       }
 }
 
 void
 AutomationTimeAxisView::clear_clicked ()
 {
        _session.begin_reversible_command (_("clear automation"));
-       if (_line)
+       if (_line) {
                _line->clear ();
+       }
        _session.commit_reversible_command ();
 }
 
 void
-AutomationTimeAxisView::set_height (TrackHeight ht)
+AutomationTimeAxisView::set_height (uint32_t h)
 {
-       uint32_t h = height_to_pixels (ht);
        bool changed = (height != (uint32_t) h) || first_call_to_set_height;
-       
-       if (first_call_to_set_height)
-               first_call_to_set_height = false;
+       bool changed_between_small_and_normal = ( 
+                  (height < hNormal && h >= hNormal)
+               || (height >= hNormal || h < hNormal) );
+
+       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 (ht);
+       TimeAxisView::set_height (h);
        _base_rect->property_y2() = h;
        
        if (_line)
-               _line->set_y_position_and_height (0, h);
+               _line->set_height(h);
        
        if (_view) {
                _view->set_height(h);
-               _view->update_contents_y_position_and_height();
+               _view->update_contents_height();
        }
 
-       TimeAxisView* state_parent = get_parent_with_state ();
-       assert(state_parent);
-
-       XMLNode* xml_node = state_parent->get_automation_child_xml_node(_control->parameter());
-       assert(xml_node);
-
-       switch (ht) {
-       case Largest:
-               xml_node->add_property ("track_height", "largest");
-               break;
-
-       case Large:
-               xml_node->add_property ("track_height", "large");
-               break;
-
-       case Larger:
-               xml_node->add_property ("track_height", "larger");
-               break;
-
-       case Normal:
-               xml_node->add_property ("track_height", "normal");
-               break;
-
-       case Smaller:
-               xml_node->add_property ("track_height", "smaller");
-               break;
-
-       case Small:
-               xml_node->add_property ("track_height", "small");
-               break;
+       char buf[32];
+       snprintf (buf, sizeof (buf), "%u", height);
+       if (xml_node) {
+               xml_node->add_property ("height", buf);
        }
 
-       switch (ht) {
-               case Large:
-               case Larger:
-               case Largest:
-                       _controller->show ();
+       if (changed_between_small_and_normal || first_call_to_set_height) {
 
-               case Normal:
-                       if (ht == Normal)
-                               _controller->hide();
+               first_call_to_set_height = false;
 
+               if (h >= hNormal) {
                        controls_table.remove (name_hbox);
-
+                       
                        if (plugname) {
                                if (plugname_packed) {
                                        controls_table.remove (*plugname);
@@ -450,18 +424,12 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
                        hide_name_entry ();
                        show_name_label ();
                        name_hbox.show_all ();
-
+                       
                        auto_button.show();
-                       height_button.show();
                        clear_button.show();
                        hide_button.show_all();
-                       break;
-
-               case Smaller:
-                       _controller->hide();
-
-               case Small:
 
+               } else if (h >= hSmall) {
                        controls_table.remove (name_hbox);
                        if (plugname) {
                                if (plugname_packed) {
@@ -474,17 +442,18 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
                        hide_name_entry ();
                        show_name_label ();
                        name_hbox.show_all ();
-
+                       
                        auto_button.hide();
-                       height_button.hide();
                        clear_button.hide();
                        hide_button.hide();
-                       break;
+               }
+       } else if (h >= hNormal){
+               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 ("track_height", (void *) 0); /* EMIT_SIGNAL */
+               _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
        }
 }
 
@@ -542,44 +511,52 @@ 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), (AutoState) Off)));
+       as_items.push_back (CheckMenuElem (_("Manual"), bind (
+                       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), (AutoState) Play)));
+       as_items.push_back (CheckMenuElem (_("Play"), bind (
+                       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), (AutoState) Write)));
+       as_items.push_back (CheckMenuElem (_("Write"), bind (
+                       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), (AutoState) Touch)));
+       as_items.push_back (CheckMenuElem (_("Touch"), bind (
+                       mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
+                       (AutoState) Touch)));
        auto_touch_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
        items.push_back (MenuElem (_("State"), *auto_state_menu));
        
        /* mode menu */
-       
-       if (_control->parameter().type() == MidiCCAutomation) {
+
+       if ( EventTypeMap::instance().is_midi_parameter(_control->parameter()) ) {
+               
                Menu* auto_mode_menu = manage (new Menu);
                auto_mode_menu->set_name ("ArdourContextMenu");
                MenuList& am_items = auto_mode_menu->items();
        
                RadioMenuItem::Group group;
-
+               
                am_items.push_back (RadioMenuElem (group, _("Discrete"), bind (
                                                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);
-
-               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(_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);
+               }
 
                items.push_back (MenuElem (_("Mode"), *auto_mode_menu));
        }
@@ -598,7 +575,7 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent
 
        double x = 0;
 
-       canvas_display->w2i (x, y);
+       _canvas_display->w2i (x, y);
 
        /* compute vertical fractional position */
 
@@ -606,15 +583,15 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent
 
        /* map using line */
 
-       _line->view_to_model_y (y);
+       _line->view_to_model_coord (x, y);
 
        _session.begin_reversible_command (_("add automation event"));
-       XMLNode& before = _control->list()->get_state();
+       XMLNode& before = _control->alist()->get_state();
 
-       _control->list()->add (when, y);
+       _control->alist()->add (when, y);
 
-       XMLNode& after = _control->list()->get_state();
-       _session.commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->list().get(), &before, &after));
+       XMLNode& after = _control->alist()->get_state();
+       _session.commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->alist(), &before, &after));
 
        _session.set_dirty ();
 }
@@ -629,7 +606,7 @@ AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 bool
 AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& selection, CutCopyOp op)
 {
-       AutomationList* what_we_got = 0;
+       boost::shared_ptr<Evoral::ControlList> what_we_got;
        boost::shared_ptr<AutomationList> alist (line.the_list());
        bool ret = false;
 
@@ -638,22 +615,20 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
        switch (op) {
        case Cut:
                if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) {
-                       editor.get_cut_buffer().add (what_we_got);
+                       _editor.get_cut_buffer().add (what_we_got);
                        _session.add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
                        ret = true;
                }
                break;
        case Copy:
                if ((what_we_got = alist->copy (selection.time.front().start, selection.time.front().end)) != 0) {
-                       editor.get_cut_buffer().add (what_we_got);
+                       _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()));
-                       delete what_we_got;
-                       what_we_got = 0;
                        ret = true;
                }
                break;
@@ -661,9 +636,11 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
 
        if (what_we_got) {
                for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) {
-                       double foo = (*x)->value;
-                       line.model_to_view_y (foo);
-                       (*x)->value = foo;
+                       double when = (*x)->when;
+                       double val  = (*x)->value;
+                       line.model_to_view_coord (when, val);
+                       (*x)->when = when;
+                       (*x)->value = val;
                }
        }
 
@@ -702,7 +679,7 @@ AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCo
 bool
 AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointSelection& selection, CutCopyOp op)
 {
-       AutomationList* what_we_got = 0;
+       boost::shared_ptr<Evoral::ControlList> what_we_got;
        boost::shared_ptr<AutomationList> alist(line.the_list());
        bool ret = false;
 
@@ -717,22 +694,20 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
                switch (op) {
                case Cut:
                        if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) {
-                               editor.get_cut_buffer().add (what_we_got);
+                               _editor.get_cut_buffer().add (what_we_got);
                                _session.add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
                                ret = true;
                        }
                        break;
                case Copy:
                        if ((what_we_got = alist->copy ((*i).start, (*i).end)) != 0) {
-                               editor.get_cut_buffer().add (what_we_got);
+                               _editor.get_cut_buffer().add (what_we_got);
                        }
                        break;
                        
                case Clear:
                        if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) {
                                _session.add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
-                               delete what_we_got;
-                               what_we_got = 0;
                                ret = true;
                        }
                        break;
@@ -743,9 +718,11 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 
        if (what_we_got) {
                for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) {
-                       double foo = (*x)->value;
-                       line.model_to_view_y (foo);
-                       (*x)->value = foo;
+                       double when = (*x)->when;
+                       double val  = (*x)->value;
+                       line.model_to_view_coord (when, val);
+                       (*x)->when = when;
+                       (*x)->value = val;
                }
        }
 
@@ -778,9 +755,11 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti
        AutomationList copy (**p);
 
        for (AutomationList::iterator x = copy.begin(); x != copy.end(); ++x) {
-               double foo = (*x)->value;
-               line.view_to_model_y (foo);
-               (*x)->value = foo;
+               double when = (*x)->when;
+               double val  = (*x)->value;
+               line.view_to_model_coord (when, val);
+               (*x)->when = when;
+               (*x)->value = val;
        }
 
        XMLNode &before = alist->get_state();
@@ -798,14 +777,14 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double
                double botfrac;
 
                /* remember: this is X Window - coordinate space starts in upper left and moves down.
-                  y_position is the "origin" or "top" of the track.
+                  _y_position is the "origin" or "top" of the track.
                */
 
-               double mybot = y_position + height;
+               double mybot = _y_position + height;
 
-               if (y_position >= top && mybot <= bot) {
+               if (_y_position >= top && mybot <= bot) {
 
-                       /* y_position is below top, mybot is above bot, so we're fully
+                       /* _y_position is below top, mybot is above bot, so we're fully
                           covered vertically.
                        */
 
@@ -814,10 +793,10 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double
 
                } else {
 
-                       /* top and bot are within y_position .. mybot */
+                       /* top and bot are within _y_position .. mybot */
 
-                       topfrac = 1.0 - ((top - y_position) / height);
-                       botfrac = 1.0 - ((bot - y_position) / height);
+                       topfrac = 1.0 - ((top - _y_position) / height);
+                       botfrac = 1.0 - ((bot - _y_position) / height);
                }
 
                if (_line)
@@ -853,13 +832,13 @@ AutomationTimeAxisView::add_line (boost::shared_ptr<AutomationLine> line)
        assert(!_line);
        assert(line->the_list() == _control->list());
 
-       automation_connection = _control->list()->automation_state_changed.connect
+       automation_connection = _control->alist()->automation_state_changed.connect
                (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed));
 
        _line = line;
        //_controller = AutomationController::create(_session, line->the_list(), _control);
 
-       line->set_y_position_and_height (0, height);
+       line->set_height (height);
 
        /* pick up the current state */
        automation_state_changed ();
@@ -881,17 +860,6 @@ AutomationTimeAxisView::exited ()
                _line->track_exited();
 }
 
-/*void
-AutomationTimeAxisView::set_colors ()
-{
-    for (list<GhostRegion*>::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) {
-               (*i)->set_colors();
-    }
-    
-       if (_line)
-               _line->set_colors();
-               }*/
-
 void
 AutomationTimeAxisView::color_handler () 
 {
@@ -900,35 +868,25 @@ AutomationTimeAxisView::color_handler ()
        }
 }
 
-void
+int
 AutomationTimeAxisView::set_state (const XMLNode& node)
 {
        TimeAxisView::set_state (node);
-       
-       XMLNodeList kids;
-       XMLNodeConstIterator iter;
 
-       kids = node.children ();
-
-       for (iter = kids.begin(); iter != kids.end(); ++iter) {
-               
-               if ((*iter)->name() == state_node_name) {
-                       XMLProperty* type = (*iter)->property("automation-id");
-
-                       if (type && type->value() == _control->parameter().to_string()) {
-                               XMLProperty *shown = (*iter)->property("shown_editor");
-
-                               if (shown && shown->value() == "yes") {
-                                       set_marked_for_display(true);
-                                       canvas_display->show(); /* FIXME: necessary? show_at? */
-                               }
-                               break;
-                       }
+       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 (!_marked_for_display)
+       
+       if (!_marked_for_display) {
                hide();
+       }
+
+       return 0;
 }
 
 XMLNode*
@@ -947,7 +905,9 @@ void
 AutomationTimeAxisView::update_extra_xml_shown (bool editor_shown)
 {
        XMLNode* xml_node = get_state_node();
-       xml_node->add_property ("shown", editor_shown ? "yes" : "no");
+       if (xml_node) {
+               xml_node->add_property ("shown", editor_shown ? "yes" : "no");
+       }
 }
 
 guint32