Remove <gtkmm.h> include from header files.
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 64f4a64c310e125e1d775fc47de32e48faf20a8c..1b0c82975c88556ef4694c976844c28ac0b8a13a 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;
@@ -78,11 +83,10 @@ using namespace std;
 using namespace ArdourMeter;
 
 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)
@@ -94,11 +98,13 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        , 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"))
        , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
        , _visibility (X_("mixer-element-visibility"))
+       , control_slave_ui (sess)
 {
        init ();
 
@@ -112,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)
@@ -124,11 +130,13 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , 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"))
        , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
        , _visibility (X_("mixer-element-visibility"))
+       , control_slave_ui (sess)
 {
        init ();
        set_route (rt);
@@ -144,7 +152,6 @@ MixerStrip::init ()
        ignore_toggle = false;
        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,15 +160,17 @@ 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_icon (ArdourIcon::StripWidth);
-       ARDOUR_UI::instance()->set_tip (width_button, t);
+       hide_button.set_tweaks (ArdourButton::Square);
+       set_tooltip (width_button, t);
 
        hide_button.set_icon (ArdourIcon::CloseCross);
-       ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
+       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_box.pack_start (input_button, true, true);
@@ -169,14 +178,8 @@ MixerStrip::init ()
        output_button.set_text (_("Output"));
        output_button.set_name ("mixer strip button");
 
-       ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), "");
-       meter_point_button.set_name ("mixer strip button");
-
-       bottom_button_table.attach (meter_point_button, 2, 3, 0, 1);
+       bottom_button_table.attach (gpm.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);
-       
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
        solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
@@ -237,7 +240,7 @@ MixerStrip::init ()
                        button_size_group->add_widget (*monitor_input_button);
                }
        }
-       
+
        mute_solo_table.set_homogeneous (true);
        mute_solo_table.set_spacings (2);
 
@@ -250,14 +253,16 @@ MixerStrip::init ()
        name_button.set_text_ellipsize (Pango::ELLIPSIZE_END);
        name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized));
 
-       ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
+       set_tooltip (&group_button, _("Mix group"));
        group_button.set_name ("mixer strip button");
 
        _comment_button.set_name (X_("mixer strip button"));
+       _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 * ARDOUR_UI::config()->get_ui_scale()))
+#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: "));
@@ -274,7 +279,6 @@ MixerStrip::init ()
        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_border_width (1);
        width_hide_box.set_spacing (2);
        width_hide_box.pack_start (width_button, false, true);
        width_hide_box.pack_start (number_label, true, true);
@@ -287,6 +291,7 @@ MixerStrip::init ()
        number_label.set_fixed_colors (0x80808080, 0x80808080);
        number_label.set_alignment (.5, .5);
        number_label.set_fallthrough_to_parent (true);
+       number_label.set_tweaks (ArdourButton::OccasionalText);
 
        global_vpacker.set_spacing (2);
        if (!ARDOUR::Profile->get_trx()) {
@@ -301,6 +306,7 @@ MixerStrip::init ()
        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);
@@ -309,6 +315,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");
@@ -340,7 +364,6 @@ MixerStrip::init ()
        number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::number_button_button_press), false);
 
        name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
-       name_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_release), false);
 
        group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::select_route_group), false);
 
@@ -382,9 +405,10 @@ MixerStrip::init ()
        _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"));
-       ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &MixerStrip::parameter_changed));
+       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());
 
@@ -403,11 +427,27 @@ MixerStrip::~MixerStrip ()
                _entered_mixer_strip = NULL;
 }
 
+void
+MixerStrip::vca_assign (boost::shared_ptr<ARDOUR::VCA> vca)
+{
+       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();
@@ -430,10 +470,33 @@ MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev)
                //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::set_route (boost::shared_ptr<Route> rt)
 {
@@ -455,9 +518,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        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.
        */
@@ -468,7 +533,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        /* 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);
        }
@@ -477,7 +542,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        gpm.set_type (rt->meter_type());
-       
+
        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);
 
@@ -490,13 +555,24 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        if (route()->is_master()) {
-               mute_solo_table.attach (*mute_button, 0, 2, 0, 1);
                solo_button->hide ();
                mute_button->show ();
                rec_mon_table.hide ();
-               if (solo_iso_table.get_parent()) {
-                       solo_iso_table.get_parent()->remove(solo_iso_table);
+               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 {
                bottom_button_table.attach (group_button, 1, 2, 0, 1);
                mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
@@ -504,18 +580,14 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                mute_button->show ();
                solo_button->show ();
                rec_mon_table.show ();
+               solo_iso_table.set_sensitive(true);
+               control_slave_ui.set_sensitive(true);
        }
 
        if (_mixer_owned && route()->is_master() ) {
-
-               HScrollbar scrollbar;
-               Gtk::Requisition requisition(scrollbar.size_request ());
-               int scrollbar_height = requisition.height;
-
-               spacer = manage (new EventBox);
-               spacer->set_size_request (-1, scrollbar_height+2);
-               global_vpacker.pack_start (*spacer, false, false);
-               spacer->show();
+               spacer.show();
+       } else {
+               spacer.hide();
        }
 
        if (is_track()) {
@@ -526,14 +598,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                monitor_disk_button->hide ();
        }
 
-       if (route()->trim() && route()->trim()->active()) {
-               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);
-       }
+       update_trim_control();
 
        if (is_midi_track()) {
                if (midi_input_enable_button == 0) {
@@ -543,7 +608,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                        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);
                }
@@ -568,7 +633,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        if (is_track ()) {
 
                rec_mon_table.attach (*rec_enable_button, 0, 1, 0, ARDOUR::Profile->get_mixbus() ? 1 : 2);
-               rec_enable_button->set_sensitive (_session->writable());
                rec_enable_button->show();
 
                if (ARDOUR::Profile->get_mixbus()) {
@@ -591,7 +655,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                }
        }
 
-       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;
@@ -613,7 +677,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::setup_comment_button, this), gui_context());
-       _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context());
 
        set_stuff_from_route ();
 
@@ -622,8 +685,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        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 ();
@@ -659,7 +723,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        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();
@@ -668,6 +732,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        gpm.gain_automation_state_button.show();
 
        parameter_changed ("mixer-element-visibility");
+       map_frozen();
 
        show ();
 }
@@ -677,9 +742,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);
        }
 }
 
@@ -698,12 +763,12 @@ 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, ARDOUR_UI::config()->get_ui_scale());
+       const float scale = std::max(1.f, UIConfiguration::instance().get_ui_scale());
 
        switch (w) {
        case Wide:
@@ -712,14 +777,10 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        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()));
                }
@@ -738,15 +799,11 @@ 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()));
                }
@@ -774,12 +831,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);
 }
 
 
@@ -797,7 +849,7 @@ MixerStrip::output_release (GdkEventButton *ev)
                edit_output_configuration ();
                break;
        }
-       
+
        return false;
 }
 
@@ -858,21 +910,25 @@ MixerStrip::output_press (GdkEventButton *ev)
                        citems.pop_back ();
                }
 
-               citems.push_back (SeparatorElem());
+               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)
-                                       )
-                               );
+                       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)));
 
-               output_menu.popup (1, ev->time);
+               Gtkmm2ext::anchored_menu_popup(&output_menu, &output_button, "",
+                                              1, ev->time);
+
                break;
        }
 
@@ -914,7 +970,7 @@ 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) {
@@ -928,7 +984,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 
                citems.push_back (SeparatorElem());
                uint32_t const n_with_separator = citems.size ();
-               
+
                input_menu_bundles.clear ();
 
                ARDOUR::BundleList current = _route->input()->bundles_connected ();
@@ -974,7 +1030,8 @@ MixerStrip::input_press (GdkEventButton *ev)
                citems.push_back (SeparatorElem());
                citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::edit_input_configuration)));
 
-               input_menu.popup (1, ev->time);
+               Gtkmm2ext::anchored_menu_popup(&input_menu, &input_button, "",
+                                              1, ev->time);
 
                break;
        }
@@ -1021,9 +1078,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) {
@@ -1037,11 +1094,7 @@ 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
@@ -1049,9 +1102,9 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
 {
        using namespace Menu_Helpers;
 
-       if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) {
-               return;
-       }
+       if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) {
+               return;
+       }
 
        list<boost::shared_ptr<Bundle> >::iterator i = output_menu_bundles.begin ();
        while (i != output_menu_bundles.end() && b->has_same_ports (*i) == false) {
@@ -1065,21 +1118,17 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
        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
@@ -1097,7 +1146,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.
@@ -1171,6 +1219,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 {
        uint32_t io_count;
        uint32_t io_index;
+       boost::shared_ptr<IO> io;
        boost::shared_ptr<Port> port;
        vector<string> port_connections;
 
@@ -1194,32 +1243,72 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
        ostringstream tooltip;
        char * tooltip_cstr;
-       
-       //to avoid confusion, the button caption should only show connections that match the datatype of the track
+
+       /* To avoid confusion, the button caption only shows connections that match the expected datatype
+        *
+        * First of all, if the user made only connections to a given type, we should use that one since
+        * it is very probably what the user expects. If there are several connections types, then show
+        * audio ones as primary, which matches expectations for both audio tracks with midi control and
+        * synthesisers. This first heuristic can be expressed with these two rules:
+        * A) If there are connected audio ports, consider audio as primary type.
+        * B) Else, if there are connected midi ports, consider midi as primary type.
+        *
+        * If there are no connected ports, then we choose the primary type based on the type of existing
+        * but unconnected ports. Again:
+        * C) If there are audio ports, consider audio as primary type.
+        * D) Else, if there are midi ports, consider midi as primary type. */
+
        DataType dt = DataType::AUDIO;
-       if ( boost::dynamic_pointer_cast<MidiTrack>(route) != 0 ) {
-               dt = DataType::MIDI;
-               // avoid further confusion with Midi-tracks that have a synth.
-               // Audio-ports may be connected, but button says "Disconnected"
+       bool match = false;
+
+       if (for_input) {
+               io = route->input();
+       } else {
+               io = route->output();
+       }
+
+       io_count = io->n_ports().n_total();
+       for (io_index = 0; io_index < io_count; ++io_index) {
+               port = io->nth (io_index);
+               if (port->connected()) {
+                       match = true;
+                       if (port->type() == DataType::AUDIO) {
+                               /* Rule A) applies no matter the remaining ports */
+                               dt = DataType::AUDIO;
+                               break;
+                       }
+                       if (port->type() == DataType::MIDI) {
+                               /* Rule B) is a good candidate... */
+                               dt = DataType::MIDI;
+                               /* ...but continue the loop to check remaining ports for rule A) */
+                       }
+               }
+       }
+
+       if (!match) {
+               /* Neither rule A) nor rule B) matched */
+               if ( io->n_ports().n_audio() > 0 ) {
+                       /* Rule C */
+                       dt = DataType::AUDIO;
+               } else if ( io->n_ports().n_midi() > 0 ) {
+                       /* Rule D */
+                       dt = DataType::MIDI;
+               }
+       }
+
+       if ( dt == DataType::MIDI ) {
                tooltip << _("MIDI ");
        }
 
        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 = io->nth (io_index);
+
                port_connections.clear ();
                port->get_connections(port_connections);
 
@@ -1243,15 +1332,15 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                                }
 
                                if (io_connection_count == 0) {
-                                       tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1))
+                                       tooltip << endl << Gtkmm2ext::markup_escape_text (port->name().substr(port->name().find("/") + 1))
                                                << " -> "
-                                               << Glib::Markup::escape_text( pn.empty() ? connection_name : pn );
+                                               << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn );
                                } else {
                                        tooltip << ", "
-                                               << Glib::Markup::escape_text( pn.empty() ? connection_name : pn );
+                                               << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn );
                                }
 
-                               if (connection_name.find("ardour:") == 0) {
+                               if (connection_name.find(RouteUI::program_port_prefix) == 0) {
                                        if (ardour_track_name.empty()) {
                                                // "ardour:Master/in 1" -> "ardour:Master/"
                                                string::size_type slash = connection_name.find("/");
@@ -1334,18 +1423,21 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
        strcpy(tooltip_cstr, tooltip.str().c_str());
 
        if (for_input) {
-               ARDOUR_UI::instance()->set_tip (&input_button, tooltip_cstr, "");
-       } else {
-               ARDOUR_UI::instance()->set_tip (&output_button, tooltip_cstr, "");
+               set_tooltip (&input_button, tooltip_cstr);
+       } else {
+               set_tooltip (&output_button, tooltip_cstr);
        }
 
+       delete [] 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);
+                               const size_t ppps = RouteUI::program_port_prefix.size (); // "ardour:"
+                               label << ardour_track_name.substr (ppps, slash - ppps);
                                have_label = true;
                        }
                }
@@ -1386,7 +1478,7 @@ void
 MixerStrip::update_input_display ()
 {
        update_io_button (_route, _width, true);
-       panners.setup_pan ();
+       panners.setup_pan ();
 
        if (has_audio_outputs ()) {
                panners.show_all ();
@@ -1400,8 +1492,8 @@ void
 MixerStrip::update_output_display ()
 {
        update_io_button (_route, _width, false);
-       gpm.setup_meters ();
-       panners.setup_pan ();
+       gpm.setup_meters ();
+       panners.setup_pan ();
 
        if (has_audio_outputs ()) {
                panners.show_all ();
@@ -1426,6 +1518,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
@@ -1448,33 +1541,27 @@ MixerStrip::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost::wea
 void
 MixerStrip::setup_comment_button ()
 {
-       switch (_width) {
+       std::string comment = _route->comment();
 
-       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;
+       set_tooltip (_comment_button, comment.empty() ? _("Click to add/edit comments") : _route->comment());
 
-       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;
+       if (comment.empty ()) {
+               _comment_button.set_name ("generic button");
+               _comment_button.set_text (_width  == Wide ? _("Comments") : _("Cmt"));
+               return;
        }
 
-       ARDOUR_UI::instance()->set_tip (
-               _comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
-               );
+       _comment_button.set_name ("comment button");
 
+       string::size_type pos = comment.find_first_of (" \t\n");
+       if (pos != string::npos) {
+               comment = comment.substr (0, pos);
+       }
+       if (comment.empty()) {
+               _comment_button.set_text (_width  == Wide ? _("Comments") : _("Cmt"));
+       } else {
+               _comment_button.set_text (comment);
+       }
 }
 
 bool
@@ -1488,9 +1575,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);
                }
@@ -1498,7 +1585,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;
@@ -1528,6 +1620,7 @@ MixerStrip::route_group_changed ()
 void
 MixerStrip::route_color_changed ()
 {
+       using namespace ARDOUR_UI_UTILS;
        name_button.modify_bg (STATE_NORMAL, color());
        number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
        reset_strip_style ();
@@ -1539,6 +1632,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 ()
 {
@@ -1556,13 +1667,26 @@ MixerStrip::build_route_ops_menu ()
 
        items.push_back (MenuElem (_("Outputs..."), sigc::mem_fun (*this, &RouteUI::edit_output_configuration)));
 
-       items.push_back (SeparatorElem());
+       if (!Profile->get_mixbus()) {
+               items.push_back (SeparatorElem());
+       }
 
-       if (!_route->is_master()) {
+       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")));
@@ -1571,8 +1695,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());
@@ -1580,13 +1724,6 @@ 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)));
-       }
-
-       items.push_back (SeparatorElem());
-
        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
@@ -1599,8 +1736,14 @@ MixerStrip::build_route_ops_menu ()
                        if (!selection.selected (rtav)) {
                                selection.set (rtav);
                        }
-                       
-                       items.push_front (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks)));
+
+                       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)));
                }
        }
 }
@@ -1608,12 +1751,15 @@ MixerStrip::build_route_ops_menu ()
 gboolean
 MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-       if (ev->button == 3) {
+       if (ev->button == 1 || 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);
+               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;
        }
@@ -1621,30 +1767,14 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
        return false;
 }
 
-gboolean
-MixerStrip::name_button_button_release (GdkEventButton* ev)
-{
-       if (ev->button == 1) {
-               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 false;
-}
-
 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;
        }
 
@@ -1662,24 +1792,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 ();
        }
@@ -1697,14 +1827,14 @@ MixerStrip::name_changed ()
                        break;
        }
 
-       ARDOUR_UI::instance()->set_tip (name_button, _route->name());
+       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 ()), std::dec));
+                       number_label.set_text (PBD::to_string (abs(_route->track_number ())));
                }
        } else {
                number_label.set_text ("");
@@ -1729,13 +1859,19 @@ MixerStrip::name_button_resized (Gtk::Allocation& alloc)
        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
 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:
@@ -1800,7 +1936,10 @@ MixerStrip::map_frozen ()
                        // XXX need some way, maybe, to retoggle redirect editors
                        break;
                }
+       } else {
+               processor_box.set_sensitive (true);
        }
+       RouteUI::map_frozen ();
 }
 
 void
@@ -1880,19 +2019,19 @@ MixerStrip::meter_point_string (MeterPoint mp)
                case MeterInput:
                        return _("In");
                        break;
-                       
+
                case MeterPreFader:
                        return _("Pre");
                        break;
-                       
+
                case MeterPostFader:
                        return _("Post");
                        break;
-                       
+
                case MeterOutput:
                        return _("Out");
                        break;
-                       
+
                case MeterCustom:
                default:
                        return _("Custom");
@@ -1904,19 +2043,19 @@ MixerStrip::meter_point_string (MeterPoint mp)
                case MeterInput:
                        return S_("Meter|In");
                        break;
-                       
+
                case MeterPreFader:
                        return S_("Meter|Pr");
                        break;
-                       
+
                case MeterPostFader:
                        return S_("Meter|Po");
                        break;
-                       
+
                case MeterOutput:
                        return S_("Meter|O");
                        break;
-                       
+
                case MeterCustom:
                default:
                        return S_("Meter|C");
@@ -1928,11 +2067,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();
@@ -1973,15 +2124,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
@@ -2004,7 +2156,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();
@@ -2019,7 +2171,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);
@@ -2043,7 +2195,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());
@@ -2068,8 +2220,11 @@ MixerStrip::set_button_names ()
                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));
@@ -2094,8 +2249,11 @@ MixerStrip::set_button_names ()
                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));
@@ -2119,9 +2277,9 @@ MixerStrip::set_button_names ()
        }
 
        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 ("");
        }
 }
 
@@ -2186,10 +2344,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 (ARDOUR_UI::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();
        }
 }
 
@@ -2204,7 +2381,7 @@ MixerStrip::override_solo_visibility () const
        if (_route && _route->is_master ()) {
                return boost::optional<bool> (false);
        }
-       
+
        return boost::optional<bool> ();
 }
 
@@ -2362,7 +2539,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);
@@ -2380,7 +2557,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);
@@ -2392,3 +2569,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);
+}