Put some up/down buttons to the right of the summary. Might help with #3786.
[ardour.git] / gtk2_ardour / route_time_axis.cc
index bf999d23d691baea135548fa734087233297f13f..e723aeee4005ce55bb65e81609ca8fa43eaf296c 100644 (file)
@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <string>
 #include <vector>
-#include  <map>
+#include <map>
 #include <utility>
 
 #include <sigc++/bind.h>
@@ -39,7 +39,6 @@
 #include <gtkmm/menuitem.h>
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
@@ -62,6 +61,8 @@
 #include "evoral/Parameter.hpp"
 
 #include "ardour_ui.h"
+#include "debug.h"
+#include "global_signals.h"
 #include "route_time_axis.h"
 #include "automation_time_axis.h"
 #include "canvas_impl.h"
@@ -110,18 +111,14 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh
        , button_table (3, 3)
        , route_group_button (_("g"))
        , playlist_button (_("p"))
-       , size_button (_("h"))
        , automation_button (_("a"))
-       , visual_button (_("v"))
        , gm (sess, slider, true, 115)
-       , _ignore_track_mode_change (false)
 {
        gm.set_controls (_route, _route->shared_peak_meter(), _route->amp());
        gm.get_level_meter().set_no_show_all();
        gm.get_level_meter().setup_meters(50);
 
        _has_state = true;
-       playlist_menu = 0;
        playlist_action_menu = 0;
        automation_action_menu = 0;
        plugins_submenu_item = 0;
@@ -133,39 +130,24 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh
        }
 
        mute_changed (0);
-       solo_changed (0);
+        update_solo_display ();
 
        timestretch_rect = 0;
        no_redraw = false;
-       destructive_track_mode_item = 0;
-       normal_track_mode_item = 0;
-       non_layered_track_mode_item = 0;
 
        ignore_toggle = false;
 
        route_group_button.set_name ("TrackGroupButton");
        playlist_button.set_name ("TrackPlaylistButton");
        automation_button.set_name ("TrackAutomationButton");
-       size_button.set_name ("TrackSizeButton");
-       visual_button.set_name ("TrackVisualButton");
-       hide_button.set_name ("TrackRemoveButton");
 
        route_group_button.unset_flags (Gtk::CAN_FOCUS);
        playlist_button.unset_flags (Gtk::CAN_FOCUS);
        automation_button.unset_flags (Gtk::CAN_FOCUS);
-       size_button.unset_flags (Gtk::CAN_FOCUS);
-       visual_button.unset_flags (Gtk::CAN_FOCUS);
-       hide_button.unset_flags (Gtk::CAN_FOCUS);
 
-       hide_button.add (*(manage (new Image (::get_icon("hide")))));
-       hide_button.show_all ();
-
-       route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::edit_click), false);
+       route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false);
        playlist_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click));
        automation_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click));
-       size_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::size_click), false);
-       visual_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::visual_click));
-       hide_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::hide_click));
 
        if (is_track()) {
 
@@ -185,7 +167,12 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh
                rec_enable_button->show_all ();
 
                controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-               ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record"));
+
+                if (is_midi_track()) {
+                        ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record (Right-click for Step Edit)"));
+                } else {
+                        ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record"));
+                }
 
                rec_enable_button->set_sensitive (_session->writable());
        }
@@ -207,27 +194,12 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh
        ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
        ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
        ARDOUR_UI::instance()->set_tip(route_group_button, _("Route Group"));
-       ARDOUR_UI::instance()->set_tip(size_button,_("Display Height"));
        ARDOUR_UI::instance()->set_tip(playlist_button,_("Playlist"));
        ARDOUR_UI::instance()->set_tip(automation_button, _("Automation"));
-       ARDOUR_UI::instance()->set_tip(visual_button, _("Visual options"));
-       ARDOUR_UI::instance()->set_tip(hide_button, _("Hide this track"));
 
        label_view ();
 
-       if (0) {
-
-               /* old school - when we used to put an extra row of buttons in place */
-
-               controls_table.attach (hide_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               controls_table.attach (visual_button, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               controls_table.attach (size_button, 2, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               controls_table.attach (automation_button, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-
-       } else {
-
-               controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       }
+       controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 
        if (is_track() && track()->mode() == ARDOUR::Normal) {
                controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
@@ -240,7 +212,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh
 
        if (is_track()) {
 
-               track()->TrackModeChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::track_mode_changed, this), gui_context());
                track()->FreezeChange.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::map_frozen, this), gui_context());
                track()->SpeedChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::speed_changed, this), gui_context());
 
@@ -250,6 +221,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh
        }
 
        _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
+       _editor.HorizontalPositionChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::horizontal_position_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler));
 
        PropertyList* plist = new PropertyList();
@@ -273,19 +245,12 @@ RouteTimeAxisView::~RouteTimeAxisView ()
                delete *i;
        }
 
-       delete playlist_menu;
-       playlist_menu = 0;
-
        delete playlist_action_menu;
        playlist_action_menu = 0;
 
        delete _view;
        _view = 0;
 
-       for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
-               delete i->second;
-       }
-
        _automation_tracks.clear ();
 
        delete route_group_menu;
@@ -298,6 +263,7 @@ RouteTimeAxisView::post_construct ()
 
        update_diskstream_display ();
 
+       _subplugin_menu_map.clear ();
        subplugin_menu.items().clear ();
        _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
        _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
@@ -305,7 +271,7 @@ RouteTimeAxisView::post_construct ()
 }
 
 gint
-RouteTimeAxisView::edit_click (GdkEventButton *ev)
+RouteTimeAxisView::route_group_click (GdkEventButton *ev)
 {
        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                if (_route->route_group()) {
@@ -314,8 +280,8 @@ RouteTimeAxisView::edit_click (GdkEventButton *ev)
                return false;
        }
 
-       route_group_menu->rebuild (_route->route_group ());
-       route_group_menu->popup (ev->button, ev->time);
+       route_group_menu->build (_route->route_group ());
+       route_group_menu->menu()->popup (ev->button, ev->time);
 
        return false;
 }
@@ -347,6 +313,10 @@ RouteTimeAxisView::label_view ()
                name_entry.set_text (x);
        }
 
+       if (x != name_label.get_text()) {
+               name_label.set_text (x);
+       }
+
        ARDOUR_UI::instance()->set_tip (name_entry, x);
 }
 
@@ -360,7 +330,6 @@ RouteTimeAxisView::route_property_changed (const PropertyChange& what_changed)
 
 void
 RouteTimeAxisView::take_name_changed (void *src)
-
 {
        if (src != this) {
                label_view ();
@@ -370,15 +339,7 @@ RouteTimeAxisView::take_name_changed (void *src)
 void
 RouteTimeAxisView::playlist_click ()
 {
-       // always build a new action menu
-
-       delete playlist_action_menu;
-
-       playlist_action_menu = new Menu;
-       playlist_action_menu->set_name ("ArdourContextMenu");
-
-       build_playlist_menu (playlist_action_menu);
-
+       build_playlist_menu ();
        conditionally_add_to_selection ();
        playlist_action_menu->popup (1, gtk_get_current_event_time());
 }
@@ -425,6 +386,13 @@ RouteTimeAxisView::build_automation_action_menu ()
 {
        using namespace Menu_Helpers;
 
+       /* detach subplugin_menu from automation_action_menu before we delete automation_action_menu,
+          otherwise bad things happen (see comment for similar case in MidiTimeAxisView::build_automation_action_menu)
+       */
+
+       detach_menu (subplugin_menu);
+
+       _main_automation_menu_map.clear ();
        delete automation_action_menu;
        automation_action_menu = new Menu;
 
@@ -440,11 +408,13 @@ RouteTimeAxisView::build_automation_action_menu ()
        
        items.push_back (MenuElem (_("Hide All Automation"),
                                   sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
+
+       items.push_back (SeparatorElem ());
        
-       /* attach the plugin submenu. It may have previously been used elsewhere, so we detach it first. */
+       /* Attach the plugin submenu. It may have previously been used elsewhere,
+          so it was detached above */
 
-       detach_menu (subplugin_menu);
-       items.push_back (MenuElem (_("Plugins"),  subplugin_menu));
+       items.push_back (MenuElem (_("Plugins"), subplugin_menu));
        items.back().set_sensitive (!subplugin_menu.items().empty());
 }
 
@@ -453,10 +423,6 @@ RouteTimeAxisView::build_display_menu ()
 {
        using namespace Menu_Helpers;
 
-       /* get the size menu ready */
-
-       build_size_menu ();
-
        /* prepare it */
 
        TimeAxisView::build_display_menu ();
@@ -466,98 +432,170 @@ RouteTimeAxisView::build_display_menu ()
        MenuList& items = display_menu->items();
        display_menu->set_name ("ArdourContextMenu");
 
-       items.push_back (MenuElem (_("Height"), *size_menu));
-       items.push_back (MenuElem (_("Color"), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color)));
+       items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &RouteUI::choose_color)));
+
+       if (_size_menu) {
+               detach_menu (*_size_menu);
+       }
+       build_size_menu ();
+       items.push_back (MenuElem (_("Height"), *_size_menu));
 
        items.push_back (SeparatorElem());
 
        if (!Profile->get_sae()) {
                items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
-               /* rebuild this every time */
-               build_automation_action_menu ();
-               detach_menu (*automation_action_menu);
-               items.push_back (MenuElem (_("Automation"), *automation_action_menu));
+               items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1);
                items.push_back (SeparatorElem());
        }
 
        // Hook for derived classes to add type specific stuff
        append_extra_display_menu_items ();
-       items.push_back (SeparatorElem());
 
        if (is_track()) {
 
-               Menu *layers_menu = manage(new Menu);
+               Menu* layers_menu = manage (new Menu);
                MenuList &layers_items = layers_menu->items();
                layers_menu->set_name("ArdourContextMenu");
 
                RadioMenuItem::Group layers_group;
 
-               layers_items.push_back(RadioMenuElem (layers_group, _("Overlaid"),
-                               sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid)));
-               layers_items.push_back(RadioMenuElem (layers_group, _("Stacked"),
-                               sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked)));
+               /* Find out how many overlaid/stacked tracks we have in the selection */
 
-               items.push_back (MenuElem (_("Layers"), *layers_menu));
-
-               Menu* alignment_menu = manage (new Menu);
-               MenuList& alignment_items = alignment_menu->items();
-               alignment_menu->set_name ("ArdourContextMenu");
-
-               RadioMenuItem::Group align_group;
+               int overlaid = 0;
+               int stacked = 0;
+               TrackSelection const & s = _editor.get_selection().tracks;
+               for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
+                       StreamView* v = (*i)->view ();
+                       if (!v) {
+                               continue;
+                       }
 
-               alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material"),
-                                       sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
-               align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
-               if (track()->alignment_style() == ExistingMaterial) {
-                       align_existing_item->set_active();
+                       switch (v->layer_display ()) {
+                       case Overlaid:
+                               ++overlaid;
+                               break;
+                       case Stacked:
+                               ++stacked;
+                               break;
+                       }
                }
 
-               alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time"),
-                                       sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
-               align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
-               if (track()->alignment_style() == CaptureTime) {
-                       align_capture_item->set_active();
-               }
+               /* We're not connecting to signal_toggled() here; in the case where these two items are
+                  set to be in the `inconsistent' state, it seems that one or other will end up active
+                  as well as inconsistent (presumably due to the RadioMenuItem::Group).  Then when you
+                  select the active one, no toggled signal is emitted so nothing happens.
+               */
+               
+               layers_items.push_back (RadioMenuElem (layers_group, _("Overlaid")));
+               RadioMenuItem* i = dynamic_cast<RadioMenuItem*> (&layers_items.back ());
+               i->set_active (overlaid != 0 && stacked == 0);
+               i->set_inconsistent (overlaid != 0 && stacked != 0);
+               i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid, true));
+
+               layers_items.push_back (
+                       RadioMenuElem (layers_group, _("Stacked"),
+                                      sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked, true))
+                       );
+
+               i = dynamic_cast<RadioMenuItem*> (&layers_items.back ());
+               i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked, true));
+               i->set_active (overlaid == 0 && stacked != 0);
+               i->set_inconsistent (overlaid != 0 && stacked != 0);
+               
+               items.push_back (MenuElem (_("Layers"), *layers_menu));
 
                if (!Profile->get_sae()) {
 
-                       items.push_back (MenuElem (_("Alignment"), *alignment_menu));
-                       track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
+                       Menu* alignment_menu = manage (new Menu);
+                       MenuList& alignment_items = alignment_menu->items();
+                       alignment_menu->set_name ("ArdourContextMenu");
+                       
+                       RadioMenuItem::Group align_group;
 
-                       RadioMenuItem::Group mode_group;
-                       items.push_back (RadioMenuElem (mode_group, _("Normal Mode"), sigc::bind (
-                                       sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode),
-                                       ARDOUR::Normal)));
-                       normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+                       /* Same verbose hacks as for the layering options above */
+
+                       int existing = 0;
+                       int capture = 0;
+                       TrackSelection const & s = _editor.get_selection().tracks;
+                       for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
+                               RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*i);
+                               if (!r || !r->is_track ()) {
+                                       continue;
+                               }
+                               
+                               switch (r->track()->alignment_style()) {
+                               case ExistingMaterial:
+                                       ++existing;
+                                       break;
+                               case CaptureTime:
+                                       ++capture;
+                                       break;
+                               }
+                       }
+                       
+                       alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material")));
+                       RadioMenuItem* i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial, true));
+                       i->set_active (existing != 0 && capture == 0);
+                       i->set_inconsistent (existing != 0 && capture != 0);
+                       
+                       alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time")));
+                       i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime, true));
+                       i->set_active (existing == 0 && capture != 0);
+                       i->set_inconsistent (existing != 0 && capture != 0);
+                       
+                       items.push_back (MenuElem (_("Alignment"), *alignment_menu));
 
-                       items.push_back (RadioMenuElem (mode_group, _("Tape Mode"), sigc::bind (
-                                       sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode),
-                                       ARDOUR::Destructive)));
-                       destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+                       Menu* mode_menu = manage (new Menu);
+                       MenuList& mode_items = mode_menu->items ();
+                       mode_menu->set_name ("ArdourContextMenu");
 
-                       items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode"),
-                                                       sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered)));
-                       non_layered_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+                       RadioMenuItem::Group mode_group;
 
+                       int normal = 0;
+                       int tape = 0;
+                       int non_layered = 0;
 
-                       _ignore_track_mode_change = true;
-                       
-                       switch (track()->mode()) {
-                       case ARDOUR::Destructive:
-                               destructive_track_mode_item->set_active ();
-                               break;
-                       case ARDOUR::Normal:
-                               normal_track_mode_item->set_active ();
-                               break;
-                       case ARDOUR::NonLayered:
-                               non_layered_track_mode_item->set_active ();
-                               break;
+                       for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
+                               RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*i);
+                               if (!r || !r->is_track ()) {
+                                       continue;
+                               }
+                               
+                               switch (r->track()->mode()) {
+                               case Normal:
+                                       ++normal;
+                                       break;
+                               case Destructive:
+                                       ++tape;
+                                       break;
+                               case NonLayered:
+                                       ++non_layered;
+                                       break;
+                               }
                        }
-                       
-                       _ignore_track_mode_change = false;
-               }
 
-               track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
+                       mode_items.push_back (RadioMenuElem (mode_group, _("Normal Mode")));
+                       i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal, true));
+                       i->set_active (normal != 0 && tape == 0 && non_layered == 0);
+                       i->set_inconsistent (normal != 0 && (tape != 0 || non_layered != 0));
+
+                       mode_items.push_back (RadioMenuElem (mode_group, _("Tape Mode")));
+                       i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive, true));
+                       i->set_active (normal == 0 && tape != 0 && non_layered == 0);
+                       i->set_inconsistent (tape != 0 && (normal != 0 || non_layered != 0));
+
+                       mode_items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode")));
+                       i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered, true));
+                       i->set_active (normal == 0 && tape == 0 && non_layered != 0);
+                       i->set_inconsistent (non_layered != 0 && (normal != 0 || tape != 0));
+
+                       items.push_back (MenuElem (_("Mode"), *mode_menu));
+               }
 
                color_mode_menu = build_color_mode_menu();
                if (color_mode_menu) {
@@ -565,6 +603,19 @@ RouteTimeAxisView::build_display_menu ()
                }
 
                items.push_back (SeparatorElem());
+
+               build_playlist_menu ();
+               items.push_back (MenuElem (_("Playlist"), *playlist_action_menu));
+               items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1);
+
+               route_group_menu->detach ();
+               route_group_menu->build (_route->route_group ());
+               items.push_back (MenuElem (_("Route Group"), *route_group_menu->menu ()));
+
+               build_automation_action_menu ();
+               items.push_back (MenuElem (_("Automation"), *automation_action_menu));
+
+               items.push_back (SeparatorElem());
        }
 
        items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun(*this, &RouteUI::toggle_route_active)));
@@ -572,7 +623,7 @@ RouteTimeAxisView::build_display_menu ()
        route_active_menu_item->set_active (_route->active());
 
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &RouteTimeAxisView::hide_click)));
+       items.push_back (MenuElem (_("Hide"), sigc::bind (sigc::mem_fun(_editor, &PublicEditor::hide_track_in_display), this, false)));
        if (!Profile->get_sae()) {
                items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
        } else {
@@ -581,112 +632,46 @@ RouteTimeAxisView::build_display_menu ()
        }
 }
 
-static bool __reset_item (RadioMenuItem* item, RadioMenuItem* item_2)
-{
-       item->set_active ();
-       item_2->set_active ();
-       return false;
-}
-
 void
-RouteTimeAxisView::set_track_mode (TrackMode mode)
+RouteTimeAxisView::set_track_mode (TrackMode mode, bool apply_to_selection)
 {
-       if (_ignore_track_mode_change) {
-               return;
-       }
-       
-       RadioMenuItem* item;
-       RadioMenuItem* other_item;
-       RadioMenuItem* other_item_2;
-
-       switch (mode) {
-       case ARDOUR::Normal:
-               item = normal_track_mode_item;
-               other_item = non_layered_track_mode_item;
-               other_item_2 = destructive_track_mode_item;
-               break;
-       case ARDOUR::NonLayered:
-               item = non_layered_track_mode_item;
-               other_item = normal_track_mode_item;
-               other_item_2 = destructive_track_mode_item;
-               break;
-       case ARDOUR::Destructive:
-               item = destructive_track_mode_item;
-               other_item = normal_track_mode_item;
-               other_item_2 = non_layered_track_mode_item;
-               break;
-       default:
-               fatal << string_compose (_("programming error: %1 %2"), "illegal track mode in RouteTimeAxisView::set_track_mode", mode) << endmsg;
-               /*NOTREACHED*/
-               return;
-       }
-
-       if (item && other_item && other_item_2 && track()->mode() != mode) {
-               _set_track_mode (track().get(), mode, other_item, other_item_2);
-       }
-}
-
-void
-RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* reset_item, RadioMenuItem* reset_item_2)
-{
-       bool needs_bounce;
+       if (apply_to_selection) {
+               _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_track_mode, _1, mode, false));
+       } else {
 
-       if (!track->can_use_mode (mode, needs_bounce)) {
+               bool needs_bounce;
 
-               if (!needs_bounce) {
-                       /* cannot be done */
-                       Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (__reset_item), reset_item, reset_item_2));
-                       return;
-               } else {
-                       cerr << "would bounce this one\n";
-                       /* XXX: radio menu item becomes inconsistent with track state in this case */
-                       return;
+               if (!track()->can_use_mode (mode, needs_bounce)) {
+                       
+                       if (!needs_bounce) {
+                               /* cannot be done */
+                               return;
+                       } else {
+                               cerr << "would bounce this one\n";
+                               return;
+                       }
                }
+               
+               track()->set_mode (mode);
+               
+               rec_enable_button->remove ();
+               
+               switch (mode) {
+               case ARDOUR::NonLayered:
+               case ARDOUR::Normal:
+                       rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red"))))));
+                       break;
+               case ARDOUR::Destructive:
+                       rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red"))))));
+                       break;
+               }
+               
+               rec_enable_button->show_all ();
        }
-
-       track->set_mode (mode);
-
-       rec_enable_button->remove ();
-
-       switch (mode) {
-       case ARDOUR::NonLayered:
-       case ARDOUR::Normal:
-               rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red"))))));
-               break;
-       case ARDOUR::Destructive:
-               rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red"))))));
-               break;
-       }
-
-       rec_enable_button->show_all ();
-}
-
-void
-RouteTimeAxisView::track_mode_changed ()
-{
-       RadioMenuItem* item;
-
-       switch (track()->mode()) {
-       case ARDOUR::Normal:
-               item = normal_track_mode_item;
-               break;
-       case ARDOUR::NonLayered:
-               item = non_layered_track_mode_item;
-               break;
-       case ARDOUR::Destructive:
-               item = destructive_track_mode_item;
-               break;
-       default:
-               fatal << string_compose (_("programming error: %1 %2"), "illegal track mode in RouteTimeAxisView::set_track_mode", track()->mode()) << endmsg;
-               /*NOTREACHED*/
-               return;
-       }
-
-       item->set_active ();
 }
 
 void
-RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
+RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end)
 {
        double x1;
        double x2;
@@ -790,7 +775,7 @@ RouteTimeAxisView::set_height (uint32_t h)
        snprintf (buf, sizeof (buf), "%u", height);
        xml_node->add_property ("height", buf);
 
-       if (height >= hNormal) {
+       if (height >= preset_height (HeightNormal)) {
                reset_meter();
                show_name_entry ();
                hide_name_label ();
@@ -806,16 +791,13 @@ RouteTimeAxisView::set_height (uint32_t h)
                        rec_enable_button->show();
 
                route_group_button.show();
-               hide_button.show();
-               visual_button.show();
-               size_button.show();
                automation_button.show();
 
                if (is_track() && track()->mode() == ARDOUR::Normal) {
                        playlist_button.show();
                }
 
-       } else if (height >= hSmaller) {
+       } else if (height >= preset_height (HeightSmaller)) {
 
                reset_meter();
                show_name_entry ();
@@ -832,9 +814,6 @@ RouteTimeAxisView::set_height (uint32_t h)
                        rec_enable_button->show();
 
                route_group_button.hide ();
-               hide_button.hide ();
-               visual_button.hide ();
-               size_button.hide ();
                automation_button.hide ();
 
                if (is_track() && track()->mode() == ARDOUR::Normal) {
@@ -865,9 +844,6 @@ RouteTimeAxisView::set_height (uint32_t h)
                        rec_enable_button->hide();
 
                route_group_button.hide ();
-               hide_button.hide ();
-               visual_button.hide ();
-               size_button.hide ();
                automation_button.hide ();
                playlist_button.hide ();
                name_label.set_text (_route->name());
@@ -880,13 +856,12 @@ RouteTimeAxisView::set_height (uint32_t h)
 }
 
 void
-RouteTimeAxisView::select_track_color ()
+RouteTimeAxisView::set_color (Gdk::Color const & c)
 {
-       if (RouteUI::choose_color ()) {
-
-               if (_view) {
-                       _view->apply_color (_color, StreamView::RegionColor);
-               }
+       RouteUI::set_color (c);
+       
+       if (_view) {
+               _view->apply_color (_color, StreamView::RegionColor);
        }
 }
 
@@ -896,6 +871,14 @@ RouteTimeAxisView::reset_samples_per_unit ()
        set_samples_per_unit (_editor.get_current_zoom());
 }
 
+void
+RouteTimeAxisView::horizontal_position_changed ()
+{
+       if (_view) {
+               _view->horizontal_position_changed ();
+       }
+}
+
 void
 RouteTimeAxisView::set_samples_per_unit (double spu)
 {
@@ -913,42 +896,14 @@ RouteTimeAxisView::set_samples_per_unit (double spu)
 }
 
 void
-RouteTimeAxisView::align_style_changed ()
+RouteTimeAxisView::set_align_style (AlignStyle style, bool apply_to_selection)
 {
-       switch (track()->alignment_style()) {
-       case ExistingMaterial:
-               if (!align_existing_item->get_active()) {
-                       align_existing_item->set_active();
-               }
-               break;
-       case CaptureTime:
-               if (!align_capture_item->get_active()) {
-                       align_capture_item->set_active();
+       if (apply_to_selection) {
+               _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_align_style, _1, style, false));
+       } else {
+               if (track ()) {
+                       track()->set_align_style (style);
                }
-               break;
-       }
-}
-
-void
-RouteTimeAxisView::set_align_style (AlignStyle style)
-{
-       RadioMenuItem* item;
-
-       switch (style) {
-       case ExistingMaterial:
-               item = align_existing_item;
-               break;
-       case CaptureTime:
-               item = align_capture_item;
-               break;
-       default:
-               fatal << string_compose (_("programming error: %1 %2"), "illegal align style in RouteTimeAxisView::set_align_style", style) << endmsg;
-               /*NOTREACHED*/
-               return;
-       }
-
-       if (item->get_active()) {
-               track()->set_align_style (style);
        }
 }
 
@@ -1215,7 +1170,7 @@ RouteTimeAxisView::set_selected_regionviews (RegionSelection& regions)
  * @param results List to add things to.
  */
 void
-RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
+RouteTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list<Selectable*>& results)
 {
        double speed = 1.0;
 
@@ -1223,8 +1178,8 @@ RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top,
                speed = track()->speed();
        }
 
-       nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
-       nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
+       framepos_t const start_adjusted = session_frame_to_track_frame(start, speed);
+       framepos_t const end_adjusted   = session_frame_to_track_frame(end, speed);
 
        if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
                _view->get_selectables (start_adjusted, end_adjusted, top, bot, results);
@@ -1255,34 +1210,6 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>&
        return;
 }
 
-bool
-RouteTimeAxisView::show_automation(Evoral::Parameter param)
-{
-       return (_show_automation.find(param) != _show_automation.end());
-}
-
-/** Retuns 0 if track for \a param doesn't exist.
- */
-RouteTimeAxisView::RouteAutomationNode*
-RouteTimeAxisView::automation_track (Evoral::Parameter param)
-{
-       map<Evoral::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.find (param);
-
-       if (i != _automation_tracks.end()) {
-               return i->second;
-       } else {
-               return 0;
-       }
-}
-
-/** Shorthand for GainAutomation, etc.
- */
-RouteTimeAxisView::RouteAutomationNode*
-RouteTimeAxisView::automation_track (AutomationType type)
-{
-       return automation_track (Evoral::Parameter(type));
-}
-
 RouteGroup*
 RouteTimeAxisView::route_group () const
 {
@@ -1329,32 +1256,16 @@ RouteTimeAxisView::name_entry_changed ()
                ARDOUR_UI::instance()->popup_error (_("A track already exists with that name"));
                name_entry.set_text (_route->name());
        } else if (_session->route_name_internal (x)) {
-               ARDOUR_UI::instance()->popup_error (_("You cannot create a track with that name as it is reserved for Ardour"));
+               ARDOUR_UI::instance()->popup_error (string_compose (_("You cannot create a track with that name as it is reserved for %1"),
+                                                                    PROGRAM_NAME));
                name_entry.set_text (_route->name());
        } else {
                _route->set_name (x);
        }
 }
 
-void
-RouteTimeAxisView::visual_click ()
-{
-       popup_display_menu (0);
-}
-
-void
-RouteTimeAxisView::hide_click ()
-{
-       // LAME fix for hide_button refresh fix
-       hide_button.set_sensitive(false);
-
-       _editor.hide_track_in_display (*this);
-
-       hide_button.set_sensitive(true);
-}
-
 boost::shared_ptr<Region>
-RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir)
+RouteTimeAxisView::find_next_region (framepos_t pos, RegionPoint point, int32_t dir)
 {
        boost::shared_ptr<Playlist> pl = playlist ();
 
@@ -1365,8 +1276,8 @@ RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t d
        return boost::shared_ptr<Region> ();
 }
 
-nframes64_t
-RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir)
+framepos_t
+RouteTimeAxisView::find_next_region_boundary (framepos_t pos, int32_t dir)
 {
        boost::shared_ptr<Playlist> pl = playlist ();
 
@@ -1377,17 +1288,16 @@ RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir)
        return -1;
 }
 
-bool
+void
 RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 {
        boost::shared_ptr<Playlist> what_we_got;
        boost::shared_ptr<Track> tr = track ();
        boost::shared_ptr<Playlist> playlist;
-       bool ret = false;
 
        if (tr == 0) {
                /* route is a bus, not a track */
-               return false;
+               return;
        }
 
        playlist = tr->playlist();
@@ -1401,23 +1311,19 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
                }
        }
 
-        playlist->clear_history ();
-        playlist->clear_owned_history ();
+        playlist->clear_changes ();
+        playlist->clear_owned_changes ();
 
        switch (op) {
        case Cut:
                if ((what_we_got = playlist->cut (time)) != 0) {
                        _editor.get_cut_buffer().add (what_we_got);
 
-                        vector<StatefulDiffCommand*> cmds;
-                        
+                        vector<Command*> cmds;
                         playlist->rdiff (cmds);
-                        
-                        for (vector<StatefulDiffCommand*>::iterator c = cmds.begin(); c != cmds.end(); ++c) {
-                                _session->add_command (*c);
-                        }
+                        _session->add_commands (cmds);
+                       
                         _session->add_command (new StatefulDiffCommand (playlist));
-                       ret = true;
                }
                break;
        case Copy:
@@ -1428,25 +1334,19 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 
        case Clear:
                if ((what_we_got = playlist->cut (time)) != 0) {
-                        vector<StatefulDiffCommand*> cmds;
-                        
+
+                        vector<Command*> cmds;
                         playlist->rdiff (cmds);
-                        
-                        for (vector<StatefulDiffCommand*>::iterator c = cmds.begin(); c != cmds.end(); ++c) {
-                                _session->add_command (*c);
-                        }
+                       _session->add_commands (cmds);
                         _session->add_command (new StatefulDiffCommand (playlist));
                        what_we_got->release ();
-                       ret = true;
                }
                break;
        }
-
-       return ret;
 }
 
 bool
-RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth)
+RouteTimeAxisView::paste (framepos_t pos, float times, Selection& selection, size_t nth)
 {
        if (!is_track()) {
                return false;
@@ -1461,11 +1361,14 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size
                return false;
        }
 
+        DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("paste to %1\n", pos));
+
        if (track()->speed() != 1.0f) {
                pos = session_frame_to_track_frame (pos, track()->speed());
+                DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("modified paste to %1\n", pos));
        }
 
-        pl->clear_history ();
+        pl->clear_changes ();
        pl->paste (*p, pos, times);
        _session->add_command (new StatefulDiffCommand (pl));
 
@@ -1473,20 +1376,6 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size
 }
 
 
-TimeAxisView::Children
-RouteTimeAxisView::get_child_list()
-{
-       TimeAxisView::Children redirect_children;
-
-       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-               if (!(*i)->hidden()) {
-                       redirect_children.push_back(*i);
-               }
-       }
-       return redirect_children;
-}
-
-
 struct PlaylistSorter {
     bool operator() (boost::shared_ptr<Playlist> a, boost::shared_ptr<Playlist> b) const {
             return a->sort_id() < b->sort_id();
@@ -1494,20 +1383,21 @@ struct PlaylistSorter {
 };
 
 void
-RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
+RouteTimeAxisView::build_playlist_menu ()
 {
        using namespace Menu_Helpers;
 
-       if (!menu || !is_track()) {
+       if (!is_track()) {
                return;
        }
 
-       MenuList& playlist_items = menu->items();
-       menu->set_name ("ArdourContextMenu");
-       playlist_items.clear();
-
-       delete playlist_menu;
+       delete playlist_action_menu;
+       playlist_action_menu = new Menu;
+       playlist_action_menu->set_name ("ArdourContextMenu");
 
+       MenuList& playlist_items = playlist_action_menu->items();
+       playlist_action_menu->set_name ("ArdourContextMenu");
+       playlist_items.clear();
 
         vector<boost::shared_ptr<Playlist> > playlists, playlists_tr;
        boost::shared_ptr<Track> tr = track();
@@ -1673,14 +1563,16 @@ RouteTimeAxisView::color_handler ()
 void
 RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param)
 {
-       RouteAutomationNode* node = automation_track(param);
+       boost::shared_ptr<AutomationTimeAxisView> track = automation_child (param);
+       Gtk::CheckMenuItem* menu = automation_child_menu_item (param);
        
-       if (!node) {
+       if (!track) {
                /* it doesn't exist yet, so we don't care about the button state: just add it */
                create_automation_child (param, true);
        } else {
-               bool yn = node->menu_item->get_active();
-               if (node->track->set_visibility (node->menu_item->get_active()) && yn) {
+               assert (menu);
+               bool yn = menu->get_active();
+               if (track->set_visibility (menu->get_active()) && yn) {
                        
                        /* we made it visible, now trigger a redisplay. if it was hidden, then automation_track_hidden()
                           will have done that for us.
@@ -1696,19 +1588,20 @@ RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param)
 void
 RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param)
 {
-       RouteAutomationNode* ran = automation_track(param);
+       boost::shared_ptr<AutomationTimeAxisView> track = automation_child (param);
 
-       if (!ran) {
+       if (!track) {
                return;
        }
 
+       Gtk::CheckMenuItem* menu = automation_child_menu_item (param);
+
        // if Evoral::Parameter::operator< doesn't obey strict weak ordering, we may crash here....
-       _show_automation.erase (param);
-       ran->track->get_state_node()->add_property (X_("shown"), X_("no"));
+       track->get_state_node()->add_property (X_("shown"), X_("no"));
 
-       if (ran->menu_item && !_hidden) {
+       if (menu && !_hidden) {
                ignore_toggle = true;
-               ran->menu_item->set_active (false);
+               menu->set_active (false);
                ignore_toggle = false;
        }
 
@@ -1725,13 +1618,15 @@ RouteTimeAxisView::show_all_automation ()
 
        /* Show our automation */
 
-       map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
-       for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
-               i->second->track->set_marked_for_display (true);
-               i->second->track->canvas_display()->show();
-               i->second->track->get_state_node()->add_property ("shown", X_("yes"));
-               if (i->second->menu_item) {
-                       i->second->menu_item->set_active(true);
+       for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+               i->second->set_marked_for_display (true);
+               i->second->canvas_display()->show();
+               i->second->get_state_node()->add_property ("shown", X_("yes"));
+
+               Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
+               
+               if (menu) {
+                       menu->set_active(true);
                }
        }
 
@@ -1762,13 +1657,16 @@ RouteTimeAxisView::show_existing_automation ()
 
        /* Show our automation */
 
-       map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
-       for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
-               if (i->second->track->line() && i->second->track->line()->npoints() > 0) {
-                       i->second->track->set_marked_for_display (true);
-                       i->second->track->canvas_display()->show();
-                       i->second->track->get_state_node()->add_property ("shown", X_("yes"));
-                       i->second->menu_item->set_active(true);
+       for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+               if (i->second->has_automation()) {
+                       i->second->set_marked_for_display (true);
+                       i->second->canvas_display()->show();
+                       i->second->get_state_node()->add_property ("shown", X_("yes"));
+
+                       Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
+                       if (menu) {
+                               menu->set_active(true);
+                       }
                }
        }
 
@@ -1795,12 +1693,15 @@ RouteTimeAxisView::hide_all_automation ()
 
        /* Hide our automation */
 
-       for (map<Evoral::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
-               i->second->track->set_marked_for_display (false);
-               i->second->track->hide ();
-               i->second->track->get_state_node()->add_property ("shown", X_("no"));
-               if (i->second->menu_item) {
-                       i->second->menu_item->set_active (false);
+       for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+               i->second->set_marked_for_display (false);
+               i->second->hide ();
+               i->second->get_state_node()->add_property ("shown", X_("no"));
+
+               Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
+               
+               if (menu) {
+                       menu->set_active (false);
                }
        }
 
@@ -1812,8 +1713,6 @@ RouteTimeAxisView::hide_all_automation ()
                }
        }
 
-       _show_automation.clear();
-
        no_redraw = false;
         _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
 }
@@ -1823,13 +1722,11 @@ void
 RouteTimeAxisView::region_view_added (RegionView* rv)
 {
        /* XXX need to find out if automation children have automationstreamviews. If yes, no ghosts */
-       if (is_audio_track()) {
-               for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-                       boost::shared_ptr<AutomationTimeAxisView> atv;
-
-                       if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
-                               atv->add_ghost(rv);
-                       }
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+               boost::shared_ptr<AutomationTimeAxisView> atv;
+               
+               if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
+                       atv->add_ghost(rv);
                }
        }
 
@@ -1903,9 +1800,10 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor>
        ProcessorAutomationNode* pan;
 
        if ((pan = find_processor_automation_node (processor, what)) == 0) {
-               error << _("programming error: ")
-                     << string_compose (X_("processor automation curve for %1:%2 not registered with track!"),
-                                 processor->name(), what)
+                /* session state may never have been saved with new plugin */
+                error << _("programming error: ")
+                     << string_compose (X_("processor automation curve for %1:%2/%3/%4 not registered with track!"),
+                                         processor->name(), what.type(), (int) what.channel(), what.id() )
                      << endmsg;
                /*NOTREACHED*/
                return;
@@ -1922,14 +1820,14 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor>
        /* FIXME: ew */
 
        char state_name[256];
-       snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
+       snprintf (state_name, sizeof (state_name), "%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
 
        boost::shared_ptr<AutomationControl> control
                        = boost::dynamic_pointer_cast<AutomationControl>(processor->control(what, true));
 
        pan->view = boost::shared_ptr<AutomationTimeAxisView>(
-                       new AutomationTimeAxisView (_session, _route, processor, control,
-                               _editor, *this, false, parent_canvas, name, state_name));
+               new AutomationTimeAxisView (_session, _route, processor, control, control->parameter (),
+                                           _editor, *this, false, parent_canvas, name, state_name));
 
        pan->view->Hiding.connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor));
 
@@ -2007,14 +1905,10 @@ RouteTimeAxisView::add_automation_child (Evoral::Parameter param, boost::shared_
                }
        }
 
-       _automation_tracks.insert (std::make_pair (param, new RouteAutomationNode(param, NULL, track)));
+       _automation_tracks[param] = track;
 
        track->set_visibility (!hideit);
 
-       if (!hideit) {
-               _show_automation.insert (param);
-       }
-       
        if (!no_redraw) {
                _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
        }
@@ -2089,6 +1983,8 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
                items.push_back (CheckMenuElem (name));
                mitem = dynamic_cast<CheckMenuItem*> (&items.back());
 
+               _subplugin_menu_map[*i] = mitem;
+
                if (has_visible_automation.find((*i)) != has_visible_automation.end()) {
                        mitem->set_active(true);
                }
@@ -2168,6 +2064,7 @@ RouteTimeAxisView::processors_changed (RouteProcessorChange c)
                (*i)->valid = false;
        }
 
+       _subplugin_menu_map.clear ();
        subplugin_menu.items().clear ();
 
        _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
@@ -2228,14 +2125,19 @@ RouteTimeAxisView::update_rec_display ()
 }
 
 void
-RouteTimeAxisView::set_layer_display (LayerDisplay d)
+RouteTimeAxisView::set_layer_display (LayerDisplay d, bool apply_to_selection)
 {
-       if (_view) {
-               _view->set_layer_display (d);
+       if (apply_to_selection) {
+               _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_layer_display, _1, d, false));
+       } else {
+               
+               if (_view) {
+                       _view->set_layer_display (d);
+               }
+               
+               ensure_xml_node ();
+               xml_node->add_property (N_("layer-display"), enum_2_string (d));
        }
-
-       ensure_xml_node ();
-       xml_node->add_property (N_("layer-display"), enum_2_string (d));
 }
 
 LayerDisplay
@@ -2256,7 +2158,7 @@ RouteTimeAxisView::automation_child(Evoral::Parameter param)
 {
        AutomationTracks::iterator i = _automation_tracks.find(param);
        if (i != _automation_tracks.end()) {
-               return i->second->track;
+               return i->second;
        } else {
                return boost::shared_ptr<AutomationTimeAxisView>();
        }
@@ -2352,7 +2254,7 @@ RouteTimeAxisView::set_underlay_state()
                if (prop) {
                        PBD::ID id (prop->value());
 
-                       RouteTimeAxisView* v = _editor.get_route_view_by_id (id);
+                       RouteTimeAxisView* v = _editor.get_route_view_by_route_id (id);
 
                        if (v) {
                                add_underlay(v->view(), false);
@@ -2448,3 +2350,43 @@ RouteTimeAxisView::set_button_names ()
         }
        mute_button_label.set_text (_("m"));
 }
+
+Gtk::CheckMenuItem*
+RouteTimeAxisView::automation_child_menu_item (Evoral::Parameter param)
+{
+       ParameterMenuMap::iterator i = _main_automation_menu_map.find (param);
+       if (i != _main_automation_menu_map.end()) {
+               return i->second;
+       }
+       
+       i = _subplugin_menu_map.find (param);
+       if (i != _subplugin_menu_map.end()) {
+               return i->second;
+       }
+
+       return 0;
+}
+
+void
+RouteTimeAxisView::create_gain_automation_child (const Evoral::Parameter& param, bool show)
+{
+       boost::shared_ptr<AutomationControl> c = _route->gain_control();
+       if (!c) {
+               error << "Route has no gain automation, unable to add automation track view." << endmsg;
+               return;
+       }
+
+       gain_track.reset (new AutomationTimeAxisView (_session,
+                                                     _route, _route->amp(), c, param,
+                                                     _editor,
+                                                     *this,
+                                                     false,
+                                                     parent_canvas,
+                                                     _route->amp()->describe_parameter(param)));
+
+       if (_view) {
+               _view->foreach_regionview (sigc::mem_fun (*gain_track.get(), &TimeAxisView::add_ghost));
+       }
+       
+       add_automation_child (Evoral::Parameter(GainAutomation), gain_track, show);
+}