Refactor update_io_button
[ardour.git] / gtk2_ardour / mixer_strip.cc
index d21efb2a75131e242277e12e1b52c245026f8365..21d6a5007fdc0bcac2aafa356172db4d3371f15d 100644 (file)
 
 #include <sigc++/bind.h>
 
+#include <gtkmm/messagedialog.h>
+
 #include "pbd/convert.h"
 #include "pbd/enumwriter.h"
 #include "pbd/replace_all.h"
 #include "pbd/stacktrace.h"
 
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/doi.h>
-#include <gtkmm2ext/slider_controller.h>
-#include <gtkmm2ext/bindable_button.h>
-
+#include "ardour/amp.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/internal_send.h"
+#include "ardour/io.h"
 #include "ardour/meter.h"
 #include "ardour/midi_track.h"
 #include "ardour/pannable.h"
 #include "ardour/session.h"
 #include "ardour/types.h"
 #include "ardour/user_bundle.h"
+#include "ardour/vca.h"
+#include "ardour/vca_manager.h"
+
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/menu_elems.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/doi.h"
+
+#include "widgets/tooltips.h"
 
-#include "ardour_ui.h"
 #include "ardour_window.h"
+#include "enums_convert.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
-#include "ardour_button.h"
 #include "public_editor.h"
 #include "send_ui.h"
 #include "io_selector.h"
 #include "gui_thread.h"
 #include "route_group_menu.h"
 #include "meter_patterns.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
-using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
 using namespace ArdourMeter;
 
-int MixerStrip::scrollbar_height = 0;
+MixerStrip* MixerStrip::_entered_mixer_strip;
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
-       : AxisView(sess)
+       : SessionHandlePtr (sess)
        , RouteUI (sess)
        , _mixer(mx)
        , _mixer_owned (in_mixer)
@@ -88,15 +94,17 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        , gpm (sess, 250)
        , panners (sess)
        , button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
-       , button_table (3, 1)
-       , rec_solo_table (2, 2)
-       , top_button_table (1, 2)
-       , middle_button_table (1, 2)
+       , rec_mon_table (2, 2)
+       , solo_iso_table (1, 2)
+       , mute_solo_table (1, 2)
        , bottom_button_table (1, 3)
-       , meter_point_button (_("pre"))
+       , monitor_section_button (0)
        , midi_input_enable_button (0)
+       , _plugin_insert_cnt (0)
        , _comment_button (_("Comments"))
-       , _visibility (X_("mixer-strip-visibility"))
+       , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
+       , _visibility (X_("mixer-element-visibility"))
+       , control_slave_ui (sess)
 {
        init ();
 
@@ -110,7 +118,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 }
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt, bool in_mixer)
-       : AxisView(sess)
+       : SessionHandlePtr (sess)
        , RouteUI (sess)
        , _mixer(mx)
        , _mixer_owned (in_mixer)
@@ -118,13 +126,17 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , gpm (sess, 250)
        , panners (sess)
        , button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
-       , button_table (3, 1)
-       , middle_button_table (1, 2)
+       , rec_mon_table (2, 2)
+       , solo_iso_table (1, 2)
+       , mute_solo_table (1, 2)
        , bottom_button_table (1, 3)
-       , meter_point_button (_("pre"))
+       , monitor_section_button (0)
        , midi_input_enable_button (0)
+       , _plugin_insert_cnt (0)
        , _comment_button (_("Comments"))
-       , _visibility (X_("mixer-strip-visibility"))
+       , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
+       , _visibility (X_("mixer-element-visibility"))
+       , control_slave_ui (sess)
 {
        init ();
        set_route (rt);
@@ -133,18 +145,13 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
 void
 MixerStrip::init ()
 {
-       int button_table_row = 0;
-
-       input_selector = 0;
-       output_selector = 0;
+       _entered_mixer_strip= 0;
        group_menu = 0;
        route_ops_menu = 0;
        ignore_comment_edit = false;
        ignore_toggle = false;
-       comment_window = 0;
        comment_area = 0;
        _width_owner = 0;
-       spacer = 0;
 
        /* the length of this string determines the width of the mixer strip when it is set to `wide' */
        longest_label = "longest label";
@@ -153,80 +160,67 @@ MixerStrip::init ()
        if (_mixer_owned) {
                t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ());
        }
-       
-       width_button.set_image (::get_icon("strip_width"));
-       ARDOUR_UI::instance()->set_tip (width_button, t);
 
-       hide_button.set_image(::get_icon("hide"));
-       ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
+       width_button.set_icon (ArdourIcon::StripWidth);
+       hide_button.set_tweaks (ArdourButton::Square);
+       set_tooltip (width_button, t);
+
+       hide_button.set_icon (ArdourIcon::CloseCross);
+       hide_button.set_tweaks (ArdourButton::Square);
+       set_tooltip (&hide_button, _("Hide this mixer strip"));
+
+       input_button_box.set_spacing(2);
 
        input_button.set_text (_("Input"));
        input_button.set_name ("mixer strip button");
-       input_button.set_size_request (-1, 20);
        input_button_box.pack_start (input_button, true, true);
 
        output_button.set_text (_("Output"));
        output_button.set_name ("mixer strip button");
-       Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4);
-
-       ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), "");
-       meter_point_button.set_name ("mixer strip button");
 
-       /* TRANSLATORS: this string should be longest of the strings
-          used to describe meter points. In english, it's "input".
-       */
-       set_size_request_to_display_given_text (meter_point_button, _("tupni"), 5, 5);
-
-       bottom_button_table.attach (meter_point_button, 2, 3, 0, 1);
-
-       meter_point_button.signal_button_press_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_press), false);
-       meter_point_button.signal_button_release_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_release), false);
+       bottom_button_table.attach (gpm.meter_point_button, 2, 3, 0, 1);
 
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-       monitor_input_button->set_diameter (3);
-       monitor_disk_button->set_diameter (3);
-
-        solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
-        solo_isolated_led->show ();
-        solo_isolated_led->set_diameter (3);
-        solo_isolated_led->set_no_show_all (true);
-        solo_isolated_led->set_name (X_("solo isolate"));
-        solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-        solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release));
+       solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+       solo_isolated_led->show ();
+       solo_isolated_led->set_no_show_all (true);
+       solo_isolated_led->set_name (X_("solo isolate"));
+       solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+       solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false);
        UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
 
-        solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
-        solo_safe_led->show ();
-        solo_safe_led->set_diameter (3);
-        solo_safe_led->set_no_show_all (true);
-        solo_safe_led->set_name (X_("solo safe"));
-        solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-        solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release));
+       solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+       solo_safe_led->show ();
+       solo_safe_led->set_no_show_all (true);
+       solo_safe_led->set_name (X_("solo safe"));
+       solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+       solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false);
        UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
 
-       solo_safe_led->set_text (_("lock"));
-       solo_isolated_led->set_text (_("iso"));
+       solo_safe_led->set_text (S_("SoloLock|Lock"));
+       solo_isolated_led->set_text (_("Iso"));
 
-       top_button_table.set_homogeneous (true);
-       top_button_table.set_spacings (2);
+       solo_iso_table.set_homogeneous (true);
+       solo_iso_table.set_spacings (2);
        if (!ARDOUR::Profile->get_trx()) {
-               top_button_table.attach (*monitor_input_button, 0, 1, 0, 1);
-               top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1);
+               solo_iso_table.attach (*solo_isolated_led, 0, 1, 0, 1);
+               solo_iso_table.attach (*solo_safe_led, 1, 2, 0, 1);
        }
-       top_button_table.show ();
+       solo_iso_table.show ();
 
-       rec_solo_table.set_homogeneous (true);
-       rec_solo_table.set_row_spacings (2);
-       rec_solo_table.set_col_spacings (2);
-       if (!ARDOUR::Profile->get_trx()) {
-               rec_solo_table.attach (*solo_isolated_led, 1, 2, 0, 1);
-               rec_solo_table.attach (*solo_safe_led, 1, 2, 1, 2);
+       rec_mon_table.set_homogeneous (true);
+       rec_mon_table.set_row_spacings (2);
+       rec_mon_table.set_col_spacings (2);
+       if (ARDOUR::Profile->get_mixbus()) {
+               rec_mon_table.resize (1, 3);
+               rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
+               rec_mon_table.attach (*monitor_disk_button, 2, 3, 0, 1);
+       } else if (!ARDOUR::Profile->get_trx()) {
+               rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
+               rec_mon_table.attach (*monitor_disk_button, 1, 2, 1, 2);
        }
-        rec_solo_table.show ();
-
-       button_table.set_homogeneous (false);
-       button_table.set_spacings (2);
+       rec_mon_table.show ();
 
        if (solo_isolated_led) {
                button_size_group->add_widget (*solo_isolated_led);
@@ -234,85 +228,87 @@ MixerStrip::init ()
        if (solo_safe_led) {
                button_size_group->add_widget (*solo_safe_led);
        }
-       if (rec_enable_button) {
-               button_size_group->add_widget (*rec_enable_button);
-       }
-       if (monitor_disk_button) {
-               button_size_group->add_widget (*monitor_disk_button);
-       }
-       if (monitor_input_button) {
-               button_size_group->add_widget (*monitor_input_button);
-       }
 
-       if (!ARDOUR::Profile->get_trx()) {
-               button_table.attach (name_button, 0, 1, button_table_row, button_table_row+1);
-               button_table_row++;
-               button_table.attach (input_button_box, 0, 2, button_table_row, button_table_row+1);
-               button_table_row++;
-               button_table.attach (_invert_button_box, 0, 2, button_table_row, button_table_row+1);
-               button_table_row++;
+       if (!ARDOUR::Profile->get_mixbus()) {
+               if (rec_enable_button) {
+                       button_size_group->add_widget (*rec_enable_button);
+               }
+               if (monitor_disk_button) {
+                       button_size_group->add_widget (*monitor_disk_button);
+               }
+               if (monitor_input_button) {
+                       button_size_group->add_widget (*monitor_input_button);
+               }
        }
 
-       middle_button_table.set_homogeneous (true);
-       middle_button_table.set_spacings (2);
+       mute_solo_table.set_homogeneous (true);
+       mute_solo_table.set_spacings (2);
 
        bottom_button_table.set_spacings (2);
-       bottom_button_table.set_homogeneous (false);
-       button_table_row = 0;
-       bottom_button_table.attach (group_button, 0, 1, button_table_row, button_table_row+1);
-       bottom_button_table.attach (gpm.gain_automation_state_button, 1, 2, button_table_row, button_table_row+1);
-       button_table_row++;
+       bottom_button_table.set_homogeneous (true);
+       bottom_button_table.attach (group_button, 1, 2, 0, 1);
+       bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1);
 
        name_button.set_name ("mixer strip button");
-       name_button.set_text (" "); /* non empty text, forces creation of the layout */
-       name_button.set_text (""); /* back to empty */
-       name_button.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
+       name_button.set_text_ellipsize (Pango::ELLIPSIZE_END);
        name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized));
-       Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
-       name_button.set_size_request (-1, 20);
 
-       ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
+       set_tooltip (&group_button, _("Mix group"));
        group_button.set_name ("mixer strip button");
-       Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
 
        _comment_button.set_name (X_("mixer strip button"));
-       _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &MixerStrip::toggle_comment_editor));
-
-       global_vpacker.set_border_width (0);
+       _comment_button.set_text_ellipsize (Pango::ELLIPSIZE_END);
+       _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor));
+       _comment_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::comment_button_resized));
+
+       // TODO implement ArdourKnob::on_size_request properly
+#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))
+       trim_control.set_size_request (PX_SCALE(19), PX_SCALE(19));
+#undef PX_SCALE
+       trim_control.set_tooltip_prefix (_("Trim: "));
+       trim_control.set_name ("trim knob");
+       trim_control.set_no_show_all (true);
+       trim_control.StartGesture.connect(sigc::mem_fun(*this, &MixerStrip::trim_start_touch));
+       trim_control.StopGesture.connect(sigc::mem_fun(*this, &MixerStrip::trim_end_touch));
+       input_button_box.pack_start (trim_control, false, false);
+
+       global_vpacker.set_border_width (1);
        global_vpacker.set_spacing (0);
 
        width_button.set_name ("mixer strip button");
        hide_button.set_name ("mixer strip button");
-       top_event_box.set_name ("mixer strip button");
 
        width_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::width_button_pressed), false);
        hide_button.signal_clicked.connect (sigc::mem_fun(*this, &MixerStrip::hide_clicked));
 
+       width_hide_box.set_spacing (2);
        width_hide_box.pack_start (width_button, false, true);
-       width_hide_box.pack_start (top_event_box, true, true);
+       width_hide_box.pack_start (number_label, true, true);
        width_hide_box.pack_end (hide_button, false, true);
 
        number_label.set_text ("-");
+       number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
        number_label.set_no_show_all ();
        number_label.set_name ("tracknumber label");
        number_label.set_fixed_colors (0x80808080, 0x80808080);
-       number_label.set_elements (ArdourButton::Element(ArdourButton::Body | ArdourButton::Text));
        number_label.set_alignment (.5, .5);
-       top_event_box.add (number_label);
-
-       whvbox.pack_start (width_hide_box, true, true);
+       number_label.set_fallthrough_to_parent (true);
+       number_label.set_tweaks (ArdourButton::OccasionalText);
 
        global_vpacker.set_spacing (2);
        if (!ARDOUR::Profile->get_trx()) {
-               global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
-               global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK);
+               global_vpacker.pack_start (width_hide_box, Gtk::PACK_SHRINK);
+               global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK);
+               global_vpacker.pack_start (input_button_box, Gtk::PACK_SHRINK);
+               global_vpacker.pack_start (_invert_button_box, Gtk::PACK_SHRINK);
                global_vpacker.pack_start (processor_box, true, true);
        }
        global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (rec_solo_table, Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (rec_mon_table, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (solo_iso_table, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (control_slave_ui, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK);
        if (!ARDOUR::Profile->get_trx()) {
                global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
@@ -321,6 +317,24 @@ MixerStrip::init ()
                global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK);
        }
 
+#ifndef MIXBUS
+       //add a spacer underneath the master bus;
+       //this fills the area that is taken up by the scrollbar on the tracks;
+       //and therefore keeps the faders "even" across the bottom
+       int scrollbar_height = 0;
+       {
+               Gtk::Window window (WINDOW_TOPLEVEL);
+               HScrollbar scrollbar;
+               window.add (scrollbar);
+               scrollbar.set_name ("MixerWindow");
+               scrollbar.ensure_style();
+               Gtk::Requisition requisition(scrollbar.size_request ());
+               scrollbar_height = requisition.height;
+       }
+       spacer.set_size_request (-1, scrollbar_height);
+       global_vpacker.pack_end (spacer, false, false);
+#endif
+
        global_frame.add (global_vpacker);
        global_frame.set_shadow_type (Gtk::SHADOW_IN);
        global_frame.set_name ("BaseFrame");
@@ -339,12 +353,20 @@ MixerStrip::init ()
        _session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context());
 
        input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false);
+       input_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::input_release), false);
+       input_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::input_button_resized));
+
+       input_button.set_text_ellipsize (Pango::ELLIPSIZE_MIDDLE);
+       output_button.set_text_ellipsize (Pango::ELLIPSIZE_MIDDLE);
+
        output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false);
+       output_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::output_release), false);
+       output_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::output_button_resized));
 
-       /* ditto for this button and busses */
+       number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::number_button_button_press), false);
 
-       number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
        name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
+
        group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::select_route_group), false);
 
        _width = (Width) -1;
@@ -379,18 +401,23 @@ MixerStrip::init ()
           must be the same as those used in RCOptionEditor so that the configuration changes
           are recognised when they occur.
        */
-       _visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert"));
-       _visibility.add (solo_safe_led, X_("SoloSafe"), _("Solo Safe"), true, boost::bind (&MixerStrip::override_solo_visibility, this));
-       _visibility.add (solo_isolated_led, X_("SoloIsolated"), _("Solo Isolated"), true, boost::bind (&MixerStrip::override_solo_visibility, this));
-       _visibility.add (&_comment_button, X_("Comments"), _("Comments"));
-       _visibility.add (&group_button, X_("Group"), _("Group"));
-       _visibility.add (&meter_point_button, X_("MeterPoint"), _("Meter Point"));
-
-       parameter_changed (X_("mixer-strip-visibility"));
-
+       _visibility.add (&input_button_box, X_("Input"), _("Input"), false);
+       _visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert"), false);
+       _visibility.add (&rec_mon_table, X_("RecMon"), _("Record & Monitor"), false);
+       _visibility.add (&solo_iso_table, X_("SoloIsoLock"), _("Solo Iso / Lock"), false);
+       _visibility.add (&output_button, X_("Output"), _("Output"), false);
+       _visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
+       _visibility.add (&control_slave_ui, X_("VCA"), _("VCA Assigns"), false);
+
+       parameter_changed (X_("mixer-element-visibility"));
+       UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &MixerStrip::parameter_changed));
        Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context());
        _session->config.ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context());
 
+       //watch for mouse enter/exit so we can do some stuff
+       signal_enter_notify_event().connect (sigc::mem_fun(*this, &MixerStrip::mixer_strip_enter_event ));
+       signal_leave_notify_event().connect (sigc::mem_fun(*this, &MixerStrip::mixer_strip_leave_event ));
+
        gpm.LevelMeterButtonPress.connect_same_thread (_level_meter_connection, boost::bind (&MixerStrip::level_meter_button_press, this, _1));
 }
 
@@ -398,46 +425,135 @@ MixerStrip::~MixerStrip ()
 {
        CatchDeletion (this);
 
-       delete input_selector;
-       delete output_selector;
-       delete comment_window;
+       if (this ==_entered_mixer_strip)
+               _entered_mixer_strip = NULL;
 }
 
 void
-MixerStrip::set_route (boost::shared_ptr<Route> rt)
+MixerStrip::vca_assign (boost::shared_ptr<ARDOUR::VCA> vca)
 {
-       if (rec_enable_button->get_parent()) {
-               rec_solo_table.remove (*rec_enable_button);
+       boost::shared_ptr<Slavable> sl = boost::dynamic_pointer_cast<Slavable> ( route() );
+       if (sl)
+               sl->assign(vca);
+}
+
+void
+MixerStrip::vca_unassign (boost::shared_ptr<ARDOUR::VCA> vca)
+{
+       boost::shared_ptr<Slavable> sl = boost::dynamic_pointer_cast<Slavable> ( route() );
+       if (sl)
+               sl->unassign(vca);
+}
+
+bool
+MixerStrip::mixer_strip_enter_event (GdkEventCrossing* /*ev*/)
+{
+       _entered_mixer_strip = this;
+
+       //although we are triggering on the "enter", to the user it will appear that it is happenin on the "leave"
+       //because the mixerstrip control is a parent that encompasses the strip
+       deselect_all_processors();
+
+       return false;
+}
+
+bool
+MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev)
+{
+       //if we have moved outside our strip, but not into a child view, then deselect ourselves
+       if ( !(ev->detail == GDK_NOTIFY_INFERIOR) ) {
+               _entered_mixer_strip= 0;
+
+               //clear keyboard focus in the gain display.  this is cheesy but fixes a longstanding "bug" where the user starts typing in the gain entry, and leaves it active, thereby prohibiting other keybindings from working
+               gpm.gain_display.set_sensitive(false);
+               gpm.show_gain();
+               gpm.gain_display.set_sensitive(true);
+
+               //if we leave this mixer strip we need to clear out any selections
+               //processor_box.processor_display.select_none();  //but this doesn't work, because it gets triggered when (for example) you open the menu or start a drag
+       }
+
+       return false;
+}
+
+string
+MixerStrip::name() const
+{
+       if (_route) {
+               return _route->name();
+       }
+       return string();
+}
+
+void
+MixerStrip::update_trim_control ()
+{
+       if (route()->trim() && route()->trim()->active() &&
+           route()->n_inputs().n_audio() > 0) {
+               trim_control.show ();
+               trim_control.set_controllable (route()->trim()->gain_control());
+       } else {
+               trim_control.hide ();
+               boost::shared_ptr<Controllable> none;
+               trim_control.set_controllable (none);
+       }
+}
+
+void
+MixerStrip::trim_start_touch ()
+{
+       assert (_route && _session);
+       if (route()->trim() && route()->trim()->active() && route()->n_inputs().n_audio() > 0) {
+               route()->trim()->gain_control ()->start_touch (_session->transport_frame());
+       }
+}
+
+void
+MixerStrip::trim_end_touch ()
+{
+       assert (_route && _session);
+       if (route()->trim() && route()->trim()->active() && route()->n_inputs().n_audio() > 0) {
+               route()->trim()->gain_control ()->stop_touch (_session->transport_frame());
        }
+}
 
+void
+MixerStrip::set_route (boost::shared_ptr<Route> rt)
+{
+       //the rec/monitor stuff only shows up for tracks.
+       //the show_sends only shows up for buses.
+       //remove them all here, and we may add them back later
        if (show_sends_button->get_parent()) {
-               rec_solo_table.remove (*show_sends_button);
+               rec_mon_table.remove (*show_sends_button);
+       }
+       if (rec_enable_button->get_parent()) {
+               rec_mon_table.remove (*rec_enable_button);
+       }
+       if (monitor_input_button->get_parent()) {
+               rec_mon_table.remove (*monitor_input_button);
+       }
+       if (monitor_disk_button->get_parent()) {
+               rec_mon_table.remove (*monitor_disk_button);
+       }
+       if (group_button.get_parent()) {
+               bottom_button_table.remove (group_button);
        }
 
        RouteUI::set_route (rt);
 
+       control_slave_ui.set_stripable (boost::dynamic_pointer_cast<Stripable> (rt));
+
        /* ProcessorBox needs access to _route so that it can read
           GUI object state.
        */
        processor_box.set_route (rt);
 
-       /* map the current state */
-
-       mute_changed (0);
-       update_solo_display ();
-
-       delete input_selector;
-       input_selector = 0;
-
-       delete output_selector;
-       output_selector = 0;
-
        revert_to_default_display ();
 
        /* unpack these from the parent and stuff them into our own
           table
        */
-       
+
        if (gpm.peak_display.get_parent()) {
                gpm.peak_display.get_parent()->remove (gpm.peak_display);
        }
@@ -446,42 +562,52 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        gpm.set_type (rt->meter_type());
-       
-       middle_button_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND);
-       middle_button_table.attach (gpm.peak_display,1,2,1,2);
+
+       mute_solo_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND);
+       mute_solo_table.attach (gpm.peak_display,1,2,1,2, EXPAND|FILL, EXPAND);
 
        if (solo_button->get_parent()) {
-               middle_button_table.remove (*solo_button);
+               mute_solo_table.remove (*solo_button);
        }
 
        if (mute_button->get_parent()) {
-               middle_button_table.remove (*mute_button);
+               mute_solo_table.remove (*mute_button);
        }
 
        if (route()->is_master()) {
-               middle_button_table.attach (*mute_button, 0, 2, 0, 1);
                solo_button->hide ();
                mute_button->show ();
-               rec_solo_table.hide ();
+               rec_mon_table.hide ();
+               solo_iso_table.set_sensitive(false);
+               control_slave_ui.set_sensitive(false);
+               if (monitor_section_button == 0) {
+                       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
+                       _session->MonitorChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_changed, this), gui_context());
+
+                       monitor_section_button = manage (new ArdourButton);
+                       monitor_changed ();
+                       monitor_section_button->set_related_action (act);
+                       set_tooltip (monitor_section_button, _("Show/Hide Monitoring Section"));
+                       mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1);
+                       monitor_section_button->show();
+                       monitor_section_button->unset_flags (Gtk::CAN_FOCUS);
+               }
+               parameter_changed ("use-monitor-bus");
        } else {
-               middle_button_table.attach (*mute_button, 0, 1, 0, 1);
-               middle_button_table.attach (*solo_button, 1, 2, 0, 1);
+               bottom_button_table.attach (group_button, 1, 2, 0, 1);
+               mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
+               mute_solo_table.attach (*solo_button, 1, 2, 0, 1);
                mute_button->show ();
                solo_button->show ();
-               rec_solo_table.show ();
+               rec_mon_table.show ();
+               solo_iso_table.set_sensitive(true);
+               control_slave_ui.set_sensitive(true);
        }
 
-       if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {
-
-               if (scrollbar_height == 0) {
-                       HScrollbar scrollbar;
-                       Gtk::Requisition requisition(scrollbar.size_request ());
-                       scrollbar_height = requisition.height;
-               }
-
-               spacer = manage (new EventBox);
-               spacer->set_size_request (-1, scrollbar_height);
-               global_vpacker.pack_start (*spacer, false, false);
+       if (_mixer_owned && route()->is_master() ) {
+               spacer.show();
+       } else {
+               spacer.hide();
        }
 
        if (is_track()) {
@@ -492,14 +618,17 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                monitor_disk_button->hide ();
        }
 
+       update_trim_control();
+
        if (is_midi_track()) {
                if (midi_input_enable_button == 0) {
                        midi_input_enable_button = manage (new ArdourButton);
                        midi_input_enable_button->set_name ("midi input button");
-                       midi_input_enable_button->set_image (::get_icon (X_("midi_socket_small")));
+                       midi_input_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+                       midi_input_enable_button->set_icon (ArdourIcon::DinMidi);
                        midi_input_enable_button->signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_press), false);
                        midi_input_enable_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false);
-                       ARDOUR_UI::instance()->set_tip (midi_input_enable_button, _("Enable/Disable MIDI input"));
+                       set_tooltip (midi_input_enable_button, _("Enable/Disable MIDI input"));
                } else {
                        input_button_box.remove (*midi_input_enable_button);
                }
@@ -523,12 +652,17 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        if (is_track ()) {
 
-               rec_solo_table.attach (*rec_enable_button, 0, 1, 0, 2);
-               rec_enable_button->set_sensitive (_session->writable());
+               rec_mon_table.attach (*rec_enable_button, 0, 1, 0, ARDOUR::Profile->get_mixbus() ? 1 : 2);
                rec_enable_button->show();
 
-               if (ARDOUR::Profile->get_trx()) {
-                       rec_solo_table.attach (*monitor_input_button, 1, 2, 0, 2);
+               if (ARDOUR::Profile->get_mixbus()) {
+                       rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
+                       rec_mon_table.attach (*monitor_disk_button, 2, 3, 0, 1);
+               } else if (ARDOUR::Profile->get_trx()) {
+                       rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 2);
+               } else {
+                       rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
+                       rec_mon_table.attach (*monitor_disk_button, 1, 2, 1, 2);
                }
 
        } else {
@@ -536,18 +670,18 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                /* non-master bus */
 
                if (!_route->is_master()) {
-                       rec_solo_table.attach (*show_sends_button, 0, 1, 0, 2);
+                       rec_mon_table.attach (*show_sends_button, 0, 1, 0, 2);
                        show_sends_button->show();
                }
        }
 
-       meter_point_button.set_text (meter_point_string (_route->meter_point()));
+       gpm.meter_point_button.set_text (meter_point_string (_route->meter_point()));
 
        delete route_ops_menu;
        route_ops_menu = 0;
 
        _route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context());
-       _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_output_display, this), gui_context());
+       _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_input_display, this), gui_context());
        _route->output()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_output_display, this), gui_context());
        _route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context());
 
@@ -562,18 +696,18 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context());
        }
 
-       _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::comment_changed, this, _1), gui_context());
-       _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context());
+       _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::setup_comment_button, this), gui_context());
 
        set_stuff_from_route ();
 
        /* now force an update of all the various elements */
 
-       mute_changed (0);
+       update_mute_display ();
        update_solo_display ();
        name_changed ();
-       comment_changed (0);
+       comment_changed ();
        route_group_changed ();
+       update_track_number_visibility ();
 
        connect_to_pan ();
        panners.setup_pan ();
@@ -602,17 +736,14 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        gpm.gain_display.show ();
        gpm.peak_display.show ();
 
-       top_event_box.show();
        width_button.show();
        width_hide_box.show();
-       whvbox.show ();
        global_frame.show();
        global_vpacker.show();
-       button_table.show();
-       middle_button_table.show();
+       mute_solo_table.show();
        bottom_button_table.show();
        gpm.show_all ();
-       meter_point_button.show();
+       gpm.meter_point_button.show();
        input_button_box.show_all();
        output_button.show();
        name_button.show();
@@ -620,7 +751,8 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        group_button.show();
        gpm.gain_automation_state_button.show();
 
-       parameter_changed ("mixer-strip-visibility");
+       parameter_changed ("mixer-element-visibility");
+       map_frozen();
 
        show ();
 }
@@ -630,9 +762,9 @@ MixerStrip::set_stuff_from_route ()
 {
        /* if width is not set, it will be set by the MixerUI or editor */
 
-       string str = gui_property ("strip-width");
-       if (!str.empty()) {
-               set_width_enum (Width (string_2_enum (str, _width)), this);
+       Width width;
+       if (get_gui_property ("strip-width", width)) {
+               set_width_enum (width, this);
        }
 }
 
@@ -651,34 +783,34 @@ MixerStrip::set_width_enum (Width w, void* owner)
        _width = w;
 
        if (_width_owner == this) {
-               set_gui_property ("strip-width", enum_2_string (_width));
+               set_gui_property ("strip-width", _width);
        }
 
        set_button_names ();
 
+       const float scale = std::max(1.f, UIConfiguration::instance().get_ui_scale());
+
        switch (w) {
        case Wide:
 
                if (show_sends_button)  {
-                       show_sends_button->set_text (_("Aux\nSends"));
-                       show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER);
+                       show_sends_button->set_text (_("Aux"));
                }
 
-               gpm.gain_automation_style_button.set_text (
-                               gpm.astyle_string(gain_automation->automation_style()));
                gpm.gain_automation_state_button.set_text (
                                gpm.astate_string(gain_automation->automation_state()));
 
                if (_route->panner()) {
-                       ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (
-                                       panners.astyle_string(_route->panner()->automation_style()));
                        ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (
                                        panners.astate_string(_route->panner()->automation_state()));
                }
 
-
-               Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
-               set_size_request (-1, -1);
+               {
+                       // panners expect an even number of horiz. pixels
+                       int width = rintf (max (110.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1;
+                       width &= ~1;
+                       set_size_request (width, -1);
+               }
                break;
 
        case Narrow:
@@ -687,21 +819,21 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        show_sends_button->set_text (_("Snd"));
                }
 
-               gpm.gain_automation_style_button.set_text (
-                               gpm.short_astyle_string(gain_automation->automation_style()));
                gpm.gain_automation_state_button.set_text (
                                gpm.short_astate_string(gain_automation->automation_state()));
                gain_meter().setup_meters (); // recalc meter width
 
                if (_route->panner()) {
-                       ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (
-                       panners.short_astyle_string(_route->panner()->automation_style()));
                        ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
 
-               Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
-               set_size_request (max (50, gpm.get_gm_width()), -1);
+               {
+                       // panners expect an even number of horiz. pixels
+                       int width = rintf (max (60.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1;
+                       width &= ~1;
+                       set_size_request (width, -1);
+               }
                break;
        }
 
@@ -719,12 +851,7 @@ void
 MixerStrip::set_packed (bool yn)
 {
        _packed = yn;
-
-       if (_packed) {
-               set_gui_property ("visible", true);
-       } else {
-               set_gui_property ("visible", false);
-       }
+       set_gui_property ("visible", _packed);
 }
 
 
@@ -734,6 +861,18 @@ struct RouteCompareByName {
        }
 };
 
+gint
+MixerStrip::output_release (GdkEventButton *ev)
+{
+       switch (ev->button) {
+       case 3:
+               edit_output_configuration ();
+               break;
+       }
+
+       return false;
+}
+
 gint
 MixerStrip::output_press (GdkEventButton *ev)
 {
@@ -747,11 +886,10 @@ MixerStrip::output_press (GdkEventButton *ev)
        MenuList& citems = output_menu.items();
        switch (ev->button) {
 
-       case 1:
-               edit_output_configuration ();
-               break;
-
        case 3:
+               return false;  //wait for the mouse-up to pop the dialog
+
+       case 1:
        {
                output_menu.set_name ("ArdourContextMenu");
                citems.clear ();
@@ -759,15 +897,6 @@ MixerStrip::output_press (GdkEventButton *ev)
 
                citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
 
-               for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
-                       citems.push_back (
-                               MenuElem (
-                                       string_compose ("Add %1 port", (*i).to_i18n_string()),
-                                       sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i)
-                                       )
-                               );
-               }
-               
                citems.push_back (SeparatorElem());
                uint32_t const n_with_separator = citems.size ();
 
@@ -775,33 +904,61 @@ MixerStrip::output_press (GdkEventButton *ev)
 
                boost::shared_ptr<ARDOUR::BundleList> b = _session->bundles ();
 
-               /* give user bundles first chance at being in the menu */
+               /* guess the user-intended main type of the route output */
+               DataType intended_type = guess_main_type(false);
+
+               /* try adding the master bus first */
+               boost::shared_ptr<Route> master = _session->master_out();
+               if (master) {
+                       maybe_add_bundle_to_output_menu (master->input()->bundle(), current, intended_type);
+               }
+
+               /* then other routes inputs */
+               boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
+               RouteList copy = *routes;
+               copy.sort (RouteCompareByName ());
+               for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
+                       maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current, intended_type);
+               }
 
+               /* then try adding user bundles, often labeled/grouped physical inputs */
                for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
                        if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
-                               maybe_add_bundle_to_output_menu (*i, current);
+                               maybe_add_bundle_to_output_menu (*i, current, intended_type);
                        }
                }
 
+               /* then all other bundles, including physical outs or other sofware */
                for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
                        if (boost::dynamic_pointer_cast<UserBundle> (*i) == 0) {
-                               maybe_add_bundle_to_output_menu (*i, current);
+                               maybe_add_bundle_to_output_menu (*i, current, intended_type);
                        }
                }
 
-               boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
-               RouteList copy = *routes;
-               copy.sort (RouteCompareByName ());
-               for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
-                       maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current);
-               }
-
                if (citems.size() == n_with_separator) {
                        /* no routes added; remove the separator */
                        citems.pop_back ();
                }
 
-               output_menu.popup (1, ev->time);
+               if (!ARDOUR::Profile->get_mixbus()) {
+                       citems.push_back (SeparatorElem());
+
+                       for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+                               citems.push_back (
+                                               MenuElem (
+                                                       string_compose (_("Add %1 port"), (*i).to_i18n_string()),
+                                                       sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i)
+                                                       )
+                                               );
+                       }
+               }
+
+               citems.push_back (SeparatorElem());
+               citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::edit_output_configuration)));
+
+               Gtkmm2ext::anchored_menu_popup(&output_menu, &output_button, "",
+                                              1, ev->time);
+
                break;
        }
 
@@ -811,51 +968,22 @@ MixerStrip::output_press (GdkEventButton *ev)
        return TRUE;
 }
 
-void
-MixerStrip::edit_output_configuration ()
+gint
+MixerStrip::input_release (GdkEventButton *ev)
 {
-       if (output_selector == 0) {
-
-               boost::shared_ptr<Send> send;
-               boost::shared_ptr<IO> output;
-
-               if ((send = boost::dynamic_pointer_cast<Send>(_current_delivery)) != 0) {
-                       if (!boost::dynamic_pointer_cast<InternalSend>(send)) {
-                               output = send->output();
-                       } else {
-                               output = _route->output ();
-                       }
-               } else {
-                       output = _route->output ();
-               }
+       switch (ev->button) {
 
-               output_selector = new IOSelectorWindow (_session, output);
-       }
+       case 3:
+               edit_input_configuration ();
+               break;
+       default:
+               break;
 
-       if (output_selector->is_visible()) {
-               output_selector->get_toplevel()->get_window()->raise();
-       } else {
-               output_selector->present ();
        }
 
-       output_selector->set_keep_above (true);
+       return false;
 }
 
-void
-MixerStrip::edit_input_configuration ()
-{
-       if (input_selector == 0) {
-               input_selector = new IOSelectorWindow (_session, _route->input());
-       }
-
-       if (input_selector->is_visible()) {
-               input_selector->get_toplevel()->get_window()->raise();
-       } else {
-               input_selector->present ();
-       }
-
-       input_selector->set_keep_above (true);
-}
 
 gint
 MixerStrip::input_press (GdkEventButton *ev)
@@ -872,31 +1000,21 @@ MixerStrip::input_press (GdkEventButton *ev)
                return true;
        }
 
-       if (_session->actively_recording() && _route->record_enabled())
+       if (_session->actively_recording() && is_track() && track()->rec_enable_control()->get_value())
                return true;
 
        switch (ev->button) {
 
-       case 1:
-               edit_input_configuration ();
-               break;
-
        case 3:
+               return false;  //don't handle the mouse-down here.  wait for mouse-up to pop the menu
+
+       case 1:
        {
                citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
 
-               for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
-                       citems.push_back (
-                               MenuElem (
-                                       string_compose ("Add %1 port", (*i).to_i18n_string()),
-                                       sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i)
-                                       )
-                               );
-               }
-
                citems.push_back (SeparatorElem());
                uint32_t const n_with_separator = citems.size ();
-               
+
                input_menu_bundles.clear ();
 
                ARDOUR::BundleList current = _route->input()->bundles_connected ();
@@ -929,7 +1047,22 @@ MixerStrip::input_press (GdkEventButton *ev)
                        citems.pop_back ();
                }
 
-               input_menu.popup (1, ev->time);
+               citems.push_back (SeparatorElem());
+               for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+                       citems.push_back (
+                               MenuElem (
+                                       string_compose (_("Add %1 port"), (*i).to_i18n_string()),
+                                       sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i)
+                                       )
+                               );
+               }
+
+               citems.push_back (SeparatorElem());
+               citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::edit_input_configuration)));
+
+               Gtkmm2ext::anchored_menu_popup(&input_menu, &input_button, "",
+                                              1, ev->time);
+
                break;
        }
        default:
@@ -945,13 +1078,7 @@ MixerStrip::bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
                return;
        }
 
-       ARDOUR::BundleList current = _route->input()->bundles_connected ();
-
-       if (std::find (current.begin(), current.end(), c) == current.end()) {
-               _route->input()->connect_ports_to_bundle (c, true, this);
-       } else {
-               _route->input()->disconnect_ports_from_bundle (c, this);
-       }
+       _route->input()->connect_ports_to_bundle (c, true, this);
 }
 
 void
@@ -961,13 +1088,7 @@ MixerStrip::bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
                return;
        }
 
-       ARDOUR::BundleList current = _route->output()->bundles_connected ();
-
-       if (std::find (current.begin(), current.end(), c) == current.end()) {
-               _route->output()->connect_ports_to_bundle (c, true, this);
-       } else {
-               _route->output()->disconnect_ports_from_bundle (c, this);
-       }
+       _route->output()->connect_ports_to_bundle (c, true, true, this);
 }
 
 void
@@ -975,9 +1096,9 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR:
 {
        using namespace Menu_Helpers;
 
-       if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) {
-               return;
-       }
+       if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) {
+               return;
+       }
 
        list<boost::shared_ptr<Bundle> >::iterator i = input_menu_bundles.begin ();
        while (i != input_menu_bundles.end() && b->has_same_ports (*i) == false) {
@@ -991,49 +1112,59 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR:
        input_menu_bundles.push_back (b);
 
        MenuList& citems = input_menu.items();
-
-       std::string n = b->name ();
-       replace_all (n, "_", " ");
-
-       citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_chosen), b)));
+       citems.push_back (MenuElemNoMnemonic (b->name (), sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_chosen), b)));
 }
 
 void
-MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const& /*current*/)
+MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const& /*current*/,
+                                             DataType type)
 {
        using namespace Menu_Helpers;
 
-       if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) {
-               return;
-       }
+       /* The bundle should be an input one, but not ours */
+       if (b->ports_are_inputs() == false || *b == *_route->input()->bundle()) {
+               return;
+       }
 
+       /* Don't add the monitor input unless we are Master */
+       boost::shared_ptr<Route> monitor = _session->monitor_out();
+       if ((!_route->is_master()) && monitor && b->has_same_ports (monitor->input()->bundle()))
+               return;
+
+       /* It should either match exactly our outputs (if |type| is DataType::NIL)
+        * or have the same number of |type| channels than our outputs. */
+       if (type == DataType::NIL) {
+               if(b->nchannels() != _route->n_outputs())
+                       return;
+       } else {
+               if (b->nchannels().n(type) != _route->n_outputs().n(type))
+                       return;
+       }
+
+       /* Avoid adding duplicates */
        list<boost::shared_ptr<Bundle> >::iterator i = output_menu_bundles.begin ();
        while (i != output_menu_bundles.end() && b->has_same_ports (*i) == false) {
                ++i;
        }
-
        if (i != output_menu_bundles.end()) {
                return;
        }
 
+       /* Now add the bundle to the menu */
        output_menu_bundles.push_back (b);
 
        MenuList& citems = output_menu.items();
-
-       std::string n = b->name ();
-       replace_all (n, "_", " ");
-
-       citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_chosen), b)));
+       citems.push_back (MenuElemNoMnemonic (b->name (), sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_chosen), b)));
 }
 
 void
 MixerStrip::update_diskstream_display ()
 {
-        if (is_track() && input_selector) {
-                        input_selector->hide_all ();
-        }
+       if (is_track() && input_selector) {
+               input_selector->hide_all ();
+       }
 
-        route_color_changed ();
+       route_color_changed ();
 }
 
 void
@@ -1051,7 +1182,6 @@ MixerStrip::connect_to_pan ()
        boost::shared_ptr<Pannable> p = _route->pannable ();
 
        p->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context());
-       p->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context());
 
        /* This call reduncant, PannerUI::set_panner() connects to _panshell->Changed itself
         * However, that only works a panner was previously set.
@@ -1081,6 +1211,53 @@ MixerStrip::update_panner_choices ()
        panners.set_available_panners(PannerManager::instance().PannerManager::get_available_panners(in, out));
 }
 
+DataType
+MixerStrip::guess_main_type(bool for_input, bool favor_connected) const
+{
+       /* The heuristic follows these principles:
+        *  A) If all ports that the user connected are of the same type, then he
+        *     very probably intends to use the IO with that type. A common subcase
+        *     is when the IO has only ports of the same type (connected or not).
+        *  B) If several types of ports are connected, then we should guess based
+        *     on the likeliness of the user wanting to use a given type.
+        *     We assume that the DataTypes are ordered from the most likely to the
+        *     least likely when iterating or comparing them with "<".
+        *  C) If no port is connected, the same logic can be applied with all ports
+        *     instead of connected ones. TODO: Try other ideas, for instance look at
+        *     the last plugin output when |for_input| is false (note: when StrictIO
+        *     the outs of the last plugin should be the same as the outs of the route
+        *     modulo the panner which forwards non-audio anyway).
+        * All of these constraints are respected by the following algorithm that
+        * just returns the most likely datatype found in connected ports if any, or
+        * available ports if any (since if all ports are of the same type, the most
+        * likely found will be that one obviously). */
+
+       boost::shared_ptr<IO> io = for_input ? _route->input() : _route->output();
+
+       /* Find most likely type among connected ports */
+       if (favor_connected) {
+               DataType type = DataType::NIL; /* NIL is always last so least likely */
+               for (PortSet::iterator p = io->ports().begin(); p != io->ports().end(); ++p) {
+                       if (p->connected() && p->type() < type)
+                               type = p->type();
+               }
+               if (type != DataType::NIL) {
+                       /* There has been a connected port (necessarily non-NIL) */
+                       return type;
+               }
+       }
+
+       /* Find most likely type among available ports.
+        * The iterator stops before NIL. */
+       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+               if (io->n_ports().n(*t) > 0)
+                       return *t;
+       }
+
+       /* No port at all, return the most likely datatype by default */
+       return DataType::front();
+}
+
 /*
  * Output port labelling
  * =====================
@@ -1121,180 +1298,215 @@ MixerStrip::update_panner_choices ()
  */
 
 void
-MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width width, bool for_input)
+MixerStrip::update_io_button (bool for_input)
 {
-       uint32_t io_count;
-       uint32_t io_index;
-       boost::shared_ptr<Port> port;
-       vector<string> port_connections;
-
-       uint32_t total_connection_count = 0;
-       uint32_t io_connection_count = 0;
-       uint32_t ardour_connection_count = 0;
-       uint32_t system_connection_count = 0;
-       uint32_t other_connection_count = 0;
-
+       ostringstream tooltip;
        ostringstream label;
-       string label_string;
-
        bool have_label = false;
-       bool each_io_has_one_connection = true;
 
-       string connection_name;
-       string ardour_track_name;
-       string other_connection_type;
-       string system_ports;
-       string system_port;
+       uint32_t total_connection_count = 0;
+       uint32_t typed_connection_count = 0;
+       bool each_typed_port_has_one_connection = true;
 
-       ostringstream tooltip;
-       char * tooltip_cstr;
+       DataType dt = guess_main_type(for_input);
+       boost::shared_ptr<IO> io = for_input ? _route->input() : _route->output();
 
+       /* Fill in the tooltip. Also count:
+        *  - The total number of connections.
+        *  - The number of main-typed connections.
+        *  - Whether each main-typed port has exactly one connection. */
        if (for_input) {
-               io_count = route->n_inputs().n_total();
-               tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name()));
+               tooltip << string_compose (_("<b>INPUT</b> to %1"),
+                               Gtkmm2ext::markup_escape_text (_route->name()));
        } else {
-               io_count = route->n_outputs().n_total();
-               tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Glib::Markup::escape_text(route->name()));
+               tooltip << string_compose (_("<b>OUTPUT</b> from %1"),
+                               Gtkmm2ext::markup_escape_text (_route->name()));
        }
 
-
-       for (io_index = 0; io_index < io_count; ++io_index) {
-               if (for_input) {
-                       port = route->input()->nth (io_index);
-               } else {
-                       port = route->output()->nth (io_index);
-               }
-
-               port_connections.clear ();
+       string arrow = Gtkmm2ext::markup_escape_text(for_input ? " <- " : " -> ");
+       vector<string> port_connections;
+       for (PortSet::iterator port = io->ports().begin();
+                              port != io->ports().end();
+                              ++port) {
+               port_connections.clear();
                port->get_connections(port_connections);
-               io_connection_count = 0;
 
-               if (!port_connections.empty()) {
-                       for (vector<string>::iterator i = port_connections.begin(); i != port_connections.end(); ++i) {
-                               string& connection_name (*i);
+               uint32_t port_connection_count = 0;
 
-                               if (io_connection_count == 0) {
-                                       tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name);
-                               } else {
-                                       tooltip << ", " << Glib::Markup::escape_text(connection_name);
-                               }
-
-                               if (connection_name.find("ardour:") == 0) {
-                                       if (ardour_track_name.empty()) {
-                                               // "ardour:Master/in 1" -> "ardour:Master/"
-                                               string::size_type slash = connection_name.find("/");
-                                               if (slash != string::npos) {
-                                                       ardour_track_name = connection_name.substr(0, slash + 1);
-                                               }
-                                       }
-
-                                       if (connection_name.find(ardour_track_name) == 0) {
-                                               ++ardour_connection_count;
-                                       }
-                               } else if (connection_name.find("system:") == 0) {
-                                       if (for_input) {
-                                               // "system:capture_123" -> "123"
-                                               system_port = connection_name.substr(15);
-                                       } else {
-                                               // "system:playback_123" -> "123"
-                                               system_port = connection_name.substr(16);
-                                       }
-
-                                       if (system_ports.empty()) {
-                                               system_ports += system_port;
-                                       } else {
-                                               system_ports += "/" + system_port;
-                                       }
+               for (vector<string>::iterator i = port_connections.begin();
+                                             i != port_connections.end();
+                                             ++i) {
+                       ++port_connection_count;
 
-                                       ++system_connection_count;
-                               } else {
-                                       if (other_connection_type.empty()) {
-                                               // "jamin:in 1" -> "jamin:"
-                                               other_connection_type = connection_name.substr(0, connection_name.find(":") + 1);
-                                       }
-
-                                       if (connection_name.find(other_connection_type) == 0) {
-                                               ++other_connection_count;
-                                       }
-                               }
-
-                               ++total_connection_count;
-                               ++io_connection_count;
+                       if (port_connection_count == 1) {
+                               tooltip << endl << Gtkmm2ext::markup_escape_text (
+                                               port->name().substr(port->name().find("/") + 1));
+                               tooltip << arrow;
+                       } else {
+                               tooltip << ", ";
                        }
+
+                       tooltip << Gtkmm2ext::markup_escape_text(*i);
                }
 
-               if (io_connection_count != 1) {
-                       each_io_has_one_connection = false;
+               total_connection_count += port_connection_count;
+               if (port->type() == dt) {
+                       typed_connection_count += port_connection_count;
+                       each_typed_port_has_one_connection &= (port_connection_count == 1);
                }
+
        }
 
        if (total_connection_count == 0) {
                tooltip << endl << _("Disconnected");
        }
 
-       tooltip_cstr = new char[tooltip.str().size() + 1];
-       strcpy(tooltip_cstr, tooltip.str().c_str());
+       if (typed_connection_count == 0) {
+               label << "-";
+               have_label = true;
+       }
 
-       if (for_input) {
-               ARDOUR_UI::instance()->set_tip (&input_button, tooltip_cstr, "");
-       } else {
-               ARDOUR_UI::instance()->set_tip (&output_button, tooltip_cstr, "");
-       }
-
-       if (each_io_has_one_connection) {
-               if (total_connection_count == ardour_connection_count) {
-                       // all connections are to the same track in ardour
-                       // "ardour:Master/" -> "Master"
-                       string::size_type slash = ardour_track_name.find("/");
-                       if (slash != string::npos) {
-                               label << ardour_track_name.substr(7, slash - 7);
+       /* Are all main-typed channels connected to the same route ? */
+       if (!have_label) {
+               boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
+               for (ARDOUR::RouteList::const_iterator route = routes->begin();
+                                                      route != routes->end();
+                                                      ++route) {
+                       boost::shared_ptr<IO> dest_io =
+                               for_input ? (*route)->output() : (*route)->input();
+                       if (io->bundle()->connected_to(dest_io->bundle(),
+                                                      _session->engine(),
+                                                      dt, true)) {
+                               label << Gtkmm2ext::markup_escape_text ((*route)->name());
                                have_label = true;
+                               break;
+                       }
+               }
+       }
+
+       /* Are all main-typed channels connected to the same (user) bundle ? */
+       if (!have_label) {
+               boost::shared_ptr<ARDOUR::BundleList> bundles = _session->bundles ();
+               for (ARDOUR::BundleList::iterator bundle = bundles->begin();
+                                                 bundle != bundles->end();
+                                                 ++bundle) {
+                       if (boost::dynamic_pointer_cast<UserBundle> (*bundle) == 0)
+                               continue;
+                       if (io->bundle()->connected_to(*bundle, _session->engine(),
+                                                      dt, true)) {
+                               label << Gtkmm2ext::markup_escape_text ((*bundle)->name());
+                               have_label = true;
+                               break;
+                       }
+               }
+       }
+
+       /* Is each main-typed channel only connected to a physical output ? */
+       if (!have_label && each_typed_port_has_one_connection) {
+               ostringstream temp_label;
+               vector<string> phys;
+               string playorcapture;
+               if (for_input) {
+                       _session->engine().get_physical_inputs(dt, phys);
+                       playorcapture = "capture_";
+               } else {
+                       _session->engine().get_physical_outputs(dt, phys);
+                       playorcapture = "playback_";
+               }
+               for (PortSet::iterator port = io->ports().begin(dt);
+                                      port != io->ports().end(dt);
+                                      ++port) {
+                       string pn = "";
+                       for (vector<string>::iterator s = phys.begin();
+                                                     s != phys.end();
+                                                     ++s) {
+                               if (!port->connected_to(*s))
+                                       continue;
+                               pn = AudioEngine::instance()->get_pretty_name_by_name(*s);
+                               if (pn.empty()) {
+                                       string::size_type start = (*s).find(playorcapture);
+                                       if (start != string::npos) {
+                                               pn = (*s).substr(start + playorcapture.size());
+                                       }
+                               }
+                               break;
+                       }
+                       if (pn.empty()) {
+                               temp_label.str(""); /* erase the failed attempt */
+                               break;
                        }
+                       if (port != io->ports().begin(dt))
+                               temp_label << "/";
+                       temp_label << pn;
                }
-               else if (total_connection_count == system_connection_count) {
-                       // all connections are to system ports
-                       label << system_ports;
+
+               if (!temp_label.str().empty()) {
+                       label << temp_label.str();
                        have_label = true;
                }
-               else if (total_connection_count == other_connection_count) {
-                       // all connections are to the same external program eg jamin
-                       // "jamin:" -> "jamin"
-                       label << other_connection_type.substr(0, other_connection_type.size() - 1);
+       }
+
+       /* Is each main-typed channel connected to a single and different port with
+        * the same client name (e.g. another JACK client) ? */
+       if (!have_label && each_typed_port_has_one_connection) {
+               string maybe_client = "";
+               vector<string> connections;
+               for (PortSet::iterator port = io->ports().begin(dt);
+                                      port != io->ports().end(dt);
+                                      ++port) {
+                       port_connections.clear();
+                       port->get_connections(port_connections);
+                       string connection = port_connections.front();
+
+                       vector<string>::iterator i = connections.begin();
+                       while (i != connections.end() && *i != connection) {
+                               ++i;
+                       }
+                       if (i != connections.end())
+                               break; /* duplicate connection */
+                       connections.push_back(connection);
+
+                       connection = connection.substr(0, connection.find(":"));
+                       if (maybe_client.empty())
+                               maybe_client = connection;
+                       if (maybe_client != connection)
+                               break;
+               }
+               if (connections.size() == io->n_ports().n(dt)) {
+                       label << maybe_client;
                        have_label = true;
                }
        }
 
+       /* Odd configuration */
        if (!have_label) {
-               if (total_connection_count == 0) {
-                       // Disconnected
-                       label << "-";
-               } else {
-                       // Odd configuration
-                       label << "*" << total_connection_count << "*";
-               }
+               label << "*" << total_connection_count << "*";
        }
 
-       switch (width) {
-       case Wide:
-               label_string = label.str().substr(0, 7);
-               break;
-       case Narrow:
-               label_string = label.str().substr(0, 3);
-               break;
-       }
+       if (total_connection_count > typed_connection_count) {
+               label << "\u2295"; /* circled plus */
+       }
+
+       /* Actually set the properties of the button */
+       char * cstr = new char[tooltip.str().size() + 1];
+       strcpy(cstr, tooltip.str().c_str());
 
        if (for_input) {
-               input_button.set_text (label_string);
+               input_button.set_text (label.str());
+               set_tooltip (&input_button, cstr);
        } else {
-               output_button.set_text (label_string);
+               output_button.set_text (label.str());
+               set_tooltip (&output_button, cstr);
        }
+
+       delete [] cstr;
 }
 
 void
 MixerStrip::update_input_display ()
 {
-       update_io_button (_route, _width, true);
-       panners.setup_pan ();
+       update_io_button (true);
+       panners.setup_pan ();
 
        if (has_audio_outputs ()) {
                panners.show_all ();
@@ -1307,9 +1519,9 @@ MixerStrip::update_input_display ()
 void
 MixerStrip::update_output_display ()
 {
-       update_io_button (_route, _width, false);
-       gpm.setup_meters ();
-       panners.setup_pan ();
+       update_io_button (false);
+       gpm.setup_meters ();
+       panners.setup_pan ();
 
        if (has_audio_outputs ()) {
                panners.show_all ();
@@ -1334,6 +1546,7 @@ void
 MixerStrip::io_changed_proxy ()
 {
        Glib::signal_idle().connect_once (sigc::mem_fun (*this, &MixerStrip::update_panner_choices));
+       Glib::signal_idle().connect_once (sigc::mem_fun (*this, &MixerStrip::update_trim_control));
 }
 
 void
@@ -1356,104 +1569,26 @@ MixerStrip::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost::wea
 void
 MixerStrip::setup_comment_button ()
 {
-       switch (_width) {
-
-       case Wide:
-               if (_route->comment().empty ()) {
-                       _comment_button.unset_bg (STATE_NORMAL);
-                       _comment_button.set_text (_("Comments"));
-               } else {
-                       _comment_button.modify_bg (STATE_NORMAL, color ());
-                       _comment_button.set_text (_("*Comments*"));
-               }
-               break;
-
-       case Narrow:
-               if (_route->comment().empty ()) {
-                       _comment_button.unset_bg (STATE_NORMAL);
-                       _comment_button.set_text (_("Cmt"));
-               } else {
-                       _comment_button.modify_bg (STATE_NORMAL, color ());
-                       _comment_button.set_text (_("*Cmt*"));
-               }
-               break;
-       }
+       std::string comment = _route->comment();
 
-       ARDOUR_UI::instance()->set_tip (
-               _comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
-               );
-}
+       set_tooltip (_comment_button, comment.empty() ? _("Click to add/edit comments") : _route->comment());
 
-void
-MixerStrip::comment_editor_done_editing ()
-{
-       string const str = comment_area->get_buffer()->get_text();
-       if (str == _route->comment ()) {
+       if (comment.empty ()) {
+               _comment_button.set_name ("generic button");
+               _comment_button.set_text (_width  == Wide ? _("Comments") : _("Cmt"));
                return;
        }
 
-       _route->set_comment (str, this);
-       setup_comment_button ();
-}
+       _comment_button.set_name ("comment button");
 
-void
-MixerStrip::toggle_comment_editor ()
-{
-       if (ignore_toggle) {
-               return;
+       string::size_type pos = comment.find_first_of (" \t\n");
+       if (pos != string::npos) {
+               comment = comment.substr (0, pos);
        }
-
-       if (comment_window && comment_window->is_visible ()) {
-               comment_window->hide ();
+       if (comment.empty()) {
+               _comment_button.set_text (_width  == Wide ? _("Comments") : _("Cmt"));
        } else {
-               open_comment_editor ();
-       }
-}
-
-void
-MixerStrip::open_comment_editor ()
-{
-       if (comment_window == 0) {
-               setup_comment_editor ();
-       }
-
-       string title;
-       title = _route->name();
-       title += _(": comment editor");
-
-       comment_window->set_title (title);
-       comment_window->present();
-}
-
-void
-MixerStrip::setup_comment_editor ()
-{
-       comment_window = new ArdourWindow (""); // title will be reset to show route
-       comment_window->set_skip_taskbar_hint (true);
-       comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing));
-       comment_window->set_default_size (400, 200);
-
-       comment_area = manage (new TextView());
-       comment_area->set_name ("MixerTrackCommentArea");
-       comment_area->set_wrap_mode (WRAP_WORD);
-       comment_area->set_editable (true);
-       comment_area->get_buffer()->set_text (_route->comment());
-       comment_area->show ();
-
-       comment_window->add (*comment_area);
-}
-
-void
-MixerStrip::comment_changed (void *src)
-{
-       ENSURE_GUI_THREAD (*this, &MixerStrip::comment_changed, src)
-
-       if (src != this) {
-               ignore_comment_edit = true;
-               if (comment_area) {
-                       comment_area->get_buffer()->set_text (_route->comment());
-               }
-               ignore_comment_edit = false;
+               _comment_button.set_text (comment);
        }
 }
 
@@ -1468,9 +1603,9 @@ MixerStrip::select_route_group (GdkEventButton *ev)
 
                        PropertyList* plist = new PropertyList();
 
-                       plist->add (Properties::gain, true);
-                       plist->add (Properties::mute, true);
-                       plist->add (Properties::solo, true);
+                       plist->add (Properties::group_gain, true);
+                       plist->add (Properties::group_mute, true);
+                       plist->add (Properties::group_solo, true);
 
                        group_menu = new RouteGroupMenu (_session, plist);
                }
@@ -1478,7 +1613,12 @@ MixerStrip::select_route_group (GdkEventButton *ev)
                WeakRouteList r;
                r.push_back (route ());
                group_menu->build (r);
-               group_menu->menu()->popup (1, ev->time);
+
+               RouteGroup *rg = _route->route_group();
+
+               Gtkmm2ext::anchored_menu_popup(group_menu->menu(), &group_button,
+                                              rg ? rg->name() : _("No Group"),
+                                              1, ev->time);
        }
 
        return true;
@@ -1508,8 +1648,8 @@ MixerStrip::route_group_changed ()
 void
 MixerStrip::route_color_changed ()
 {
+       using namespace ARDOUR_UI_UTILS;
        name_button.modify_bg (STATE_NORMAL, color());
-       top_event_box.modify_bg (STATE_NORMAL, color());
        number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
        reset_strip_style ();
 }
@@ -1520,6 +1660,24 @@ MixerStrip::show_passthru_color ()
        reset_strip_style ();
 }
 
+
+void
+MixerStrip::help_count_plugins (boost::weak_ptr<Processor> p)
+{
+       boost::shared_ptr<Processor> processor (p.lock ());
+       if (!processor || !processor->display_to_user()) {
+               return;
+       }
+       boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (processor);
+#ifdef MIXBUS
+       if (pi && pi->is_channelstrip ()) {
+               return;
+       }
+#endif
+       if (pi) {
+               ++_plugin_insert_cnt;
+       }
+}
 void
 MixerStrip::build_route_ops_menu ()
 {
@@ -1529,12 +1687,34 @@ MixerStrip::build_route_ops_menu ()
 
        MenuList& items = route_ops_menu->items();
 
-       items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::open_comment_editor)));
-       if (!_route->is_master()) {
+       items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &RouteUI::choose_color)));
+
+       items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &RouteUI::open_comment_editor)));
+
+       items.push_back (MenuElem (_("Inputs..."), sigc::mem_fun (*this, &RouteUI::edit_input_configuration)));
+
+       items.push_back (MenuElem (_("Outputs..."), sigc::mem_fun (*this, &RouteUI::edit_output_configuration)));
+
+       if (!Profile->get_mixbus()) {
+               items.push_back (SeparatorElem());
+       }
+
+       if (!_route->is_master()
+#ifdef MIXBUS
+                       && !_route->mixbus()
+#endif
+                       ) {
+               if (Profile->get_mixbus()) {
+                       items.push_back (SeparatorElem());
+               }
                items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
        }
-       items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
-       rename_menu_item = &items.back();
+
+       if (!Profile->get_mixbus()) {
+               items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
+               /* do not allow rename if the track is record-enabled */
+               items.back().set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
+       }
 
        items.push_back (SeparatorElem());
        items.push_back (CheckMenuElem (_("Active")));
@@ -1543,8 +1723,28 @@ MixerStrip::build_route_ops_menu ()
        i->set_sensitive(! _session->transport_rolling());
        i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), !_route->active(), false));
 
-       items.push_back (SeparatorElem());
+       if (!Profile->get_mixbus ()) {
+               items.push_back (SeparatorElem());
+               items.push_back (CheckMenuElem (_("Strict I/O")));
+               i = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
+               i->set_active (_route->strict_io());
+               i->signal_activate().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*_route, &Route::set_strict_io), !_route->strict_io())));
+       }
+
+       _plugin_insert_cnt = 0;
+       _route->foreach_processor (sigc::mem_fun (*this, &MixerStrip::help_count_plugins));
+       if (_plugin_insert_cnt > 0) {
+               items.push_back (SeparatorElem());
+               items.push_back (MenuElem (_("Pin Connections..."), sigc::mem_fun (*this, &RouteUI::manage_pins)));
+       }
+
+       if (_route->the_instrument () && _route->the_instrument ()->output_streams().n_audio() > 2) {
+               // TODO ..->n_audio() > 1 && separate_output_groups) hard to check here every time.
+               items.push_back (MenuElem (_("Fan out to Busses"), sigc::bind (sigc::mem_fun (*this, &RouteUI::fan_out), true, true)));
+               items.push_back (MenuElem (_("Fan out to Tracks"), sigc::bind (sigc::mem_fun (*this, &RouteUI::fan_out), false, true)));
+       }
 
+       items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Adjust Latency..."), sigc::mem_fun (*this, &RouteUI::adjust_latency)));
 
        items.push_back (SeparatorElem());
@@ -1552,28 +1752,58 @@ MixerStrip::build_route_ops_menu ()
        denormal_menu_item = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
        denormal_menu_item->set_active (_route->denormal_protection());
 
-       if (!Profile->get_sae()) {
-               items.push_back (SeparatorElem());
-               items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
-       }
+       if (_route) {
+               /* note that this relies on selection being shared across editor and
+                  mixer (or global to the backend, in the future), which is the only
+                  sane thing for users anyway.
+               */
 
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false)));
+               StripableTimeAxisView* stav = PublicEditor::instance().get_stripable_time_axis_by_id (_route->id());
+               if (stav) {
+                       Selection& selection (PublicEditor::instance().get_selection());
+                       if (!selection.selected (stav)) {
+                               selection.set (stav);
+                       }
+
+                       if (!_route->is_master()) {
+                               items.push_back (SeparatorElem());
+                               items.push_back (MenuElem (_("Duplicate..."), sigc::mem_fun (*this, &RouteUI::duplicate_selected_routes)));
+                       }
+
+                       items.push_back (SeparatorElem());
+                       items.push_back (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks)));
+               }
+       }
 }
 
 gboolean
 MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-       /* show menu for either button 1 or 3, so as not to confuse people
-          and also not hide stuff from them.
-       */
+       if (ev->button == 1 || ev->button == 3) {
+               list_route_operations ();
+
+               if (ev->button == 1) {
+                       Gtkmm2ext::anchored_menu_popup(route_ops_menu, &name_button, "",
+                                                      1, ev->time);
+               } else {
+                       route_ops_menu->popup (3, ev->time);
+               }
+
+               return true;
+       }
+
+       return false;
+}
 
-       if (ev->button == 3 || ev->button == 1) {
+gboolean
+MixerStrip::number_button_button_press (GdkEventButton* ev)
+{
+       if (  ev->button == 3 ) {
                list_route_operations ();
 
-               /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!_route->record_enabled());
                route_ops_menu->popup (1, ev->time);
+
+               return true;
        }
 
        return false;
@@ -1590,21 +1820,24 @@ void
 MixerStrip::set_selected (bool yn)
 {
        AxisView::set_selected (yn);
-       if (_selected) {
+
+       if (selected()) {
                global_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
                global_frame.set_name ("MixerStripSelectedFrame");
        } else {
                global_frame.set_shadow_type (Gtk::SHADOW_IN);
                global_frame.set_name ("MixerStripFrame");
        }
+
        global_frame.queue_draw ();
+
+//     if (!yn)
+//             processor_box.deselect_all_processors();
 }
 
 void
-MixerStrip::property_changed (const PropertyChange& what_changed)
+MixerStrip::route_property_changed (const PropertyChange& what_changed)
 {
-       RouteUI::property_changed (what_changed);
-
        if (what_changed.contains (ARDOUR::Properties::name)) {
                name_changed ();
        }
@@ -1614,39 +1847,50 @@ void
 MixerStrip::name_changed ()
 {
        switch (_width) {
-       case Wide:
-               if (_session->config.get_track_name_number()) {
-                       const int64_t track_number = _route->track_number ();
-                       if (track_number == 0) {
-                               number_label.set_text ("-");
-                               number_label.hide();
-                       } else {
-                               number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
-                               number_label.show();
-                       }
-               } else {
-                       number_label.hide();
-               }
-               name_button.set_text (_route->name());
-               break;
-       case Narrow:
-               number_label.hide();
-               if (_session->config.get_track_name_number()) {
-                       name_button.set_markup(track_number_to_string (_route->track_number (), " ",
-                                               PBD::short_version (_route->name (), 5)));
-               } else {
+               case Wide:
+                       name_button.set_text (_route->name());
+                       break;
+               case Narrow:
                        name_button.set_text (PBD::short_version (_route->name(), 5));
+                       break;
+       }
+
+       set_tooltip (name_button, _route->name());
+
+       if (_session->config.get_track_name_number()) {
+               const int64_t track_number = _route->track_number ();
+               if (track_number == 0) {
+                       number_label.set_text ("-");
+               } else {
+                       number_label.set_text (PBD::to_string (abs(_route->track_number ())));
                }
-               break;
+       } else {
+               number_label.set_text ("");
        }
+}
 
-       ARDOUR_UI::instance()->set_tip (name_button, _route->name());
+void
+MixerStrip::input_button_resized (Gtk::Allocation& alloc)
+{
+       input_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
+}
+
+void
+MixerStrip::output_button_resized (Gtk::Allocation& alloc)
+{
+       output_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
 }
 
 void
 MixerStrip::name_button_resized (Gtk::Allocation& alloc)
 {
-       name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE);
+       name_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
+}
+
+void
+MixerStrip::comment_button_resized (Gtk::Allocation& alloc)
+{
+       _comment_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
 }
 
 bool
@@ -1655,7 +1899,7 @@ MixerStrip::width_button_pressed (GdkEventButton* ev)
        if (ev->button != 1) {
                return false;
        }
-       
+
        if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)) && _mixer_owned) {
                switch (_width) {
                case Wide:
@@ -1720,7 +1964,10 @@ MixerStrip::map_frozen ()
                        // XXX need some way, maybe, to retoggle redirect editors
                        break;
                }
+       } else {
+               processor_box.set_sensitive (true);
        }
+       RouteUI::map_frozen ();
 }
 
 void
@@ -1798,48 +2045,48 @@ MixerStrip::meter_point_string (MeterPoint mp)
        case Wide:
                switch (mp) {
                case MeterInput:
-                       return _("in");
+                       return _("In");
                        break;
-                       
+
                case MeterPreFader:
-                       return _("pre");
+                       return _("Pre");
                        break;
-                       
+
                case MeterPostFader:
-                       return _("post");
+                       return _("Post");
                        break;
-                       
+
                case MeterOutput:
-                       return _("out");
+                       return _("Out");
                        break;
-                       
+
                case MeterCustom:
                default:
-                       return _("custom");
+                       return _("Custom");
                        break;
                }
                break;
        case Narrow:
                switch (mp) {
                case MeterInput:
-                       return _("in");
+                       return S_("Meter|In");
                        break;
-                       
+
                case MeterPreFader:
-                       return _("pr");
+                       return S_("Meter|Pr");
                        break;
-                       
+
                case MeterPostFader:
-                       return _("po");
+                       return S_("Meter|Po");
                        break;
-                       
+
                case MeterOutput:
-                       return _("o");
+                       return S_("Meter|O");
                        break;
-                       
+
                case MeterCustom:
                default:
-                       return _("c");
+                       return S_("Meter|C");
                        break;
                }
                break;
@@ -1848,11 +2095,23 @@ MixerStrip::meter_point_string (MeterPoint mp)
        return string();
 }
 
+/** Called when the monitor-section state */
+void
+MixerStrip::monitor_changed ()
+{
+       assert (monitor_section_button);
+       if (_session->monitor_active()) {
+               monitor_section_button->set_name ("master monitor section button active");
+       } else {
+               monitor_section_button->set_name ("master monitor section button normal");
+       }
+}
+
 /** Called when the metering point has changed */
 void
 MixerStrip::meter_changed ()
 {
-       meter_point_button.set_text (meter_point_string (_route->meter_point()));
+       gpm.meter_point_button.set_text (meter_point_string (_route->meter_point()));
        gpm.setup_meters ();
        // reset peak when meter point changes
        gpm.reset_peak_display();
@@ -1893,15 +2152,16 @@ MixerStrip::drop_send ()
        output_button.set_sensitive (true);
        group_button.set_sensitive (true);
        set_invert_sensitive (true);
-       meter_point_button.set_sensitive (true);
+       gpm.meter_point_button.set_sensitive (true);
        mute_button->set_sensitive (true);
        solo_button->set_sensitive (true);
-       rec_enable_button->set_sensitive (true);
        solo_isolated_led->set_sensitive (true);
        solo_safe_led->set_sensitive (true);
        monitor_input_button->set_sensitive (true);
        monitor_disk_button->set_sensitive (true);
        _comment_button.set_sensitive (true);
+       RouteUI::check_rec_enable_sensitivity ();
+       set_button_names (); // update solo button visual state
 }
 
 void
@@ -1924,7 +2184,7 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
        send->set_metering (true);
        _current_delivery->DropReferences.connect (send_gone_connection, invalidator (*this), boost::bind (&MixerStrip::revert_to_default_display, this), gui_context());
 
-       gain_meter().set_controls (_route, send->meter(), send->amp());
+       gain_meter().set_controls (_route, send->meter(), send->amp(), send->gain_control());
        gain_meter().setup_meters ();
 
        uint32_t const in = _current_delivery->pans_required();
@@ -1939,7 +2199,7 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
        input_button.set_sensitive (false);
        group_button.set_sensitive (false);
        set_invert_sensitive (false);
-       meter_point_button.set_sensitive (false);
+       gpm.meter_point_button.set_sensitive (false);
        mute_button->set_sensitive (false);
        solo_button->set_sensitive (false);
        rec_enable_button->set_sensitive (false);
@@ -1963,7 +2223,7 @@ MixerStrip::revert_to_default_display ()
 
        set_current_delivery (_route->main_outs ());
 
-       gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp());
+       gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp(), _route->gain_control());
        gain_meter().setup_meters ();
 
        panner_ui().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner());
@@ -1985,12 +2245,14 @@ MixerStrip::set_button_names ()
 {
        switch (_width) {
        case Wide:
-               rec_enable_button->set_text (_("Rec"));
                mute_button->set_text (_("Mute"));
                monitor_input_button->set_text (_("In"));
                monitor_disk_button->set_text (_("Disk"));
+               if (monitor_section_button) {
+                       monitor_section_button->set_text (_("Mon"));
+               }
 
-               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));
@@ -2007,43 +2269,45 @@ MixerStrip::set_button_names ()
                                break;
                        }
                }
-               solo_isolated_led->set_text (_("iso"));
-               solo_safe_led->set_text (_("lock"));
+               solo_isolated_led->set_text (_("Iso"));
+               solo_safe_led->set_text (S_("SoloLock|Lock"));
                break;
 
        default:
-               rec_enable_button->set_text (_("R"));
-               mute_button->set_text (_("M"));
-               monitor_input_button->set_text (_("I"));
-               monitor_disk_button->set_text (_("D"));
+               mute_button->set_text (S_("Mute|M"));
+               monitor_input_button->set_text (S_("MonitorInput|I"));
+               monitor_disk_button->set_text (S_("MonitorDisk|D"));
+               if (monitor_section_button) {
+                       monitor_section_button->set_text (S_("Mon|O"));
+               }
 
-               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));
                }
                if (!Config->get_solo_control_is_listen_control()) {
-                       solo_button->set_text (_("S"));
+                       solo_button->set_text (S_("Solo|S"));
                } else {
                        switch (Config->get_listen_position()) {
                        case AfterFaderListen:
-                               solo_button->set_text (_("A"));
+                               solo_button->set_text (S_("AfterFader|A"));
                                break;
                        case PreFaderListen:
-                               solo_button->set_text (_("P"));
+                               solo_button->set_text (S_("Prefader|P"));
                                break;
                        }
                }
 
-               solo_isolated_led->set_text (_("i"));
-               solo_safe_led->set_text (_("L"));
+               solo_isolated_led->set_text (S_("SoloIso|I"));
+               solo_safe_led->set_text (S_("SoloLock|L"));
                break;
        }
 
        if (_route) {
-               meter_point_button.set_text (meter_point_string (_route->meter_point()));
+               gpm.meter_point_button.set_text (meter_point_string (_route->meter_point()));
        } else {
-               meter_point_button.set_text ("");
+               gpm.meter_point_button.set_text ("");
        }
 }
 
@@ -2108,10 +2372,29 @@ MixerStrip::parameter_changed (string p)
                /* The user has made changes to the mixer strip visibility, so get
                   our VisibilityGroup to reflect these changes in our widgets.
                */
-               _visibility.set_state (Config->get_mixer_strip_visibility ());
-       }
-       else if (p == "track-name-number") {
+               _visibility.set_state (UIConfiguration::instance().get_mixer_strip_visibility ());
+       } else if (p == "track-name-number") {
                name_changed ();
+       } else if (p == "use-monitor-bus") {
+               if (monitor_section_button) {
+                       if (mute_button->get_parent()) {
+                               mute_button->get_parent()->remove(*mute_button);
+                       }
+                       if (monitor_section_button->get_parent()) {
+                               monitor_section_button->get_parent()->remove(*monitor_section_button);
+                       }
+                       if (Config->get_use_monitor_bus ()) {
+                               mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
+                               mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1);
+                               mute_button->show();
+                               monitor_section_button->show();
+                       } else {
+                               mute_solo_table.attach (*mute_button, 0, 2, 0, 1);
+                               mute_button->show();
+                       }
+               }
+       } else if (p == "track-name-number") {
+               update_track_number_visibility();
        }
 }
 
@@ -2126,7 +2409,7 @@ MixerStrip::override_solo_visibility () const
        if (_route && _route->is_master ()) {
                return boost::optional<bool> (false);
        }
-       
+
        return boost::optional<bool> ();
 }
 
@@ -2173,9 +2456,15 @@ MixerStrip::select_all_processors ()
 }
 
 void
+MixerStrip::deselect_all_processors ()
+{
+       processor_box.processor_operation (ProcessorBox::ProcessorsSelectNone);
+}
+
+bool
 MixerStrip::delete_processors ()
 {
-       processor_box.processor_operation (ProcessorBox::ProcessorsDelete);
+       return processor_box.processor_operation (ProcessorBox::ProcessorsDelete);
 }
 
 void
@@ -2221,10 +2510,17 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
        add_level_meter_item_point (items, group, _("Output"), MeterOutput);
        add_level_meter_item_point (items, group, _("Custom"), MeterCustom);
 
+       if (gpm.meter_channels().n_audio() == 0) {
+               m->popup (ev->button, ev->time);
+               _suspend_menu_callbacks = false;
+               return;
+       }
+
        RadioMenuItem::Group tgroup;
        items.push_back (SeparatorElem());
 
        add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+       add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak0dB), MeterPeak0dB);
        add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterKrms),  MeterKrms);
        add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
        add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);
@@ -2271,7 +2567,7 @@ MixerStrip::add_level_meter_item_point (Menu_Helpers::MenuList& items,
                RadioMenuItem::Group& group, string const & name, MeterPoint point)
 {
        using namespace Menu_Helpers;
-       
+
        items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_point), point)));
        RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
        i->set_active (_route->meter_point() == point);
@@ -2289,7 +2585,7 @@ MixerStrip::add_level_meter_item_type (Menu_Helpers::MenuList& items,
                RadioMenuItem::Group& group, string const & name, MeterType type)
 {
        using namespace Menu_Helpers;
-       
+
        items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_type), type)));
        RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
        i->set_active (_route->meter_type() == type);
@@ -2301,3 +2597,45 @@ MixerStrip::set_meter_type (MeterType t)
        if (_suspend_menu_callbacks) return;
        gpm.set_type (t);
 }
+
+void
+MixerStrip::update_track_number_visibility ()
+{
+       DisplaySuspender ds;
+       bool show_label = _session->config.get_track_name_number();
+
+       if (_route && _route->is_master()) {
+               show_label = false;
+       }
+
+       if (show_label) {
+               number_label.show ();
+               // see ArdourButton::on_size_request(), we should probably use a global size-group here instead.
+               // except the width of the number label is subtracted from the name-hbox, so we
+               // need to explictly calculate it anyway until the name-label & entry become ArdourWidgets.
+               int tnw = (2 + std::max(2u, _session->track_number_decimals())) * number_label.char_pixel_width();
+               if (tnw & 1) --tnw;
+               number_label.set_size_request(tnw, -1);
+               number_label.show ();
+       } else {
+               number_label.hide ();
+       }
+}
+
+Gdk::Color
+MixerStrip::color () const
+{
+       return route_color ();
+}
+
+bool
+MixerStrip::marked_for_display () const
+{
+       return !_route->presentation_info().hidden();
+}
+
+bool
+MixerStrip::set_marked_for_display (bool yn)
+{
+       return RouteUI::mark_hidden (!yn);
+}