update editor-mixer frozen state - fixes #6689
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 177caa00564d9db2017405b2fb8f62256d0b5e42..f9a665331cebf90857a6a7ce095750b7ebf9bdae 100644 (file)
@@ -34,6 +34,7 @@
 #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"
@@ -52,7 +53,6 @@
 #include "ardour/types.h"
 #include "ardour/user_bundle.h"
 
-#include "ardour_ui.h"
 #include "ardour_window.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
@@ -65,6 +65,8 @@
 #include "gui_thread.h"
 #include "route_group_menu.h"
 #include "meter_patterns.h"
+#include "tooltips.h"
+#include "ui_config.h"
 
 #include "i18n.h"
 
@@ -80,8 +82,6 @@ MixerStrip* MixerStrip::_entered_mixer_strip;
 
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
-static const int _button_vpad = 4;
-
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        : AxisView(sess)
        , RouteUI (sess)
@@ -98,6 +98,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        , meter_point_button (_("pre"))
        , midi_input_enable_button (0)
        , _comment_button (_("Comments"))
+       , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
        , _visibility (X_("mixer-element-visibility"))
 {
        init ();
@@ -127,6 +128,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , meter_point_button (_("pre"))
        , midi_input_enable_button (0)
        , _comment_button (_("Comments"))
+       , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
        , _visibility (X_("mixer-element-visibility"))
 {
        init ();
@@ -152,15 +154,15 @@ 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);
+       set_tooltip (width_button, t);
+
+       hide_button.set_icon (ArdourIcon::CloseCross);
+       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);
@@ -168,14 +170,14 @@ 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"), "");
+       set_tooltip (&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);
 
        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));
@@ -194,7 +196,7 @@ MixerStrip::init ()
        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_safe_led->set_text (S_("SoloLock|Lock"));
        solo_isolated_led->set_text (_("Iso"));
 
        solo_iso_table.set_homogeneous (true);
@@ -236,7 +238,7 @@ MixerStrip::init ()
                        button_size_group->add_widget (*monitor_input_button);
                }
        }
-       
+
        mute_solo_table.set_homogeneous (true);
        mute_solo_table.set_spacings (2);
 
@@ -249,12 +251,21 @@ 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.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor));
 
+       // 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);
+       input_button_box.pack_start (trim_control, false, false);
+
        global_vpacker.set_border_width (1);
        global_vpacker.set_spacing (0);
 
@@ -318,9 +329,14 @@ MixerStrip::init ()
 
        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));
 
        number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::number_button_button_press), false);
 
@@ -369,7 +385,7 @@ MixerStrip::init ()
        _visibility.add (&_comment_button, X_("Comments"), _("Comments"), 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());
 
@@ -392,7 +408,7 @@ 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();
@@ -415,7 +431,7 @@ 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;
 }
 
@@ -440,7 +456,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        if (group_button.get_parent()) {
                bottom_button_table.remove (group_button);
        }
-       
+
        RouteUI::set_route (rt);
 
        /* ProcessorBox needs access to _route so that it can read
@@ -448,17 +464,12 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        */
        processor_box.set_route (rt);
 
-       /* map the current state */
-
-       mute_changed (0);
-       update_solo_display ();
-
        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);
        }
@@ -467,7 +478,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);
 
@@ -516,14 +527,24 @@ 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);
+       }
+
        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);
                }
@@ -577,7 +598,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        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());
 
@@ -599,7 +620,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        /* now force an update of all the various elements */
 
-       mute_changed (0);
+       update_mute_display ();
        update_solo_display ();
        name_changed ();
        comment_changed (0);
@@ -648,6 +669,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        gpm.gain_automation_state_button.show();
 
        parameter_changed ("mixer-element-visibility");
+       map_frozen();
 
        show ();
 }
@@ -683,6 +705,8 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        set_button_names ();
 
+       const float scale = std::max(1.f, UIConfiguration::instance().get_ui_scale());
+
        switch (w) {
        case Wide:
 
@@ -702,8 +726,12 @@ MixerStrip::set_width_enum (Width w, void* owner)
                                        panners.astate_string(_route->panner()->automation_state()));
                }
 
-
-               set_size_request (max (110, gpm.get_gm_width()+5), -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:
@@ -725,7 +753,12 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
 
-               set_size_request (max (60, gpm.get_gm_width() + 10), -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;
        }
 
@@ -762,11 +795,11 @@ gint
 MixerStrip::output_release (GdkEventButton *ev)
 {
        switch (ev->button) {
-       case 1:
+       case 3:
                edit_output_configuration ();
                break;
        }
-       
+
        return false;
 }
 
@@ -783,10 +816,10 @@ MixerStrip::output_press (GdkEventButton *ev)
        MenuList& citems = output_menu.items();
        switch (ev->button) {
 
-       case 1:
+       case 3:
                return false;  //wait for the mouse-up to pop the dialog
 
-       case 3:
+       case 1:
        {
                output_menu.set_name ("ArdourContextMenu");
                citems.clear ();
@@ -794,15 +827,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 ();
 
@@ -836,6 +860,20 @@ MixerStrip::output_press (GdkEventButton *ev)
                        citems.pop_back ();
                }
 
+               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)));
+
                output_menu.popup (1, ev->time);
                break;
        }
@@ -851,7 +889,7 @@ MixerStrip::input_release (GdkEventButton *ev)
 {
        switch (ev->button) {
 
-       case 1:
+       case 3:
                edit_input_configuration ();
                break;
        default:
@@ -883,25 +921,16 @@ MixerStrip::input_press (GdkEventButton *ev)
 
        switch (ev->button) {
 
-       case 1:
+       case 3:
                return false;  //don't handle the mouse-down here.  wait for mouse-up to pop the menu
 
-       case 3:
+       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 ();
@@ -934,7 +963,21 @@ MixerStrip::input_press (GdkEventButton *ev)
                        citems.pop_back ();
                }
 
+               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)));
+
                input_menu.popup (1, ev->time);
+
                break;
        }
        default:
@@ -1138,9 +1181,9 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
        uint32_t ardour_connection_count = 0;
        uint32_t system_connection_count = 0;
        uint32_t other_connection_count = 0;
+       uint32_t typed_connection_count = 0;
 
        ostringstream label;
-       string label_string;
 
        bool have_label = false;
        bool each_io_has_one_connection = true;
@@ -1154,12 +1197,21 @@ 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
+       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"
+               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()));
        }
 
 
@@ -1172,16 +1224,33 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
                port_connections.clear ();
                port->get_connections(port_connections);
+
+               //ignore any port connections that don't match our DataType
+               if (port->type() != dt) {
+                       if (!port_connections.empty()) {
+                               ++typed_connection_count;
+                       }
+                       continue;
+               }
+
                io_connection_count = 0;
 
                if (!port_connections.empty()) {
                        for (vector<string>::iterator i = port_connections.begin(); i != port_connections.end(); ++i) {
+                               string pn = "";
                                string& connection_name (*i);
 
+                               if (connection_name.find("system:") == 0) {
+                                       pn = AudioEngine::instance()->get_pretty_name_by_name (connection_name);
+                               }
+
                                if (io_connection_count == 0) {
-                                       tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name);
+                                       tooltip << endl << Gtkmm2ext::markup_escape_text (port->name().substr(port->name().find("/") + 1))
+                                               << " -> "
+                                               << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn );
                                } else {
-                                       tooltip << ", " << Glib::Markup::escape_text(connection_name);
+                                       tooltip << ", "
+                                               << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn );
                                }
 
                                if (connection_name.find("ardour:") == 0) {
@@ -1196,6 +1265,32 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                                        if (connection_name.find(ardour_track_name) == 0) {
                                                ++ardour_connection_count;
                                        }
+                               } else if (!pn.empty()) {
+                                       if (system_ports.empty()) {
+                                               system_ports += pn;
+                                       } else {
+                                               system_ports += "/" + pn;
+                                       }
+                                       if (connection_name.find("system:") == 0) {
+                                               ++system_connection_count;
+                                       }
+                               } else if (connection_name.find("system:midi_") == 0) {
+                                       if (for_input) {
+                                               // "system:midi_capture_123" -> "123"
+                                               system_port = "M " + connection_name.substr(20);
+                                       } else {
+                                               // "system:midi_playback_123" -> "123"
+                                               system_port = "M " + connection_name.substr(21);
+                                       }
+
+                                       if (system_ports.empty()) {
+                                               system_ports += system_port;
+                                       } else {
+                                               system_ports += "/" + system_port;
+                                       }
+
+                                       ++system_connection_count;
+
                                } else if (connection_name.find("system:") == 0) {
                                        if (for_input) {
                                                // "system:capture_123" -> "123"
@@ -1241,9 +1336,9 @@ 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, "");
+               set_tooltip (&input_button, tooltip_cstr);
        } else {
-               ARDOUR_UI::instance()->set_tip (&output_button, tooltip_cstr, "");
+               set_tooltip (&output_button, tooltip_cstr);
        }
 
        if (each_io_has_one_connection) {
@@ -1277,21 +1372,15 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                        // Odd configuration
                        label << "*" << total_connection_count << "*";
                }
+               if (typed_connection_count > 0) {
+                       label << "\u2295"; // circled plus
+               }
        }
 
-       switch (width) {
-       case Wide:
-               label_string = label.str().substr(0, 7);
-               break;
-       case Narrow:
-               label_string = label.str().substr(0, 3);
-               break;
-       }
-
        if (for_input) {
-               input_button.set_text (label_string);
+               input_button.set_text (label.str());
        } else {
-               output_button.set_text (label_string);
+               output_button.set_text (label.str());
        }
 }
 
@@ -1384,7 +1473,7 @@ MixerStrip::setup_comment_button ()
                break;
        }
 
-       ARDOUR_UI::instance()->set_tip (
+       set_tooltip (
                _comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
                );
 
@@ -1498,8 +1587,28 @@ MixerStrip::build_route_ops_menu ()
                items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
        }
 
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false)));
+       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.
+               */
+
+               RouteTimeAxisView* rtav = PublicEditor::instance().get_route_view_by_route_id (_route->id());
+               if (rtav) {
+                       Selection& selection (PublicEditor::instance().get_selection());
+                       if (!selection.selected (rtav)) {
+                               selection.set (rtav);
+                       }
+
+                       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
@@ -1541,7 +1650,7 @@ MixerStrip::number_button_button_press (GdkEventButton* ev)
                /* 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;
        }
 
@@ -1567,7 +1676,7 @@ MixerStrip::set_selected (bool yn)
                global_frame.set_name ("MixerStripFrame");
        }
        global_frame.queue_draw ();
-       
+
 //     if (!yn)
 //             processor_box.deselect_all_processors();
 }
@@ -1594,7 +1703,7 @@ 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 ();
@@ -1608,10 +1717,22 @@ MixerStrip::name_changed ()
        }
 }
 
+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.set_layout_ellisize_width (alloc.get_width() * PANGO_SCALE);
+       name_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
 }
 
 bool
@@ -1620,7 +1741,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:
@@ -1685,6 +1806,8 @@ MixerStrip::map_frozen ()
                        // XXX need some way, maybe, to retoggle redirect editors
                        break;
                }
+       } else {
+               processor_box.set_sensitive (true);
        }
 }
 
@@ -1765,19 +1888,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");
@@ -1787,24 +1910,24 @@ MixerStrip::meter_point_string (MeterPoint mp)
        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;
@@ -1972,13 +2095,13 @@ MixerStrip::set_button_names ()
                        }
                }
                solo_isolated_led->set_text (_("Iso"));
-               solo_safe_led->set_text (_("Lock"));
+               solo_safe_led->set_text (S_("SoloLock|Lock"));
                break;
 
        default:
-               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 (_route && _route->solo_safe()) {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
@@ -1986,20 +2109,20 @@ MixerStrip::set_button_names ()
                        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;
        }
 
@@ -2071,7 +2194,7 @@ 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 ());
+               _visibility.set_state (UIConfiguration::instance().get_mixer_strip_visibility ());
        }
        else if (p == "track-name-number") {
                name_changed ();
@@ -2089,7 +2212,7 @@ MixerStrip::override_solo_visibility () const
        if (_route && _route->is_master ()) {
                return boost::optional<bool> (false);
        }
-       
+
        return boost::optional<bool> ();
 }
 
@@ -2200,6 +2323,7 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
        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);
@@ -2246,7 +2370,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);
@@ -2264,7 +2388,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);