Committed underlay support (from Audun).
[ardour.git] / gtk2_ardour / automation_time_axis.cc
index 6f47905f02082cce1dd6e830e821146caee6e74f..518f4ed41fa83c9f29b3e79a1937fbdb3e2ae4c1 100644 (file)
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <utility>
 #include <ardour/route.h>
+#include <ardour/automation_control.h>
+#include <pbd/memento_command.h>
+#include <gtkmm2ext/barcontroller.h>
 
 #include "ardour_ui.h"
 #include "automation_time_axis.h"
+#include "automation_streamview.h"
+#include "route_time_axis.h"
 #include "automation_line.h"
 #include "public_editor.h"
-#include "canvas-simplerect.h"
-#include "canvas-waveview.h"
+#include "simplerect.h"
 #include "selection.h"
-#include "ghostregion.h"
 #include "rgb_macros.h"
 #include "automation_selectable.h"
 #include "point_selection.h"
+#include "canvas_impl.h"
+#include "utils.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
+using namespace Gtkmm2ext;
 using namespace Editing;
 
-static const gchar * small_x_xpm[] = {
-"11 11 2 1",
-"      c None",
-".     c #000000",
-"           ",
-"           ",
-"  .     .  ",
-"   .   .   ",
-"    . .    ",
-"     .     ",
-"    . .    ",
-"   .   .   ",
-"  .     .  ",
-"           ",
-"           "};
-
-AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& rent, Widget* p, std::string nom, std::string state_name, std::string nomparent)
+Pango::FontDescription* AutomationTimeAxisView::name_font = 0;
+bool AutomationTimeAxisView::have_name_font = false;
+const string AutomationTimeAxisView::state_node_name = "AutomationChild";
+
+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, &rent, p),
-         route (r),
+         TimeAxisView (s, e, &parent, canvas),
+         _route (r),
+         _control (c),
+         _automatable (a),
+         _controller(AutomationController::create(a, c->list(), c)),
+         _base_rect (0),
+         _view (show_regions ? new AutomationStreamView(*this) : NULL),
          _name (nom),
-         _state_name (state_name),
          height_button (_("h")),
          clear_button (_("clear")),
          auto_button (X_("")) /* force addition of a label */
 {
+       if (!have_name_font) {
+               name_font = get_font_for_style (X_("AutomationTrackName"));
+               have_name_font = true;
+       }
+
        automation_menu = 0;
-       in_destructor = false;
        auto_off_item = 0;
        auto_touch_item = 0;
        auto_write_item = 0;
        auto_play_item = 0;
-       ignore_state_request = false;
+       mode_discrete_item = 0;
+       mode_line_item = 0;
 
-       base_rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP(canvas_display),
-                                        gnome_canvas_simplerect_get_type(),
-                                        "x1", 0.0,
-                                        "y1", 0.0,
-                                        "x2", 1000000.0,
-                                        "outline_color_rgba", color_map[cAutomationTrackOutline],
-                                        /* outline ends and bottom */
-                                        "outline_what", (guint32) (0x1|0x2|0x8),
-                                        "fill_color_rgba", color_map[cAutomationTrackFill],
-                                        NULL);
+       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() = editor.frame_to_pixel (max_frames);
+       _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();
+       
+       _base_rect->set_data ("trackview", this);
 
-       gtk_object_set_data (GTK_OBJECT(base_rect), "trackview", this);
+       _base_rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_automation_track_event),
+                                                _base_rect, this));
 
-       gtk_signal_connect (GTK_OBJECT(base_rect), "event",
-                           (GtkSignalFunc) PublicEditor::canvas_automation_track_event,
-                           this);
+       _base_rect->lower_to_bottom();
 
-       hide_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(small_x_xpm)))));
+       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");
 
+       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"));
@@ -88,43 +120,40 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
           life easier and remove them.
        */
 
-       name_hbox.remove (name_entry);
+       hide_name_entry();
 
        /* move the name label over a bit */
 
        string shortpname = _name;
        bool shortened = false;
-       
-       if (_name.length()) {
-               if (shortpname.length() > 18) {
-                       shortpname = shortpname.substr (0, 16);
-                       shortpname += "...";
-                       shortened = true;
-               }
+
+       int ignore_width;
+       shortpname = fit_to_pixels (_name, 60, *name_font, ignore_width, true);
+
+       if (shortpname != _name ){
+               shortened = true;
        }
+
        name_label.set_text (shortpname);
-       name_label.set_alignment (1.0, 0.5);
+       name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
 
        if (nomparent.length()) {
 
                /* limit the plug name string */
 
-               string pname = nomparent;
-
-               if (pname.length() > 14) {
-                       pname = pname.substr (0, 11);
-                       pname += "...";
+               string pname = fit_to_pixels (nomparent, 60, *name_font, ignore_width, true);
+               if (pname != nomparent) {
                        shortened = true;
                }
 
                plugname = new Label (pname);
                plugname->set_name (X_("TrackPlugName"));
-               plugname->set_alignment (1.0, 0.5);
+               plugname->show();
                name_label.set_name (X_("TrackParameterName"));
                controls_table.remove (name_hbox);
-               controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               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, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
        } else {
                plugname = 0;
                plugname_packed = false;
@@ -143,9 +172,12 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
        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, 7, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (clear_button, 7, 9, 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);
        
+       /* add bar controller */
+       controls_table.attach (*_controller.get(), 0, 8, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+
        controls_table.show_all ();
 
        height_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::height_clicked));
@@ -159,21 +191,41 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
 
        controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
 
-       XMLNode* xml_node = get_parent_with_state()->get_child_xml_node (_state_name);
-       set_state (*xml_node);
+       XMLNode* xml_node = get_parent_with_state()->get_automation_child_xml_node (
+                       _control->parameter());
+
+       if (xml_node) {
+               set_state (*xml_node);
+       } 
+               
+       /* ask for notifications of any new RegionViews */
+       if (show_regions) {
+
+               assert(_view);
+               _view->attach ();
+       
+       /* no regions, just a single line for the entire track (e.g. bus gain) */
+       } else {
+       
+               boost::shared_ptr<AutomationLine> line(new AutomationLine (
+                                       _control->parameter().to_string(),
+                                       *this,
+                                       *canvas_display,
+                                       _control->list()));
+
+               line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get());
+               line->queue_reset ();
+               add_line (line);
+       }
 
        /* make sure labels etc. are correct */
 
        automation_state_changed ();
+       ColorsChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler));
 }
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
 {
-       in_destructor = true;
-
-       for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
-               delete *i;
-       }
 }
 
 void
@@ -186,19 +238,33 @@ AutomationTimeAxisView::auto_clicked ()
                automation_menu->set_name ("ArdourContextMenu");
                MenuList& items (automation_menu->items());
 
-               items.push_back (MenuElem (_("off"), 
+               items.push_back (MenuElem (_("Manual"), 
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
-               items.push_back (MenuElem (_("play"),
+               items.push_back (MenuElem (_("Play"),
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
-               items.push_back (MenuElem (_("write"),
+               items.push_back (MenuElem (_("Write"),
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
-               items.push_back (MenuElem (_("touch"),
+               items.push_back (MenuElem (_("Touch"),
                                           bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
        }
 
-       automation_menu->popup (1, 0);
+       automation_menu->popup (1, gtk_get_current_event_time());
 }
 
+void
+AutomationTimeAxisView::set_automation_state (AutoState state)
+{
+       if (!ignore_state_request) {
+               if (_route == _automatable) { // FIXME: ew
+                       _route->set_parameter_automation_state (
+                                       _control->parameter(),
+                                       state);
+               }
+
+               _control->list()->set_automation_state(state);
+
+       }
+}
 
 void
 AutomationTimeAxisView::automation_state_changed ()
@@ -207,15 +273,15 @@ AutomationTimeAxisView::automation_state_changed ()
 
        /* update button label */
 
-       if (lines.empty()) {
+       if (!_line) {
                state = Off;
        } else {
-               state = lines.front()->the_list().automation_state ();
+               state = _control->list()->automation_state ();
        }
 
        switch (state & (Off|Play|Touch|Write)) {
        case Off:
-               static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("off"));
+               auto_button.set_label (_("Manual"));
                if (auto_off_item) {
                        ignore_state_request = true;
                        auto_off_item->set_active (true);
@@ -226,7 +292,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Play:
-               static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("play"));
+               auto_button.set_label (_("Play"));
                if (auto_play_item) {
                        ignore_state_request = true;
                        auto_play_item->set_active (true);
@@ -237,7 +303,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Write:
-               static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("write"));
+               auto_button.set_label (_("Write"));
                if (auto_write_item) {
                        ignore_state_request = true;
                        auto_write_item->set_active (true);
@@ -248,7 +314,7 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        case Touch:
-               static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("touch"));
+               auto_button.set_label (_("Touch"));
                if (auto_touch_item) {
                        ignore_state_request = true;
                        auto_touch_item->set_active (true);
@@ -259,11 +325,38 @@ AutomationTimeAxisView::automation_state_changed ()
                }
                break;
        default:
-               static_cast<Gtk::Label*>(auto_button.get_child())->set_text (_("???"));
+               auto_button.set_label (_("???"));
                break;
        }
 }
 
+void
+AutomationTimeAxisView::interpolation_changed ()
+{      
+       AutomationList::InterpolationStyle style = _control->list()->interpolation();
+       
+       if (mode_line_item && mode_discrete_item) {
+               if (style == AutomationList::Discrete) {
+                       mode_discrete_item->set_active(true);
+                       mode_line_item->set_active(false);
+               } else {
+                       mode_line_item->set_active(true);
+                       mode_discrete_item->set_active(false);
+               }
+       }
+       
+       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 ()
 {
@@ -274,159 +367,151 @@ void
 AutomationTimeAxisView::clear_clicked ()
 {
        _session.begin_reversible_command (_("clear automation"));
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               (*i)->clear ();
-       }
+       if (_line)
+               _line->clear ();
        _session.commit_reversible_command ();
 }
 
 void
-AutomationTimeAxisView::set_height (TrackHeight h)
+AutomationTimeAxisView::set_height (TrackHeight ht)
 {
-       bool changed = (height != (uint32_t) h);
-
-       TimeAxisView* state_parent = get_parent_with_state ();
-       XMLNode* xml_node = state_parent->get_child_xml_node (_state_name);
-
-       controls_table.show_all ();
-
-       TimeAxisView::set_height (h);
-       gtk_object_set (GTK_OBJECT(base_rect), "y2", (double) h, NULL);
+       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;
 
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               (*i)->set_height (h);
+       TimeAxisView::set_height (ht);
+       _base_rect->property_y2() = h;
+       
+       if (_line)
+               _line->set_y_position_and_height (0, h);
+       
+       if (_view) {
+               _view->set_height(h);
+               _view->update_contents_y_position_and_height();
        }
 
-       for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
-               (*i)->set_height ();
-       }
+       TimeAxisView* state_parent = get_parent_with_state ();
+       assert(state_parent);
 
-       switch (height) {
+       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");
-               controls_table.remove (name_hbox);
-               if (plugname) {
-                       if (plugname_packed) {
-                               controls_table.remove (*plugname);
-                               plugname_packed = false;
-                       }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-                       plugname_packed = true;
-                       controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               }
-               controls_table.show_all ();
-               name_label.show ();
                break;
 
        case Large:
                xml_node->add_property ("track_height", "large");
-               controls_table.remove (name_hbox);
-               if (plugname) {
-                       if (plugname_packed) {
-                               controls_table.remove (*plugname);
-                               plugname_packed = false;
-                       }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-                       plugname_packed = true;
-               } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               }
-               controls_table.show_all ();
-               name_label.show ();
                break;
 
        case Larger:
                xml_node->add_property ("track_height", "larger");
-               controls_table.remove (name_hbox);
-               if (plugname) {
-                       if (plugname_packed) {
-                               controls_table.remove (*plugname);
-                               plugname_packed = false;
-                       }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-                       plugname_packed = true;
-               } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               }
-               controls_table.show_all ();
-               name_label.show ();
                break;
 
        case Normal:
                xml_node->add_property ("track_height", "normal");
-               controls_table.remove (name_hbox);
-               if (plugname) {
-                       if (plugname_packed) {
-                               controls_table.remove (*plugname);
-                               plugname_packed = false;
-                       }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-                       plugname_packed = true;
-                       controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               }
-               controls_table.show_all ();
-               name_label.show ();
                break;
 
        case Smaller:
                xml_node->add_property ("track_height", "smaller");
-               controls_table.remove (name_hbox);
-               if (plugname) {
-                       if (plugname_packed) {
-                               controls_table.remove (*plugname);
-                               plugname_packed = false;
-                       }
-               }
-               controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               controls_table.hide_all ();
-               name_hbox.show_all ();
-               controls_table.show ();
                break;
 
        case Small:
                xml_node->add_property ("track_height", "small");
-               controls_table.remove (name_hbox);
-               if (plugname) {
-                       if (plugname_packed) {
-                               controls_table.remove (*plugname);
-                               plugname_packed = false;
-                       }
-               } 
-               controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               controls_table.hide_all ();
-               name_hbox.show_all ();
-               controls_table.show ();
                break;
        }
 
+       switch (ht) {
+               case Large:
+               case Larger:
+               case Largest:
+                       _controller->show ();
+
+               case Normal:
+                       if (ht == Normal)
+                               _controller->hide();
+
+                       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();
+                       height_button.show();
+                       clear_button.show();
+                       hide_button.show_all();
+                       break;
+
+               case Smaller:
+                       _controller->hide();
+
+               case Small:
+
+                       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();
+                       height_button.hide();
+                       clear_button.hide();
+                       hide_button.hide();
+                       break;
+       }
+
        if (changed) {
                /* only emit the signal if the height really changed */
-                route.gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+               _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
        }
 }
 
 void
 AutomationTimeAxisView::set_samples_per_unit (double spu)
 {
-       TimeAxisView::set_samples_per_unit (editor.get_current_zoom());
+       TimeAxisView::set_samples_per_unit (spu);
 
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               (*i)->reset ();
-       }
+       if (_line)
+               _line->reset ();
+       
+       if (_view)
+               _view->set_samples_per_unit (spu);
 }
  
 void
 AutomationTimeAxisView::hide_clicked ()
 {
+       // LAME fix for refreshing the hide button
+       hide_button.set_sensitive(false);
+       
        set_marked_for_display (false);
        hide ();
+       
+       hide_button.set_sensitive(true);
 }
 
-
 void
 AutomationTimeAxisView::build_display_menu ()
 {
@@ -451,71 +536,122 @@ AutomationTimeAxisView::build_display_menu ()
        items.push_back (MenuElem (_("Clear"), mem_fun(*this, &AutomationTimeAxisView::clear_clicked)));
        items.push_back (SeparatorElem());
 
+       /* state menu */
+
        Menu* auto_state_menu = manage (new Menu);
        auto_state_menu->set_name ("ArdourContextMenu");
        MenuList& as_items = auto_state_menu->items();
        
-       as_items.push_back (CheckMenuElem (_("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"),
+       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"),
+       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"),
+       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) {
+               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);
+
+               items.push_back (MenuElem (_("Mode"), *auto_mode_menu));
+       }
 
        /* make sure the automation menu state is correct */
 
        automation_state_changed ();
+       interpolation_changed ();
 }
 
-bool
-AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
+void
+AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, nframes_t when, double y)
 {
-       bool ret = false;
+       if (!_line)
+               return;
 
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               ret = cut_copy_clear_one ((**i), selection, op);
-       }
+       double x = 0;
 
-       return ret;
+       canvas_display->w2i (x, y);
+
+       /* compute vertical fractional position */
+
+       y = 1.0 - (y / height);
+
+       /* map using line */
+
+       _line->view_to_model_y (y);
+
+       _session.begin_reversible_command (_("add automation event"));
+       XMLNode& before = _control->list()->get_state();
+
+       _control->list()->add (when, y);
+
+       XMLNode& after = _control->list()->get_state();
+       _session.commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->list().get(), &before, &after));
+
+       _session.set_dirty ();
+}
+
+
+bool
+AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
+{
+       return cut_copy_clear_one (*_line, selection, op);
 }
 
 bool
 AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& selection, CutCopyOp op)
 {
        AutomationList* what_we_got = 0;
-       AutomationList& alist (line.the_list());
+       boost::shared_ptr<AutomationList> alist (line.the_list());
        bool ret = false;
 
-       _session.add_undo (alist.get_memento());
+       XMLNode &before = alist->get_state();
 
        switch (op) {
        case Cut:
-               if ((what_we_got = alist.cut (selection.time.front().start, selection.time.front().end)) != 0) {
+               if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) {
                        editor.get_cut_buffer().add (what_we_got);
-                       _session.add_redo_no_execute (alist.get_memento());
+                       _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) {
+               if ((what_we_got = alist->copy (selection.time.front().start, selection.time.front().end)) != 0) {
                        editor.get_cut_buffer().add (what_we_got);
                }
                break;
 
        case Clear:
-               if ((what_we_got = alist.cut (selection.time.front().start, selection.time.front().end)) != 0) {
-                       _session.add_redo_no_execute (alist.get_memento());
+               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;
@@ -534,26 +670,43 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
        return ret;
 }
 
-bool
-AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp op)
+void
+AutomationTimeAxisView::reset_objects (PointSelection& selection)
 {
-       bool ret = false;
+       reset_objects_one (*_line, selection);
+}
 
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               ret = cut_copy_clear_objects_one ((**i), selection, op);
+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);
        }
+}
 
-       return ret;
+bool
+AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp op)
+{
+       return cut_copy_clear_objects_one (*_line, selection, op);
 }
 
 bool
 AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointSelection& selection, CutCopyOp op)
 {
        AutomationList* what_we_got = 0;
-       AutomationList& alist (line.the_list());
+       boost::shared_ptr<AutomationList> alist(line.the_list());
        bool ret = false;
 
-       _session.add_undo (alist.get_memento());
+       XMLNode &before = alist->get_state();
 
        for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) {
 
@@ -563,21 +716,21 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 
                switch (op) {
                case Cut:
-                       if ((what_we_got = alist.cut ((*i).start, (*i).end)) != 0) {
+                       if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) {
                                editor.get_cut_buffer().add (what_we_got);
-                               _session.add_redo_no_execute (alist.get_memento());
+                               _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) {
+                       if ((what_we_got = alist->copy ((*i).start, (*i).end)) != 0) {
                                editor.get_cut_buffer().add (what_we_got);
                        }
                        break;
                        
                case Clear:
-                       if ((what_we_got = alist.cut ((*i).start, (*i).end)) != 0) {
-                               _session.add_redo_no_execute (alist.get_memento());
+                       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;
@@ -585,7 +738,9 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
                        break;
                }
        }
-               
+
+       delete &before;
+
        if (what_we_got) {
                for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) {
                        double foo = (*x)->value;
@@ -598,22 +753,16 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 }
 
 bool
-AutomationTimeAxisView::paste (jack_nframes_t pos, float times, Selection& selection, size_t nth)
+AutomationTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth)
 {
-       bool ret = true;
-
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               ret = paste_one (**i, pos, times, selection, nth);
-       }
-
-       return ret;
+       return paste_one (*_line, pos, times, selection, nth);
 }
 
 bool
-AutomationTimeAxisView::paste_one (AutomationLine& line, jack_nframes_t pos, float times, Selection& selection, size_t nth)
+AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float times, Selection& selection, size_t nth)
 {
        AutomationSelection::iterator p;
-       AutomationList& alist (line.the_list());
+       boost::shared_ptr<AutomationList> alist(line.the_list());
        
        for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth);
 
@@ -634,41 +783,17 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, jack_nframes_t pos, flo
                (*x)->value = foo;
        }
 
-       _session.add_undo (alist.get_memento());
-       alist.paste (copy, pos, times);
-       _session.add_redo_no_execute (alist.get_memento());
+       XMLNode &before = alist->get_state();
+       alist->paste (copy, pos, times);
+       _session.add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
 
        return true;
 }
 
 void
-AutomationTimeAxisView::add_ghost (GhostRegion* gr)
-{
-       ghosts.push_back (gr);
-       gr->GoingAway.connect (mem_fun(*this, &AutomationTimeAxisView::remove_ghost));
-}
-
-void
-AutomationTimeAxisView::remove_ghost (GhostRegion* gr)
-{
-       if (in_destructor) {
-               return;
-       }
-
-       list<GhostRegion*>::iterator i;
-
-       for (i = ghosts.begin(); i != ghosts.end(); ++i) {
-               if ((*i) == gr) {
-                       ghosts.erase (i);
-                       break;
-               }
-       }
-}
-
-void
-AutomationTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, double top, double bot, list<Selectable*>& results)
+AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
 {
-       if (!lines.empty() && touched (top, bot)) {
+       if (_line && touched (top, bot)) {
                double topfrac;
                double botfrac;
 
@@ -676,7 +801,7 @@ AutomationTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t en
                   y_position is the "origin" or "top" of the track.
                */
 
-               double mybot = y_position + height; // XXX need to include Editor::track_spacing; 
+               double mybot = y_position + height;
 
                if (y_position >= top && mybot <= bot) {
 
@@ -695,92 +820,115 @@ AutomationTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t en
                        botfrac = 1.0 - ((bot - y_position) / height);
                }
 
-               for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-                       (*i)->get_selectables (start, end, botfrac, topfrac, results);
-               }
+               if (_line)
+                       _line->get_selectables (start, end, botfrac, topfrac, results);
        }
 }
 
 void
 AutomationTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& result)
 {
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               (*i)->get_inverted_selectables (sel, result);
-       }
+       if (_line)
+               _line->get_inverted_selectables (sel, result);
 }
 
 void
 AutomationTimeAxisView::set_selected_points (PointSelection& points)
 {
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               (*i)->set_selected_points (points);
-       }
+       if (_line)
+               _line->set_selected_points (points);
 }
 
 void
 AutomationTimeAxisView::clear_lines ()
 {
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               delete *i;
-       }
-
-       lines.clear ();
+       _line.reset();
        automation_connection.disconnect ();
 }
 
 void
-AutomationTimeAxisView::add_line (AutomationLine& line)
+AutomationTimeAxisView::add_line (boost::shared_ptr<AutomationLine> line)
 {
-       bool get = false;
+       assert(line);
+       assert(!_line);
+       assert(line->the_list() == _control->list());
 
-       if (lines.empty()) {
-               /* first line is the Model for automation state */
-               automation_connection = line.the_list().automation_state_changed.connect
-                       (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed));
-               get = true;
-       }
+       automation_connection = _control->list()->automation_state_changed.connect
+               (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed));
 
-       lines.push_back (&line);
-       line.set_height (height);
+       _line = line;
+       //_controller = AutomationController::create(_session, line->the_list(), _control);
 
-       if (get) {
-               /* pick up the current state */
-               automation_state_changed ();
-       }
+       line->set_y_position_and_height (0, height);
+
+       /* pick up the current state */
+       automation_state_changed ();
+
+       line->show();
 }
 
 void
-AutomationTimeAxisView::show_all_control_points ()
+AutomationTimeAxisView::entered()
 {
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               (*i)->show_all_control_points ();
-       }
+       if (_line)
+               _line->track_entered();
 }
 
 void
-AutomationTimeAxisView::hide_all_but_selected_control_points ()
+AutomationTimeAxisView::exited ()
 {
-       for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               (*i)->hide_all_but_selected_control_points ();
-       }
+       if (_line)
+               _line->track_exited();
 }
 
-void
-AutomationTimeAxisView::entered()
+/*void
+AutomationTimeAxisView::set_colors ()
 {
-       show_all_control_points ();
-}
+    for (list<GhostRegion*>::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) {
+               (*i)->set_colors();
+    }
+    
+       if (_line)
+               _line->set_colors();
+               }*/
 
 void
-AutomationTimeAxisView::exited ()
+AutomationTimeAxisView::color_handler () 
 {
-       hide_all_but_selected_control_points ();
+       if (_line) {
+               _line->set_colors();
+       }
 }
 
 void
 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;
+                       }
+               }
+       }
+
+       if (!_marked_for_display)
+               hide();
 }
 
 XMLNode*
@@ -789,8 +937,32 @@ AutomationTimeAxisView::get_state_node ()
        TimeAxisView* state_parent = get_parent_with_state ();
 
        if (state_parent) {
-               return state_parent->get_child_xml_node (_state_name);
+               return state_parent->get_automation_child_xml_node (_control->parameter());
        } else {
                return 0;
        }
 }
+
+void
+AutomationTimeAxisView::update_extra_xml_shown (bool editor_shown)
+{
+       XMLNode* xml_node = get_state_node();
+       xml_node->add_property ("shown", editor_shown ? "yes" : "no");
+}
+
+guint32
+AutomationTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent)
+{
+       update_extra_xml_shown (true);
+       
+       return TimeAxisView::show_at (y, nth, parent);
+}
+
+void
+AutomationTimeAxisView::hide ()
+{
+       update_extra_xml_shown (false);
+
+       TimeAxisView::hide ();
+}
+