replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
[ardour.git] / gtk2_ardour / route_time_axis.cc
index b68e814fba131e48d508f6f13b5eeca0e45f903f..7614093e02af6c6056b9193c700b5f447141a77c 100644 (file)
 
 #include <sigc++/bind.h>
 
+#include <gtkmm/menu.h>
+#include <gtkmm/menuitem.h>
+#include <gtkmm/stock.h>
+
 #include "pbd/error.h"
 #include "pbd/stl_delete.h"
 #include "pbd/whitespace.h"
 #include "pbd/enumwriter.h"
 #include "pbd/stateful_diff_command.h"
 
-#include <gtkmm/menu.h>
-#include <gtkmm/menuitem.h>
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/bindable_button.h>
-#include <gtkmm2ext/utils.h>
+#include "evoral/Parameter.hpp"
 
 #include "ardour/amp.h"
 #include "ardour/meter.h"
 #include "ardour/event_type_map.h"
+#include "ardour/pannable.h"
+#include "ardour/panner.h"
+#include "ardour/plugin_insert.h"
 #include "ardour/processor.h"
 #include "ardour/profile.h"
 #include "ardour/route_group.h"
 #include "ardour/session.h"
 #include "ardour/session_playlists.h"
-
-#include "evoral/Parameter.hpp"
+#include "ardour/track.h"
 
 #include "canvas/debug.h"
 
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/utils.h"
+
+#include "widgets/ardour_button.h"
+#include "widgets/prompter.h"
+#include "widgets/tooltips.h"
+
 #include "ardour_ui.h"
-#include "ardour_button.h"
+#include "audio_streamview.h"
 #include "debug.h"
-#include "global_signals.h"
+#include "enums_convert.h"
 #include "route_time_axis.h"
 #include "automation_time_axis.h"
 #include "enums.h"
 #include "gui_thread.h"
+#include "item_counts.h"
 #include "keyboard.h"
+#include "paste_context.h"
+#include "patch_change_widget.h"
 #include "playlist_selector.h"
 #include "point_selection.h"
-#include "prompter.h"
 #include "public_editor.h"
 #include "region_view.h"
 #include "rgb_macros.h"
 #include "selection.h"
 #include "streamview.h"
+#include "ui_config.h"
 #include "utils.h"
 #include "route_group_menu.h"
 
-#include "ardour/track.h"
-
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
-using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
@@ -89,16 +98,13 @@ using namespace std;
 using std::list;
 
 RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas)
-       : AxisView(sess)
-       , RouteUI(sess)
-       , TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas)
+       : RouteUI(sess)
+       , StripableTimeAxisView(ed, sess, canvas)
        , _view (0)
-       , parent_canvas (canvas)
-       , no_redraw (false)
        , button_table (3, 3)
-       , route_group_button (_("G"))
-       , playlist_button (_("P"))
-       , automation_button (_("A"))
+       , route_group_button (S_("RTAV|G"))
+       , playlist_button (S_("RTAV|P"))
+       , automation_button (S_("RTAV|A"))
        , automation_action_menu (0)
        , plugins_submenu_item (0)
        , route_group_menu (0)
@@ -107,6 +113,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
        , color_mode_menu (0)
        , gm (sess, true, 75, 14)
        , _ignore_set_layer_display (false)
+       , pan_automation_item(NULL)
 {
        number_label.set_name("tracknumber label");
        number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
@@ -114,12 +121,24 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
        number_label.set_fallthrough_to_parent (true);
 
        sess->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::parameter_changed, this, _1), gui_context());
+       UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::parameter_changed));
+
+       parameter_changed ("editor-stereo-only-meters");
+}
+
+void
+RouteTimeAxisView::route_property_changed (const PBD::PropertyChange& what_changed)
+{
+       if (what_changed.contains (ARDOUR::Properties::name)) {
+               label_view ();
+       }
 }
 
 void
 RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 {
        RouteUI::set_route (rt);
+       StripableTimeAxisView::set_stripable (rt);
 
        CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for %1", rt->name()));
        CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for %1", rt->name()));
@@ -129,14 +148,14 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
                meter_width = 6;
        }
-       gm.set_controls (_route, _route->shared_peak_meter(), _route->amp());
+       gm.set_controls (_route, _route->shared_peak_meter(), _route->amp(), _route->gain_control());
        gm.get_level_meter().set_no_show_all();
        gm.get_level_meter().setup_meters(50, meter_width);
        gm.update_gain_sensitive ();
 
-       string str = gui_property ("height");
-       if (!str.empty()) {
-               set_height (atoi (str));
+       uint32_t height;
+       if (get_gui_property ("height", height)) {
+               set_height (height);
        } else {
                set_height (preset_height (HeightNormal));
        }
@@ -149,9 +168,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                set_gui_property ("visible", false);
        }
 
-       mute_changed (0);
-       update_solo_display ();
-
        timestretch_rect = 0;
        no_redraw = false;
 
@@ -161,9 +177,9 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        playlist_button.set_name ("route button");
        automation_button.set_name ("route button");
 
-       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));
+       route_group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false);
+       playlist_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click), false);
+       automation_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click), false);
 
        if (is_track()) {
 
@@ -173,16 +189,14 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                        controls_table.attach (*rec_enable_button, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
                }
 
-                if (is_midi_track()) {
-                        ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record (Right-click for Step Edit)"));
+               if (is_midi_track()) {
+                       set_tooltip(*rec_enable_button, _("Record (Right-click for Step Edit)"));
                        gm.set_fader_name ("MidiTrackFader");
-                } else {
-                        ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record"));
+               } else {
+                       set_tooltip(*rec_enable_button, _("Record"));
                        gm.set_fader_name ("AudioTrackFader");
-                }
+               }
 
-               rec_enable_button->set_sensitive (_session->writable());
-               
                /* set playlist button tip to the current playlist, and make it update when it changes */
                update_playlist_tip ();
                track()->PlaylistChanged.connect (*this, invalidator (*this), ui_bind(&RouteTimeAxisView::update_playlist_tip, this), gui_context());
@@ -205,6 +219,10 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                controls_meters_size_group->add_widget (gm.get_level_meter());
        }
 
+       if (_route->is_master()) {
+               route_group_button.set_sensitive(false);
+       }
+
        _route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context());
        _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
        _route->output()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
@@ -244,10 +262,10 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                controls_table.attach (route_group_button, 4, 5, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
                controls_table.attach (gm.get_gain_slider(), 0, 2, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 1, 0);
        }
-       
-       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"));
+
+       set_tooltip(*solo_button,_("Solo"));
+       set_tooltip(*mute_button,_("Mute"));
+       set_tooltip(route_group_button, _("Route Group"));
 
        mute_button->set_tweaks(ArdourButton::TrackHeader);
        solo_button->set_tweaks(ArdourButton::TrackHeader);
@@ -257,9 +275,9 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        route_group_button.set_tweaks(ArdourButton::TrackHeader);
 
        if (is_midi_track()) {
-               ARDOUR_UI::instance()->set_tip(automation_button, _("MIDI Controllers and Automation"));
+               set_tooltip(automation_button, _("MIDI Controllers and Automation"));
        } else {
-               ARDOUR_UI::instance()->set_tip(automation_button, _("Automation"));
+               set_tooltip(automation_button, _("Automation"));
        }
 
        update_track_number_visibility();
@@ -284,13 +302,12 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        _y_position = -1;
 
        _route->processors_changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::processors_changed, this, _1), gui_context());
-       _route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::route_property_changed, this, _1), gui_context());
 
        if (is_track()) {
 
-               str = gui_property ("layer-display");
-               if (!str.empty()) {
-                       set_layer_display (LayerDisplay (string_2_enum (str, _view->layer_display ())));
+               LayerDisplay layer_display;
+               if (get_gui_property ("layer-display", layer_display)) {
+                       set_layer_display (layer_display);
                }
 
                track()->FreezeChange.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::map_frozen, this), gui_context());
@@ -299,15 +316,14 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                /* pick up the correct freeze state */
                map_frozen ();
 
-       } 
+       }
 
-       _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_pixel));
-       ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler));
+       UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler));
 
        PropertyList* plist = new PropertyList();
 
-       plist->add (ARDOUR::Properties::mute, true);
-       plist->add (ARDOUR::Properties::solo, true);
+       plist->add (ARDOUR::Properties::group_mute, true);
+       plist->add (ARDOUR::Properties::group_solo, true);
 
        route_group_menu = new RouteGroupMenu (_session, plist);
 
@@ -316,7 +332,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
 RouteTimeAxisView::~RouteTimeAxisView ()
 {
-       CatchDeletion (this);
+       cleanup_gui_properties ();
 
        for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
                delete *i;
@@ -331,6 +347,16 @@ RouteTimeAxisView::~RouteTimeAxisView ()
        _automation_tracks.clear ();
 
        delete route_group_menu;
+       CatchDeletion (this);
+}
+
+string
+RouteTimeAxisView::name() const
+{
+       if (_route) {
+               return _route->name();
+       }
+       return string();
 }
 
 void
@@ -355,7 +381,7 @@ RouteTimeAxisView::setup_processor_menu_and_curves ()
        _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
 }
 
-gint
+bool
 RouteTimeAxisView::route_group_click (GdkEventButton *ev)
 {
        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
@@ -369,9 +395,15 @@ RouteTimeAxisView::route_group_click (GdkEventButton *ev)
        r.push_back (route ());
 
        route_group_menu->build (r);
-       route_group_menu->menu()->popup (ev->button, ev->time);
+       if (ev->button == 1) {
+               Gtkmm2ext::anchored_menu_popup(route_group_menu->menu(),
+                                              &route_group_button,
+                                              "", 1, ev->time);
+       } else {
+               route_group_menu->menu()->popup (ev->button, ev->time);
+       }
 
-       return false;
+       return true;
 }
 
 void
@@ -391,7 +423,7 @@ RouteTimeAxisView::label_view ()
        if (track_number == 0) {
                number_label.set_text ("");
        } else {
-               number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
+               number_label.set_text (PBD::to_string (abs(_route->track_number ())));
        }
 }
 
@@ -421,10 +453,8 @@ RouteTimeAxisView::update_track_number_visibility ()
                if (tnw & 1) --tnw;
                number_label.set_size_request(tnw, -1);
                number_label.show ();
-               name_hbox.set_size_request(TimeAxisView::name_width_px - 2 - tnw, -1); // -2 = cellspacing
        } else {
                number_label.hide ();
-               name_hbox.set_size_request(TimeAxisView::name_width_px, -1);
        }
 }
 
@@ -433,14 +463,12 @@ RouteTimeAxisView::parameter_changed (string const & p)
 {
        if (p == "track-name-number") {
                update_track_number_visibility();
-       }
-}
-
-void
-RouteTimeAxisView::route_property_changed (const PropertyChange& what_changed)
-{
-       if (what_changed.contains (ARDOUR::Properties::name)) {
-               label_view ();
+       } else if (p == "editor-stereo-only-meters") {
+               if (UIConfiguration::instance().get_editor_stereo_only_meters()) {
+                       gm.get_level_meter().set_max_audio_meter_count (2);
+               } else {
+                       gm.get_level_meter().set_max_audio_meter_count (0);
+               }
        }
 }
 
@@ -452,20 +480,32 @@ RouteTimeAxisView::take_name_changed (void *src)
        }
 }
 
-void
-RouteTimeAxisView::playlist_click ()
+bool
+RouteTimeAxisView::playlist_click (GdkEventButton *ev)
 {
-       build_playlist_menu ();
+       if (ev->button != 1) {
+               return true;
+       }
+
+       build_playlist_menu ();
        conditionally_add_to_selection ();
-       playlist_action_menu->popup (1, gtk_get_current_event_time());
+       Gtkmm2ext::anchored_menu_popup(playlist_action_menu, &playlist_button,
+                                      "", 1, ev->time);
+       return true;
 }
 
-void
-RouteTimeAxisView::automation_click ()
+bool
+RouteTimeAxisView::automation_click (GdkEventButton *ev)
 {
+       if (ev->button != 1) {
+               return true;
+       }
+
        conditionally_add_to_selection ();
        build_automation_action_menu (false);
-       automation_action_menu->popup (1, gtk_get_current_event_time());
+       Gtkmm2ext::anchored_menu_popup(automation_action_menu, &automation_button,
+                                      "", 1, ev->time);
+       return true;
 }
 
 void
@@ -488,22 +528,65 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection)
        automation_action_menu->set_name ("ArdourContextMenu");
 
        items.push_back (MenuElem (_("Show All Automation"),
-                                  sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::show_all_automation), for_selection)));
+                                  sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::show_all_automation), for_selection)));
 
        items.push_back (MenuElem (_("Show Existing Automation"),
-                                  sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::show_existing_automation), for_selection)));
+                                  sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::show_existing_automation), for_selection)));
 
        items.push_back (MenuElem (_("Hide All Automation"),
-                                  sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::hide_all_automation), for_selection)));
+                                  sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::hide_all_automation), for_selection)));
 
        /* Attach the plugin submenu. It may have previously been used elsewhere,
-          so it was detached above 
+          so it was detached above
        */
-       
+
+       bool single_track_selected = (!for_selection || _editor.get_selection().tracks.size() == 1);
+
        if (!subplugin_menu.items().empty()) {
                items.push_back (SeparatorElem ());
                items.push_back (MenuElem (_("Processor automation"), subplugin_menu));
-               items.back().set_sensitive (!for_selection || _editor.get_selection().tracks.size() == 1);;
+               items.back().set_sensitive (single_track_selected);
+       }
+
+       /* Add any route automation */
+
+       if (gain_track) {
+               items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &RouteTimeAxisView::update_gain_track_visibility)));
+               gain_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
+               gain_automation_item->set_active (single_track_selected &&
+                                                 string_to<bool>(gain_track->gui_property ("visible")));
+
+               _main_automation_menu_map[Evoral::Parameter(GainAutomation)] = gain_automation_item;
+       }
+
+       if (trim_track) {
+               items.push_back (CheckMenuElem (_("Trim"), sigc::mem_fun (*this, &RouteTimeAxisView::update_trim_track_visibility)));
+               trim_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
+               trim_automation_item->set_active (single_track_selected &&
+                                                 string_to<bool>(trim_track->gui_property ("visible")));
+
+               _main_automation_menu_map[Evoral::Parameter(TrimAutomation)] = trim_automation_item;
+       }
+
+       if (mute_track) {
+               items.push_back (CheckMenuElem (_("Mute"), sigc::mem_fun (*this, &RouteTimeAxisView::update_mute_track_visibility)));
+               mute_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
+               mute_automation_item->set_active (single_track_selected &&
+                                                 string_to<bool>(mute_track->gui_property ("visible")));
+
+               _main_automation_menu_map[Evoral::Parameter(MuteAutomation)] = mute_automation_item;
+       }
+
+       if (!pan_tracks.empty() && !ARDOUR::Profile->get_mixbus()) {
+               items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &RouteTimeAxisView::update_pan_track_visibility)));
+               pan_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
+               pan_automation_item->set_active (single_track_selected &&
+                                                string_to<bool>(pan_tracks.front()->gui_property ("visible")));
+
+               set<Evoral::Parameter> const & params = _route->pannable()->what_can_be_automated ();
+               for (set<Evoral::Parameter>::const_iterator p = params.begin(); p != params.end(); ++p) {
+                       _main_automation_menu_map[*p] = pan_automation_item;
+               }
        }
 }
 
@@ -536,15 +619,8 @@ RouteTimeAxisView::build_display_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)));
-               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 ();
 
@@ -560,21 +636,27 @@ RouteTimeAxisView::build_display_menu ()
 
                int overlaid = 0;
                int stacked = 0;
+               int unchangeable = 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;
                        }
 
-                       switch (v->layer_display ()) {
-                       case Overlaid:
-                               ++overlaid;
-                               break;
-                       case Stacked:
-                       case Expanded:
-                               ++stacked;
-                               break;
+                       if (v->can_change_layer_display()) {
+                               switch (v->layer_display ()) {
+                               case Overlaid:
+                                       ++overlaid;
+                                       break;
+                               case Stacked:
+                               case Expanded:
+                                       ++stacked;
+                                       break;
+                               }
+                       } else {
+                               unchangeable++;
                        }
                }
 
@@ -585,177 +667,129 @@ RouteTimeAxisView::build_display_menu ()
                */
 
                _ignore_set_layer_display = true;
-               
+
                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));
 
+               if (unchangeable) {
+                       i->set_sensitive (false);
+               }
+
                layers_items.push_back (RadioMenuElem (layers_group, _("Stacked")));
                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), Stacked, true));
-               
+
+               if (unchangeable) {
+                       i->set_sensitive (false);
+               }
+
                _ignore_set_layer_display = false;
 
                items.push_back (MenuElem (_("Layers"), *layers_menu));
 
-               if (!Profile->get_sae()) {
+               Menu* alignment_menu = manage (new Menu);
+               MenuList& alignment_items = alignment_menu->items();
+               alignment_menu->set_name ("ArdourContextMenu");
 
-                       Menu* alignment_menu = manage (new Menu);
-                       MenuList& alignment_items = alignment_menu->items();
-                       alignment_menu->set_name ("ArdourContextMenu");
+               RadioMenuItem::Group align_group;
 
-                       RadioMenuItem::Group align_group;
+               /* Same verbose hacks as for the layering options above */
 
-                       /* Same verbose hacks as for the layering options above */
+               int existing = 0;
+               int capture = 0;
+               int automatic = 0;
+               int styles = 0;
+               boost::shared_ptr<Track> first_track;
 
-                       int existing = 0;
-                       int capture = 0;
-                        int automatic = 0;
-                        int styles = 0;
-                        boost::shared_ptr<Track> first_track;
-
-                       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;
-                               }
+               for (TrackSelection::const_iterator t = s.begin(); t != s.end(); ++t) {
+                       RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*t);
+                       if (!r || !r->is_track ()) {
+                               continue;
+                       }
 
-                                if (!first_track) {
-                                        first_track = r->track();
-                                }
-
-                                switch (r->track()->alignment_choice()) {
-                                case Automatic:
-                                        ++automatic;
-                                        styles |= 0x1;
-                                        switch (r->track()->alignment_style()) {
-                                        case ExistingMaterial:
-                                                ++existing;
-                                                break;
-                                        case CaptureTime:
-                                                ++capture;
-                                                break;
-                                        }
-                                        break;
-                                case UseExistingMaterial:
-                                        ++existing;
-                                        styles |= 0x2;
-                                        break;
-                                case UseCaptureTime:
-                                        ++capture;
-                                        styles |= 0x4;
-                                        break;
-                                }
+                       if (!first_track) {
+                               first_track = r->track();
                        }
 
-                        bool inconsistent;
-                        switch (styles) {
-                        case 1:
-                        case 2:
-                        case 4:
-                                inconsistent = false;
-                                break;
-                        default:
-                                inconsistent = true;
-                                break;
-                        }
-
-                        RadioMenuItem* i;
-
-                        if (!inconsistent && first_track) {
-
-                                alignment_items.push_back (RadioMenuElem (align_group, _("Automatic (based on I/O connections)")));
-                                i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
-                                i->set_active (automatic != 0 && existing == 0 && capture == 0);
-                                i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, Automatic, true));
-
-                                switch (first_track->alignment_choice()) {
-                                case Automatic:
-                                        switch (first_track->alignment_style()) {
-                                        case ExistingMaterial:
-                                                alignment_items.push_back (MenuElem (_("(Currently: Existing Material)")));
-                                                break;
-                                        case CaptureTime:
-                                                alignment_items.push_back (MenuElem (_("(Currently: Capture Time)")));
-                                                break;
-                                        }
-                                        break;
-                                default:
-                                        break;
-                                }
-
-                                alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material")));
-                                i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
-                                i->set_active (existing != 0 && capture == 0 && automatic == 0);
-                                i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseExistingMaterial, true));
-
-                                alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time")));
-                                i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
-                                i->set_active (existing == 0 && capture != 0 && automatic == 0);
-                                i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseCaptureTime, true));
-
-                                items.push_back (MenuElem (_("Alignment"), *alignment_menu));
-
-                        } else {
-                                /* show nothing */
-                        }
-
-                       Menu* mode_menu = manage (new Menu);
-                       MenuList& mode_items = mode_menu->items ();
-                       mode_menu->set_name ("ArdourContextMenu");
-
-                       RadioMenuItem::Group mode_group;
-
-                       int normal = 0;
-                       int tape = 0;
-                       int non_layered = 0;
-
-                       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_choice()) {
+                       case Automatic:
+                               ++automatic;
+                               styles |= 0x1;
+                               switch (r->track()->alignment_style()) {
+                               case ExistingMaterial:
+                                       ++existing;
+                                       break;
+                               case CaptureTime:
+                                       ++capture;
+                                       break;
                                }
+                               break;
+                       case UseExistingMaterial:
+                               ++existing;
+                               styles |= 0x2;
+                               break;
+                       case UseCaptureTime:
+                               ++capture;
+                               styles |= 0x4;
+                               break;
+                       }
+               }
 
-                               switch (r->track()->mode()) {
-                               case Normal:
-                                       ++normal;
-                                       break;
-                               case Destructive:
-                                       ++tape;
+               bool inconsistent;
+               switch (styles) {
+               case 1:
+               case 2:
+               case 4:
+                       inconsistent = false;
+                       break;
+               default:
+                       inconsistent = true;
+                       break;
+               }
+
+               if (!inconsistent && first_track) {
+
+                       alignment_items.push_back (RadioMenuElem (align_group, _("Automatic (based on I/O connections)")));
+                       i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
+                       i->set_active (automatic != 0 && existing == 0 && capture == 0);
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, Automatic, true));
+
+                       switch (first_track->alignment_choice()) {
+                       case Automatic:
+                               switch (first_track->alignment_style()) {
+                               case ExistingMaterial:
+                                       alignment_items.push_back (MenuElem (_("(Currently: Existing Material)")));
                                        break;
-                               case NonLayered:
-                                       ++non_layered;
+                               case CaptureTime:
+                                       alignment_items.push_back (MenuElem (_("(Currently: Capture Time)")));
                                        break;
                                }
+                               break;
+                       default:
+                               break;
                        }
 
-                       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));
+                       alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material")));
+                       i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
+                       i->set_active (existing != 0 && capture == 0 && automatic == 0);
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseExistingMaterial, true));
 
-                       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));
+                       alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time")));
+                       i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
+                       i->set_active (existing == 0 && capture != 0 && automatic == 0);
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseCaptureTime, true));
 
-                       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 (_("Alignment"), *alignment_menu));
 
-                       items.push_back (MenuElem (_("Mode"), *mode_menu));
+               } else {
+                       /* show nothing */
                }
 
-
                items.push_back (SeparatorElem());
 
                build_playlist_menu ();
@@ -763,8 +797,15 @@ RouteTimeAxisView::build_display_menu ()
                items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1);
        }
 
+       if (!is_midi_track () && _route->the_instrument ()) {
+               /* MIDI Bus */
+               items.push_back (MenuElem (_("Patch Selector..."),
+                                       sigc::mem_fun(*this, &RouteUI::select_midi_patch)));
+               items.push_back (SeparatorElem());
+       }
+
        route_group_menu->detach ();
-       
+
        WeakRouteList r;
        for (TrackSelection::iterator i = _editor.get_selection().tracks.begin(); i != _editor.get_selection().tracks.end(); ++i) {
                RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
@@ -772,19 +813,21 @@ RouteTimeAxisView::build_display_menu ()
                        r.push_back (rtv->route ());
                }
        }
-       
+
        if (r.empty ()) {
                r.push_back (route ());
        }
 
-       route_group_menu->build (r);
-       items.push_back (MenuElem (_("Group"), *route_group_menu->menu ()));
-       
+       if (!_route->is_master()) {
+               route_group_menu->build (r);
+               items.push_back (MenuElem (_("Group"), *route_group_menu->menu ()));
+       }
+
        build_automation_action_menu (true);
        items.push_back (MenuElem (_("Automation"), *automation_action_menu));
-       
+
        items.push_back (SeparatorElem());
-       
+
        int active = 0;
        int inactive = 0;
        TrackSelection const & s = _editor.get_selection().tracks;
@@ -815,40 +858,16 @@ RouteTimeAxisView::build_display_menu ()
 
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Hide"), sigc::bind (sigc::mem_fun(_editor, &PublicEditor::hide_track_in_display), this, true)));
-       if (!Profile->get_sae()) {
-               items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), true)));
-       } else {
-               items.push_front (SeparatorElem());
-               items.push_front (MenuElem (_("Delete"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), true)));
-       }
-}
-
-void
-RouteTimeAxisView::set_track_mode (TrackMode mode, bool apply_to_selection)
-{
-       if (apply_to_selection) {
-               _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_track_mode, _1, mode, false));
-       } else {
-
-               bool needs_bounce = false;
-
-               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);
+       if (_route && !_route->is_master()) {
+               items.push_back (SeparatorElem());
+               items.push_back (MenuElem (_("Duplicate..."), boost::bind (&ARDOUR_UI::start_duplicate_routes, ARDOUR_UI::instance())));
        }
+       items.push_back (SeparatorElem());
+       items.push_back (MenuElem (_("Remove"), sigc::mem_fun(_editor, &PublicEditor::remove_tracks)));
 }
 
 void
-RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layers, int layer)
+RouteTimeAxisView::show_timestretch (samplepos_t start, samplepos_t end, int layers, int layer)
 {
        TimeAxisView::show_timestretch (start, end, layers, layer);
 
@@ -878,8 +897,8 @@ RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layer
 
        if (timestretch_rect == 0) {
                timestretch_rect = new ArdourCanvas::Rectangle (canvas_display ());
-               timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_TimeStretchFill());
-               timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_TimeStretchOutline());
+               timestretch_rect->set_fill_color (Gtkmm2ext::HSV (UIConfiguration::instance().color ("time stretch fill")).mod (UIConfiguration::instance().modifier ("time stretch fill")).color());
+               timestretch_rect->set_outline_color (UIConfiguration::instance().color ("time stretch outline"));
        }
 
        timestretch_rect->show ();
@@ -923,7 +942,7 @@ RouteTimeAxisView::show_selection (TimeSelection& ts)
 }
 
 void
-RouteTimeAxisView::set_height (uint32_t h)
+RouteTimeAxisView::set_height (uint32_t h, TrackHeightMode m)
 {
        int gmlen = h - 9;
        bool height_changed = (height == 0) || (h != height);
@@ -934,7 +953,7 @@ RouteTimeAxisView::set_height (uint32_t h)
        }
        gm.get_level_meter().setup_meters (gmlen, meter_width);
 
-       TimeAxisView::set_height (h);
+       TimeAxisView::set_height (h, m);
 
        if (_view) {
                _view->set_height ((double) current_height());
@@ -993,44 +1012,32 @@ RouteTimeAxisView::set_height (uint32_t h)
 void
 RouteTimeAxisView::route_color_changed ()
 {
+       using namespace ARDOUR_UI_UTILS;
        if (_view) {
                _view->apply_color (color(), StreamView::RegionColor);
        }
-
        number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
 }
 
-void
-RouteTimeAxisView::reset_samples_per_pixel ()
-{
-       set_samples_per_pixel (_editor.get_current_zoom());
-}
-
 void
 RouteTimeAxisView::set_samples_per_pixel (double fpp)
 {
-       double speed = 1.0;
-
-       if (track()) {
-               speed = track()->speed();
-       }
-
        if (_view) {
-               _view->set_samples_per_pixel (fpp * speed);
+               _view->set_samples_per_pixel (fpp);
        }
 
-       TimeAxisView::set_samples_per_pixel (fpp * speed);
+       StripableTimeAxisView::set_samples_per_pixel (fpp);
 }
 
 void
 RouteTimeAxisView::set_align_choice (RadioMenuItem* mitem, AlignChoice choice, bool apply_to_selection)
 {
-        if (!mitem->get_active()) {
-                /* this is one of the two calls made when these radio menu items change status. this one
-                   is for the item that became inactive, and we want to ignore it.
-                */
-                return;
-        }
+       if (!mitem->get_active()) {
+               /* this is one of the two calls made when these radio menu items change status. this one
+                        is for the item that became inactive, and we want to ignore it.
+                        */
+               return;
+       }
 
        if (apply_to_selection) {
                _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_align_choice, _1, mitem, choice, false));
@@ -1044,7 +1051,7 @@ RouteTimeAxisView::set_align_choice (RadioMenuItem* mitem, AlignChoice choice, b
 void
 RouteTimeAxisView::rename_current_playlist ()
 {
-       ArdourPrompter prompter (true);
+       Prompter prompter (true);
        string name;
 
        boost::shared_ptr<Track> tr = track();
@@ -1059,20 +1066,25 @@ RouteTimeAxisView::rename_current_playlist ()
 
        prompter.set_title (_("Rename Playlist"));
        prompter.set_prompt (_("New name for playlist:"));
-       prompter.set_initial_text (pl->name());
        prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
+       prompter.set_initial_text (pl->name());
        prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
 
-       switch (prompter.run ()) {
-       case Gtk::RESPONSE_ACCEPT:
+       while (true) {
+               if (prompter.run () != Gtk::RESPONSE_ACCEPT) {
+                       break;
+               }
                prompter.get_result (name);
                if (name.length()) {
-                       pl->set_name (name);
+                       if (_session->playlists->by_name (name)) {
+                               MessageDialog msg (_("Given playlist name is not unique."));
+                               msg.run ();
+                               prompter.set_initial_text (Playlist::bump_name (name, *_session));
+                       } else {
+                               pl->set_name (name);
+                               break;
+                       }
                }
-               break;
-
-       default:
-               break;
        }
 }
 
@@ -1112,7 +1124,7 @@ RouteTimeAxisView::resolve_new_group_playlist_name(std::string &basename, vector
 }
 
 void
-RouteTimeAxisView::use_copy_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > const & playlists_before_op)
+RouteTimeAxisView::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > const & playlists_before_op, bool copy)
 {
        string name;
 
@@ -1128,92 +1140,55 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vector<boost::shared_ptr<Play
 
        name = pl->name();
 
-       if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
-               name = resolve_new_group_playlist_name(name, playlists_before_op);
+       if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::group_select.property_id)) {
+               name = resolve_new_group_playlist_name(name,playlists_before_op);
        }
 
        while (_session->playlists->by_name(name)) {
                name = Playlist::bump_name (name, *_session);
        }
 
-       // TODO: The prompter "new" button should be de-activated if the user
-       // specifies a playlist name which already exists in the session.
-
        if (prompt) {
+               // TODO: The prompter "new" button should be de-activated if the user
+               // specifies a playlist name which already exists in the session.
 
-               ArdourPrompter prompter (true);
+               Prompter prompter (true);
 
-               prompter.set_title (_("New Copy Playlist"));
-               prompter.set_prompt (_("Name for new playlist:"));
+               if (copy) {
+                       prompter.set_title (_("New Copy Playlist"));
+                       prompter.set_prompt (_("Name for playlist copy:"));
+               } else {
+                       prompter.set_title (_("New Playlist"));
+                       prompter.set_prompt (_("Name for new playlist:"));
+               }
                prompter.set_initial_text (name);
                prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
                prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true);
                prompter.show_all ();
 
-               switch (prompter.run ()) {
-               case Gtk::RESPONSE_ACCEPT:
+               while (true) {
+                       if (prompter.run () != Gtk::RESPONSE_ACCEPT) {
+                               return;
+                       }
                        prompter.get_result (name);
-                       break;
-
-               default:
-                       return;
+                       if (name.length()) {
+                               if (_session->playlists->by_name (name)) {
+                                       MessageDialog msg (_("Given playlist name is not unique."));
+                                       msg.run ();
+                                       prompter.set_initial_text (Playlist::bump_name (name, *_session));
+                               } else {
+                                       break;
+                               }
+                       }
                }
        }
 
        if (name.length()) {
-               tr->use_copy_playlist ();
-               tr->playlist()->set_name (name);
-       }
-}
-
-void
-RouteTimeAxisView::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > const & playlists_before_op)
-{
-       string name;
-
-       boost::shared_ptr<Track> tr = track ();
-       if (!tr || tr->destructive()) {
-               return;
-       }
-
-       boost::shared_ptr<const Playlist> pl = tr->playlist();
-       if (!pl) {
-               return;
-       }
-
-       name = pl->name();
-
-       if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
-               name = resolve_new_group_playlist_name(name,playlists_before_op);
-       }
-
-       while (_session->playlists->by_name(name)) {
-               name = Playlist::bump_name (name, *_session);
-       }
-
-
-       if (prompt) {
-
-               ArdourPrompter prompter (true);
-
-               prompter.set_title (_("New Playlist"));
-               prompter.set_prompt (_("Name for new playlist:"));
-               prompter.set_initial_text (name);
-               prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
-               prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true);
-
-               switch (prompter.run ()) {
-               case Gtk::RESPONSE_ACCEPT:
-                       prompter.get_result (name);
-                       break;
-
-               default:
-                       return;
+               if (copy) {
+                       tr->use_copy_playlist ();
+               } else {
+                       tr->use_default_new_playlist ();
                }
-       }
-
-       if (name.length()) {
-               tr->use_new_playlist ();
                tr->playlist()->set_name (name);
        }
 }
@@ -1256,15 +1231,22 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev)
        if (Keyboard::modifier_state_equals (ev->state, (Keyboard::TertiaryModifier|Keyboard::PrimaryModifier))) {
 
                /* special case: select/deselect all tracks */
+
+               _editor.begin_reversible_selection_op (X_("Selection Click"));
+
                if (_editor.get_selection().selected (this)) {
                        _editor.get_selection().clear_tracks ();
                } else {
                        _editor.select_all_tracks ();
                }
 
+               _editor.commit_reversible_selection_op ();
+
                return;
        }
 
+       _editor.begin_reversible_selection_op (X_("Selection Click"));
+
        switch (ArdourKeyboard::selection_type (ev->state)) {
        case Selection::Toggle:
                _editor.get_selection().toggle (this);
@@ -1282,13 +1264,19 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev)
                _editor.get_selection().add (this);
                break;
        }
+
+       _editor.commit_reversible_selection_op ();
+
+       _editor.set_selected_mixer_strip (*this);
 }
 
 void
 RouteTimeAxisView::set_selected_points (PointSelection& points)
 {
-       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-               (*i)->set_selected_points (points);
+       StripableTimeAxisView::set_selected_points (points);
+       AudioStreamView* asv = dynamic_cast<AudioStreamView*>(_view);
+       if (asv) {
+               asv->set_selected_points (points);
        }
 }
 
@@ -1304,26 +1292,16 @@ RouteTimeAxisView::set_selected_regionviews (RegionSelection& regions)
  * @param results List to add things to.
  */
 void
-RouteTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list<Selectable*>& results)
+RouteTimeAxisView::get_selectables (samplepos_t start, samplepos_t end, double top, double bot, list<Selectable*>& results, bool within)
 {
-       double speed = 1.0;
-
-       if (track() != 0) {
-               speed = track()->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);
+               _view->get_selectables (start, end, top, bot, results, within);
        }
 
        /* pick up visible automation tracks */
-
        for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                if (!(*i)->hidden()) {
-                       (*i)->get_selectables (start_adjusted, end_adjusted, top, bot, results);
+                       (*i)->get_selectables (start, end, top, bot, results, within);
                }
        }
 }
@@ -1334,14 +1312,7 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>&
        if (_view) {
                _view->get_inverted_selectables (sel, results);
        }
-
-       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-               if (!(*i)->hidden()) {
-                       (*i)->get_inverted_selectables (sel, results);
-               }
-       }
-
-       return;
+       StripableTimeAxisView::get_inverted_selectables (sel, results);
 }
 
 RouteGroup*
@@ -1350,12 +1321,6 @@ RouteTimeAxisView::route_group () const
        return _route->route_group();
 }
 
-string
-RouteTimeAxisView::name() const
-{
-       return _route->name();
-}
-
 boost::shared_ptr<Playlist>
 RouteTimeAxisView::playlist () const
 {
@@ -1368,37 +1333,34 @@ RouteTimeAxisView::playlist () const
        }
 }
 
-void
-RouteTimeAxisView::name_entry_changed ()
+bool
+RouteTimeAxisView::name_entry_changed (string const& str)
 {
-       TimeAxisView::name_entry_changed ();
-
-       string x = name_entry->get_text ();
-
-       if (x == _route->name()) {
-               return;
+       if (str == _route->name()) {
+               return true;
        }
 
+       string x = str;
+
        strip_whitespace_edges (x);
 
-       if (x.length() == 0) {
-               name_entry->set_text (_route->name());
-               return;
+       if (x.empty()) {
+               return false;
        }
 
        if (_session->route_name_internal (x)) {
-               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->grab_focus ();
+               ARDOUR_UI::instance()->popup_error (string_compose (_("The name \"%1\" is reserved for %2"), x, PROGRAM_NAME));
+               return false;
        } else if (RouteUI::verify_new_route_name (x)) {
                _route->set_name (x);
-       } else {
-               name_entry->grab_focus ();
+               return true;
        }
+
+       return false;
 }
 
 boost::shared_ptr<Region>
-RouteTimeAxisView::find_next_region (framepos_t pos, RegionPoint point, int32_t dir)
+RouteTimeAxisView::find_next_region (samplepos_t pos, RegionPoint point, int32_t dir)
 {
        boost::shared_ptr<Playlist> pl = playlist ();
 
@@ -1409,8 +1371,8 @@ RouteTimeAxisView::find_next_region (framepos_t pos, RegionPoint point, int32_t
        return boost::shared_ptr<Region> ();
 }
 
-framepos_t
-RouteTimeAxisView::find_next_region_boundary (framepos_t pos, int32_t dir)
+samplepos_t
+RouteTimeAxisView::find_next_region_boundary (samplepos_t pos, int32_t dir)
 {
        boost::shared_ptr<Playlist> pl = playlist ();
 
@@ -1436,16 +1398,9 @@ RouteTimeAxisView::fade_range (TimeSelection& selection)
        playlist = tr->playlist();
 
        TimeSelection time (selection);
-       float const speed = tr->speed();
-       if (speed != 1.0f) {
-               for (TimeSelection::iterator i = time.begin(); i != time.end(); ++i) {
-                       (*i).start = session_frame_to_track_frame((*i).start, speed);
-                       (*i).end   = session_frame_to_track_frame((*i).end,   speed);
-               }
-       }
 
-        playlist->clear_changes ();
-        playlist->clear_owned_changes ();
+       playlist->clear_changes ();
+       playlist->clear_owned_changes ();
 
        playlist->fade_range (time);
 
@@ -1471,44 +1426,39 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
        playlist = tr->playlist();
 
        TimeSelection time (selection.time);
-       float const speed = tr->speed();
-       if (speed != 1.0f) {
-               for (TimeSelection::iterator i = time.begin(); i != time.end(); ++i) {
-                       (*i).start = session_frame_to_track_frame((*i).start, speed);
-                       (*i).end   = session_frame_to_track_frame((*i).end,   speed);
-               }
-       }
 
-        playlist->clear_changes ();
-        playlist->clear_owned_changes ();
+       playlist->clear_changes ();
+       playlist->clear_owned_changes ();
 
        switch (op) {
        case Delete:
                if (playlist->cut (time) != 0) {
-                       if (Config->get_edit_mode() == Ripple)
+                       if (Config->get_edit_mode() == Ripple) {
                                playlist->ripple(time.start(), -time.length(), NULL);
-                               // no need to exclude any regions from rippling here
+                       }
+                       // no need to exclude any regions from rippling here
+
+                       vector<Command*> cmds;
+                       playlist->rdiff (cmds);
+                       _session->add_commands (cmds);
 
-                        vector<Command*> cmds;
-                        playlist->rdiff (cmds);
-                        _session->add_commands (cmds);
-                       
-                        _session->add_command (new StatefulDiffCommand (playlist));
+                       _session->add_command (new StatefulDiffCommand (playlist));
                }
                break;
-               
+
        case Cut:
                if ((what_we_got = playlist->cut (time)) != 0) {
                        _editor.get_cut_buffer().add (what_we_got);
-                       if (Config->get_edit_mode() == Ripple)
+                       if (Config->get_edit_mode() == Ripple) {
                                playlist->ripple(time.start(), -time.length(), NULL);
-                               // no need to exclude any regions from rippling here
+                       }
+                       // no need to exclude any regions from rippling here
 
-                        vector<Command*> cmds;
-                        playlist->rdiff (cmds);
-                        _session->add_commands (cmds);
+                       vector<Command*> cmds;
+                       playlist->rdiff (cmds);
+                       _session->add_commands (cmds);
 
-                        _session->add_command (new StatefulDiffCommand (playlist));
+                       _session->add_command (new StatefulDiffCommand (playlist));
                }
                break;
        case Copy:
@@ -1519,14 +1469,15 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 
        case Clear:
                if ((what_we_got = playlist->cut (time)) != 0) {
-                       if (Config->get_edit_mode() == Ripple)
+                       if (Config->get_edit_mode() == Ripple) {
                                playlist->ripple(time.start(), -time.length(), NULL);
-                               // no need to exclude any regions from rippling here
+                       }
+                       // no need to exclude any regions from rippling here
 
-                        vector<Command*> cmds;
-                        playlist->rdiff (cmds);
+                       vector<Command*> cmds;
+                       playlist->rdiff (cmds);
                        _session->add_commands (cmds);
-                        _session->add_command (new StatefulDiffCommand (playlist));
+                       _session->add_command (new StatefulDiffCommand (playlist));
                        what_we_got->release ();
                }
                break;
@@ -1534,35 +1485,36 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 }
 
 bool
-RouteTimeAxisView::paste (framepos_t pos, float times, Selection& selection, size_t nth)
+RouteTimeAxisView::paste (samplepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num)
 {
        if (!is_track()) {
                return false;
        }
 
-       boost::shared_ptr<Playlist> pl = playlist ();
-       PlaylistSelection::iterator p;
-
-       for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth) {}
+       boost::shared_ptr<Playlist>       pl   = playlist ();
+       const ARDOUR::DataType            type = pl->data_type();
+       PlaylistSelection::const_iterator p    = selection.playlists.get_nth(type, ctx.counts.n_playlists(type));
 
        if (p == selection.playlists.end()) {
                return false;
        }
+       ctx.counts.increase_n_playlists(type);
 
-        DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("paste to %1\n", pos));
+       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));
-       }
+       /* add multi-paste offset if applicable */
+       std::pair<samplepos_t, samplepos_t> extent   = (*p)->get_extent();
+       const samplecnt_t                  duration = extent.second - extent.first;
+       pos += _editor.get_paste_offset(pos, ctx.count, duration);
 
        pl->clear_changes ();
+       pl->clear_owned_changes ();
        if (Config->get_edit_mode() == Ripple) {
-               std::pair<framepos_t, framepos_t> extent = (*p)->get_extent_with_endspace();
-               framecnt_t amount = extent.second - extent.first;
-               pl->ripple(pos, amount * times, boost::shared_ptr<Region>());
+               std::pair<samplepos_t, samplepos_t> extent = (*p)->get_extent_with_endspace();
+               samplecnt_t amount = extent.second - extent.first;
+               pl->ripple(pos, amount * ctx.times, boost::shared_ptr<Region>());
        }
-       pl->paste (*p, pos, times);
+       pl->paste (*p, pos, ctx.times, sub_num);
 
        vector<Command*> cmds;
        pl->rdiff (cmds);
@@ -1575,9 +1527,9 @@ RouteTimeAxisView::paste (framepos_t pos, float times, Selection& selection, siz
 
 
 struct PlaylistSorter {
-    bool operator() (boost::shared_ptr<Playlist> a, boost::shared_ptr<Playlist> b) const {
-            return a->sort_id() < b->sort_id();
-    }
+       bool operator() (boost::shared_ptr<Playlist> a, boost::shared_ptr<Playlist> b) const {
+               return a->sort_id() < b->sort_id();
+       }
 };
 
 void
@@ -1600,21 +1552,20 @@ RouteTimeAxisView::build_playlist_menu ()
        RadioMenuItem::Group playlist_group;
        boost::shared_ptr<Track> tr = track ();
 
-        vector<boost::shared_ptr<Playlist> > playlists_tr = _session->playlists->playlists_for_track (tr);
+       vector<boost::shared_ptr<Playlist> > playlists_tr = _session->playlists->playlists_for_track (tr);
 
-        /* sort the playlists */
-        PlaylistSorter cmp;
-        sort (playlists_tr.begin(), playlists_tr.end(), cmp);
+       /* sort the playlists */
+       PlaylistSorter cmp;
+       sort (playlists_tr.begin(), playlists_tr.end(), cmp);
 
-        /* add the playlists to the menu */
-        for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists_tr.begin(); i != playlists_tr.end(); ++i) {
-                playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name()));
-                RadioMenuItem *item = static_cast<RadioMenuItem*>(&playlist_items.back());
-                item->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
-
-                if (tr->playlist()->id() == (*i)->id()) {
-                        item->set_active();
+       /* add the playlists to the menu */
+       for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists_tr.begin(); i != playlists_tr.end(); ++i) {
+               playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name()));
+               RadioMenuItem *item = static_cast<RadioMenuItem*>(&playlist_items.back());
+               item->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
 
+               if (tr->playlist()->id() == (*i)->id()) {
+                       item->set_active();
                }
        }
 
@@ -1622,7 +1573,7 @@ RouteTimeAxisView::build_playlist_menu ()
        playlist_items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
        playlist_items.push_back (SeparatorElem());
 
-       if (!route_group() || !route_group()->is_active() || !route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
+       if (!route_group() || !route_group()->is_active() || !route_group()->enabled_property (ARDOUR::Properties::group_select.property_id)) {
                playlist_items.push_back (MenuElem (_("New..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this)));
                playlist_items.push_back (MenuElem (_("New Copy..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this)));
 
@@ -1637,7 +1588,7 @@ RouteTimeAxisView::build_playlist_menu ()
        playlist_items.push_back (MenuElem (_("Clear Current"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::clear_playlists), this)));
        playlist_items.push_back (SeparatorElem());
 
-       playlist_items.push_back (MenuElem(_("Select From All..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
+       playlist_items.push_back (MenuElem(_("Select from All..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
 }
 
 void
@@ -1645,10 +1596,10 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist>
 {
        assert (is_track());
 
-        // exit if we were triggered by deactivating the old playlist
-        if (!item->get_active()) {
-                return;
-        }
+       // exit if we were triggered by deactivating the old playlist
+       if (!item->get_active()) {
+               return;
+       }
 
        boost::shared_ptr<Playlist> pl (wpl.lock());
 
@@ -1662,30 +1613,30 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist>
                return;
        }
 
-       track()->use_playlist (pl);
-       
+       track()->use_playlist (track()->data_type(), pl);
+
        RouteGroup* rg = route_group();
-       
-       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) {
+
+       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::group_select.property_id)) {
                std::string group_string = "." + rg->name() + ".";
-               
+
                std::string take_name = pl->name();
                std::string::size_type idx = take_name.find(group_string);
-               
+
                if (idx == std::string::npos)
                        return;
-               
+
                take_name = take_name.substr(idx + group_string.length()); // find the bit containing the take number / name
-               
+
                boost::shared_ptr<RouteList> rl (rg->route_list());
-               
+
                for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) {
                        if ((*i) == this->route()) {
                                continue;
                        }
 
                        std::string playlist_name = (*i)->name()+group_string+take_name;
-                       
+
                        boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track>(*i);
                        if (!track) {
                                continue;
@@ -1695,14 +1646,14 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist>
                                /* Don't change playlists of frozen tracks */
                                continue;
                        }
-                       
+
                        boost::shared_ptr<Playlist> ipl = session()->playlists->by_name(playlist_name);
                        if (!ipl) {
                                // No playlist for this track for this take yet, make it
-                               track->use_new_playlist();
+                               track->use_default_new_playlist();
                                track->playlist()->set_name(playlist_name);
                        } else {
-                               track->use_playlist(ipl);
+                               track->use_playlist(track->data_type(), ipl);
                        }
                }
        }
@@ -1712,30 +1663,30 @@ void
 RouteTimeAxisView::update_playlist_tip ()
 {
        RouteGroup* rg = route_group ();
-       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) {
+       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::group_select.property_id)) {
                string group_string = "." + rg->name() + ".";
-               
+
                string take_name = track()->playlist()->name();
                string::size_type idx = take_name.find(group_string);
-               
+
                if (idx != string::npos) {
                        /* find the bit containing the take number / name */
                        take_name = take_name.substr (idx + group_string.length());
 
                        /* set the playlist button tooltip to the take name */
-                       ARDOUR_UI::instance()->set_tip (
+                       set_tooltip (
                                playlist_button,
                                string_compose(_("Take: %1.%2"),
-                                       Glib::Markup::escape_text(rg->name()),
-                                       Glib::Markup::escape_text(take_name))
+                                       Gtkmm2ext::markup_escape_text (rg->name()),
+                                       Gtkmm2ext::markup_escape_text (take_name))
                                );
-                       
+
                        return;
                }
        }
 
        /* set the playlist button tooltip to the playlist name */
-       ARDOUR_UI::instance()->set_tip (playlist_button, _("Playlist") + std::string(": ") + Glib::Markup::escape_text(track()->playlist()->name()));
+       set_tooltip (playlist_button, _("Playlist") + std::string(": ") + Gtkmm2ext::markup_escape_text (track()->playlist()->name()));
 }
 
 
@@ -1757,13 +1708,12 @@ RouteTimeAxisView::map_frozen ()
        switch (track()->freeze_state()) {
        case Track::Frozen:
                playlist_button.set_sensitive (false);
-               rec_enable_button->set_sensitive (false);
                break;
        default:
                playlist_button.set_sensitive (true);
-               rec_enable_button->set_sensitive (true);
                break;
        }
+       RouteUI::map_frozen ();
 }
 
 void
@@ -1771,11 +1721,11 @@ RouteTimeAxisView::color_handler ()
 {
        //case cTimeStretchOutline:
        if (timestretch_rect) {
-               timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_TimeStretchOutline());
+               timestretch_rect->set_outline_color (UIConfiguration::instance().color ("time stretch outline"));
        }
        //case cTimeStretchFill:
        if (timestretch_rect) {
-               timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_TimeStretchFill());
+               timestretch_rect->set_fill_color (UIConfiguration::instance().color ("time stretch fill"));
        }
 
        reset_meter();
@@ -1812,24 +1762,74 @@ RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param)
 }
 
 void
-RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param)
+RouteTimeAxisView::update_pan_track_visibility ()
 {
-       boost::shared_ptr<AutomationTimeAxisView> track = automation_child (param);
+       bool const showit = pan_automation_item->get_active();
+       bool changed = false;
 
-       if (!track) {
-               return;
+       for (list<boost::shared_ptr<AutomationTimeAxisView> >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) {
+               if ((*i)->set_marked_for_display (showit)) {
+                       changed = true;
+               }
        }
 
-       Gtk::CheckMenuItem* menu = automation_child_menu_item (param);
+       if (changed) {
+               _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */
+       }
+}
 
-       if (menu && !_hidden) {
-               ignore_toggle = true;
-               menu->set_active (false);
-               ignore_toggle = false;
+void
+RouteTimeAxisView::ensure_pan_views (bool show)
+{
+       bool changed = false;
+       for (list<boost::shared_ptr<AutomationTimeAxisView> >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) {
+               changed = true;
+               (*i)->set_marked_for_display (false);
+       }
+       if (changed) {
+               _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */
        }
+       pan_tracks.clear();
 
-       if (_route && !no_redraw) {
-               request_redraw ();
+       if (!_route->panner()) {
+               return;
+       }
+
+       set<Evoral::Parameter> params = _route->panner()->what_can_be_automated();
+       set<Evoral::Parameter>::iterator p;
+
+       for (p = params.begin(); p != params.end(); ++p) {
+               boost::shared_ptr<ARDOUR::AutomationControl> pan_control = _route->pannable()->automation_control(*p);
+
+               if (pan_control->parameter().type() == NullAutomation) {
+                       error << "Pan control has NULL automation type!" << endmsg;
+                       continue;
+               }
+
+               if (automation_child (pan_control->parameter ()).get () == 0) {
+
+                       /* we don't already have an AutomationTimeAxisView for this parameter */
+
+                       std::string const name = _route->panner()->describe_parameter (pan_control->parameter ());
+
+                       boost::shared_ptr<AutomationTimeAxisView> t (
+                                       new AutomationTimeAxisView (_session,
+                                               _route,
+                                               _route->pannable(),
+                                               pan_control,
+                                               pan_control->parameter (),
+                                               _editor,
+                                               *this,
+                                               false,
+                                               parent_canvas,
+                                               name)
+                                       );
+
+                       pan_tracks.push_back (t);
+                       add_automation_child (*p, t, show);
+               } else {
+                       pan_tracks.push_back (automation_child (pan_control->parameter ()));
+               }
        }
 }
 
@@ -1842,18 +1842,7 @@ RouteTimeAxisView::show_all_automation (bool apply_to_selection)
        } else {
                no_redraw = true;
 
-               /* Show our automation */
-
-               for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
-                       i->second->set_marked_for_display (true);
-
-                       Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
-
-                       if (menu) {
-                               menu->set_active(true);
-                       }
-               }
-
+               StripableTimeAxisView::show_all_automation ();
 
                /* Show processor automation */
 
@@ -1883,31 +1872,18 @@ RouteTimeAxisView::show_existing_automation (bool apply_to_selection)
        } else {
                no_redraw = true;
 
-               /* Show our automation */
-
-               for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
-                       if (i->second->has_automation()) {
-                               i->second->set_marked_for_display (true);
-
-                               Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
-                               if (menu) {
-                                       menu->set_active(true);
-                               }
-                       }
-               }
+               StripableTimeAxisView::show_existing_automation ();
 
                /* Show processor automation */
-
                for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
                        for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
-                               if ((*ii)->view != 0 && (*i)->processor->control((*ii)->what)->list()->size() > 0) {
+                               if ((*i)->processor->control((*ii)->what)->list()->size() > 0) {
                                        (*ii)->menu_item->set_active (true);
                                }
                        }
                }
 
                no_redraw = false;
-
                request_redraw ();
        }
 }
@@ -1919,21 +1895,9 @@ RouteTimeAxisView::hide_all_automation (bool apply_to_selection)
                _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::hide_all_automation, _1, false));
        } else {
                no_redraw = true;
-
-               /* Hide our automation */
-
-               for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
-                       i->second->set_marked_for_display (false);
-
-                       Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
-
-                       if (menu) {
-                               menu->set_active (false);
-                       }
-               }
+               StripableTimeAxisView::hide_all_automation ();
 
                /* Hide processor automation */
-
                for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
                        for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
                                (*ii)->menu_item->set_active (false);
@@ -1945,7 +1909,6 @@ RouteTimeAxisView::hide_all_automation (bool apply_to_selection)
        }
 }
 
-
 void
 RouteTimeAxisView::region_view_added (RegionView* rv)
 {
@@ -2010,12 +1973,12 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor>
        ProcessorAutomationNode* pan;
 
        if ((pan = find_processor_automation_node (processor, what)) == 0) {
-                /* session state may never have been saved with new plugin */
-                error << _("programming error: ")
+               /* 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() )
+                                        processor->name(), what.type(), (int) what.channel(), what.id() )
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return;
        }
 
@@ -2025,10 +1988,10 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor>
 
        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, control->parameter (),
-                                           _editor, *this, false, parent_canvas, 
+                                           _editor, *this, false, parent_canvas,
                                            processor->describe_parameter (what), processor->name()));
 
        pan->view->Hiding.connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor));
@@ -2067,7 +2030,7 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr<Pro
        processor->what_has_data (existing);
 
        for (set<Evoral::Parameter>::iterator i = existing.begin(); i != existing.end(); ++i) {
-               
+
                Evoral::Parameter param (*i);
                boost::shared_ptr<AutomationLine> al;
 
@@ -2079,41 +2042,6 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr<Pro
        }
 }
 
-void
-RouteTimeAxisView::add_automation_child (Evoral::Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show)
-{
-       using namespace Menu_Helpers;
-
-       add_child (track);
-
-       track->Hiding.connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param));
-
-       _automation_tracks[param] = track;
-
-       /* existing state overrides "show" argument */
-       string s = track->gui_property ("visible");
-       if (!s.empty()) { 
-               show = string_is_affirmative (s);
-       }
-
-       /* this might or might not change the visibility status, so don't rely on it */
-       track->set_marked_for_display (show);
-
-       if (show && !no_redraw) {
-               request_redraw ();
-       }
-
-       if (!EventTypeMap::instance().is_midi_parameter(param)) {
-               /* MIDI-related parameters are always in the menu, there's no
-                  reason to rebuild the menu just because we added a automation
-                  lane for one of them. But if we add a non-MIDI automation
-                  lane, then we need to invalidate the display menu.
-               */
-               delete display_menu;
-               display_menu = 0;
-       }
-}
-
 void
 RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p)
 {
@@ -2149,14 +2077,10 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
        }
 
        if (x == processor_automation.end()) {
-
                rai = new ProcessorAutomationInfo (processor);
                processor_automation.push_back (rai);
-
        } else {
-
                rai = *x;
-
        }
 
        /* any older menu was deleted at the top of processors_changed()
@@ -2179,9 +2103,13 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
 
                string name = processor->describe_parameter (*i);
 
+               if (name == X_("hidden")) {
+                       continue;
+               }
+
                items.push_back (CheckMenuElem (name));
                mitem = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
-               
+
                _subplugin_menu_map[*i] = mitem;
 
                if (has_visible_automation.find((*i)) != has_visible_automation.end()) {
@@ -2205,6 +2133,10 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
                mitem->signal_toggled().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan));
        }
 
+       if (items.size() == 0) {
+               return;
+       }
+
        /* add the menu for this processor, because the subplugin
           menu is always cleared at the top of processors_changed().
           this is the result of some poor design in gtkmm and/or
@@ -2230,15 +2162,49 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto
        if (pan->view && pan->view->set_marked_for_display (showit)) {
                redraw = true;
        }
-       
+
        if (redraw && !no_redraw) {
                request_redraw ();
        }
 }
 
+void
+RouteTimeAxisView::reread_midnam ()
+{
+       boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (_route->the_instrument ());
+       assert (pi);
+       bool rv = pi->plugin ()->read_midnam();
+
+       if (rv && patch_change_dialog ()) {
+               patch_change_dialog ()->refresh ();
+       }
+}
+
+void
+RouteTimeAxisView::drop_instrument_ref ()
+{
+       midnam_connection.drop_connections ();
+}
+
 void
 RouteTimeAxisView::processors_changed (RouteProcessorChange c)
 {
+       if (_route) {
+               boost::shared_ptr<Processor> the_instrument (_route->the_instrument());
+               boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (the_instrument);
+               if (pi && pi->plugin ()->has_midnam ()) {
+                       midnam_connection.drop_connections ();
+                       the_instrument->DropReferences.connect (midnam_connection, invalidator (*this),
+                                       boost::bind (&RouteTimeAxisView::drop_instrument_ref, this),
+                                       gui_context());
+                       pi->plugin()->UpdateMidnam.connect (midnam_connection, invalidator (*this),
+                                       boost::bind (&RouteTimeAxisView::reread_midnam, this),
+                                       gui_context());
+
+                       reread_midnam ();
+               }
+       }
+
        if (c.type == RouteProcessorChange::MeterPointChange) {
                /* nothing to do if only the meter point has changed */
                return;
@@ -2304,7 +2270,11 @@ RouteTimeAxisView::can_edit_name () const
 {
        /* we do not allow track name changes if it is record enabled
         */
-       return !_route->record_enabled();
+       boost::shared_ptr<Track> trk (boost::dynamic_pointer_cast<Track> (_route));
+       if (!trk) {
+               return true;
+       }
+       return !trk->rec_enable_control()->get_value();
 }
 
 void
@@ -2319,7 +2289,7 @@ RouteTimeAxisView::set_layer_display (LayerDisplay d, bool apply_to_selection)
        if (_ignore_set_layer_display) {
                return;
        }
-       
+
        if (apply_to_selection) {
                _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_layer_display, _1, d, false));
        } else {
@@ -2328,7 +2298,7 @@ RouteTimeAxisView::set_layer_display (LayerDisplay d, bool apply_to_selection)
                        _view->set_layer_display (d);
                }
 
-               set_gui_property (X_("layer-display"), enum_2_string (d));
+               set_gui_property (X_("layer-display"), d);
        }
 }
 
@@ -2343,19 +2313,6 @@ RouteTimeAxisView::layer_display () const
        return Overlaid;
 }
 
-
-
-boost::shared_ptr<AutomationTimeAxisView>
-RouteTimeAxisView::automation_child(Evoral::Parameter param)
-{
-       AutomationTracks::iterator i = _automation_tracks.find(param);
-       if (i != _automation_tracks.end()) {
-               return i->second;
-       } else {
-               return boost::shared_ptr<AutomationTimeAxisView>();
-       }
-}
-
 void
 RouteTimeAxisView::fast_update ()
 {
@@ -2378,7 +2335,7 @@ RouteTimeAxisView::show_meter ()
 void
 RouteTimeAxisView::reset_meter ()
 {
-       if (Config->get_show_track_meters()) {
+       if (UIConfiguration::instance().get_show_track_meters()) {
                int meter_width = 3;
                if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
                        meter_width = 6;
@@ -2400,7 +2357,7 @@ RouteTimeAxisView::meter_changed ()
 {
        ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed)
        reset_meter();
-       if (_route && !no_redraw) {
+       if (_route && !no_redraw && UIConfiguration::instance().get_show_track_meters()) {
                request_redraw ();
        }
        // reset peak when meter point changes
@@ -2454,11 +2411,11 @@ RouteTimeAxisView::set_underlay_state()
                        continue;
                }
 
-               XMLProperty* prop = child_node->property ("id");
+               XMLProperty const * prop = child_node->property ("id");
                if (prop) {
                        PBD::ID id (prop->value());
 
-                       RouteTimeAxisView* v = _editor.get_route_view_by_route_id (id);
+                       StripableTimeAxisView* v = _editor.get_stripable_time_axis_by_id (id);
 
                        if (v) {
                                add_underlay(v->view(), false);
@@ -2481,7 +2438,7 @@ RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/)
        if (find(_underlay_streams.begin(), _underlay_streams.end(), v) == _underlay_streams.end()) {
                if (find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this) != other._underlay_mirrors.end()) {
                        fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
 
                _underlay_streams.push_back(v);
@@ -2496,7 +2453,7 @@ RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/)
                        }
 
                        XMLNode* node = underlay_xml_node->add_child("Underlay");
-                       XMLProperty* prop = node->add_property("id");
+                       XMLProperty const * prop = node->add_property("id");
                        prop->set_value(v->trackview().route()->id().to_s());
                }
 #endif
@@ -2518,7 +2475,7 @@ RouteTimeAxisView::remove_underlay (StreamView* v)
 
                if (gm == other._underlay_mirrors.end()) {
                        fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
 
                v->foreach_regionview(sigc::mem_fun(*this, &RouteTimeAxisView::remove_ghost));
@@ -2535,7 +2492,7 @@ RouteTimeAxisView::remove_underlay (StreamView* v)
 void
 RouteTimeAxisView::set_button_names ()
 {
-       if (_route && _route->solo_safe()) {
+       if (_route && _route->solo_safe_control()->solo_safe()) {
                solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
        } else {
                solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
@@ -2543,30 +2500,30 @@ RouteTimeAxisView::set_button_names ()
        if (Config->get_solo_control_is_listen_control()) {
                switch (Config->get_listen_position()) {
                        case AfterFaderListen:
-                               solo_button->set_text (_("A"));
-                               ARDOUR_UI::instance()->set_tip (*solo_button, _("After-fade listen (AFL)"));
+                               solo_button->set_text (S_("AfterFader|A"));
+                               set_tooltip (*solo_button, _("After-fade listen (AFL)"));
                                break;
                        case PreFaderListen:
-                               solo_button->set_text (_("P"));
-                               ARDOUR_UI::instance()->set_tip (*solo_button, _("Pre-fade listen (PFL)"));
+                               solo_button->set_text (S_("PreFader|P"));
+                               set_tooltip (*solo_button, _("Pre-fade listen (PFL)"));
                        break;
                }
        } else {
-               solo_button->set_text (_("S"));
-               ARDOUR_UI::instance()->set_tip (*solo_button, _("Solo"));
+               solo_button->set_text (S_("Solo|S"));
+               set_tooltip (*solo_button, _("Solo"));
        }
-       mute_button->set_text (_("M"));
+       mute_button->set_text (S_("Mute|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;
+       Gtk::CheckMenuItem* rv = StripableTimeAxisView::automation_child_menu_item (param);
+       if (rv) {
+               return rv;
        }
 
-       i = _subplugin_menu_map.find (param);
+       ParameterMenuMap::iterator i = _subplugin_menu_map.find (param);
        if (i != _subplugin_menu_map.end()) {
                return i->second;
        }
@@ -2598,6 +2555,29 @@ RouteTimeAxisView::create_gain_automation_child (const Evoral::Parameter& param,
        add_automation_child (Evoral::Parameter(GainAutomation), gain_track, show);
 }
 
+void
+RouteTimeAxisView::create_trim_automation_child (const Evoral::Parameter& param, bool show)
+{
+       boost::shared_ptr<AutomationControl> c = _route->trim()->gain_control();
+       if (!c || ! _route->trim()->active()) {
+               return;
+       }
+
+       trim_track.reset (new AutomationTimeAxisView (_session,
+                                                     _route, _route->trim(), c, param,
+                                                     _editor,
+                                                     *this,
+                                                     false,
+                                                     parent_canvas,
+                                                     _route->trim()->describe_parameter(param)));
+
+       if (_view) {
+               _view->foreach_regionview (sigc::mem_fun (*trim_track.get(), &TimeAxisView::add_ghost));
+       }
+
+       add_automation_child (Evoral::Parameter(TrimAutomation), trim_track, show);
+}
+
 void
 RouteTimeAxisView::create_mute_automation_child (const Evoral::Parameter& param, bool show)
 {
@@ -2702,7 +2682,7 @@ void
 RouteTimeAxisView::remove_child (boost::shared_ptr<TimeAxisView> c)
 {
        TimeAxisView::remove_child (c);
-       
+
        boost::shared_ptr<AutomationTimeAxisView> a = boost::dynamic_pointer_cast<AutomationTimeAxisView> (c);
        if (a) {
                for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
@@ -2713,3 +2693,21 @@ RouteTimeAxisView::remove_child (boost::shared_ptr<TimeAxisView> c)
                }
        }
 }
+
+Gdk::Color
+RouteTimeAxisView::color () const
+{
+       return route_color ();
+}
+
+bool
+RouteTimeAxisView::marked_for_display () const
+{
+       return !_route->presentation_info().hidden();
+}
+
+bool
+RouteTimeAxisView::set_marked_for_display (bool yn)
+{
+       return RouteUI::mark_hidden (!yn);
+}