0dBFS peak meter GUI
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 1aacff8e33fd173fa0d4fb5b4f13166defab68ed..c55bd1921407305e3ee471556f8736b67e80daab 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"
@@ -80,8 +81,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 +97,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, true)
        , _visibility (X_("mixer-element-visibility"))
 {
        init ();
@@ -127,6 +127,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, true)
        , _visibility (X_("mixer-element-visibility"))
 {
        init ();
@@ -136,8 +137,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
 void
 MixerStrip::init ()
 {
-       int button_table_row = 0;
-
        _entered_mixer_strip= 0;
        group_menu = 0;
        route_ops_menu = 0;
@@ -155,33 +154,26 @@ MixerStrip::init ()
                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"));
+       width_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       width_button.set_icon (ArdourButton::StripWidth);
        ARDOUR_UI::instance()->set_tip (width_button, t);
 
-       hide_button.set_image(::get_icon("hide"));
+       hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       hide_button.set_icon (ArdourButton::CloseCross);
        ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
 
        input_button_box.set_spacing(2);
        
        input_button.set_text (_("Input"));
        input_button.set_name ("mixer strip button");
-       input_button.set_size_request (-1, 20);
        input_button_box.pack_start (input_button, true, true);
-       Gtkmm2ext::set_height_request_to_display_any_text (input_button, _button_vpad);
 
        output_button.set_text (_("Output"));
        output_button.set_name ("mixer strip button");
-       Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4);
-       Gtkmm2ext::set_height_request_to_display_any_text (output_button, _button_vpad);
 
        ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), "");
        meter_point_button.set_name ("mixer strip button");
 
-       /* TRANSLATORS: this string should be longest of the strings
-          used to describe meter points. In english, it's "input".
-       */
-       set_size_request_to_display_given_text_width (meter_point_button, _("tupni"), 2, _button_vpad);
-
        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);
@@ -189,29 +181,24 @@ MixerStrip::init ()
        
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-       monitor_input_button->set_diameter (3);
-       monitor_disk_button->set_diameter (3);
-
-        solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
-        solo_isolated_led->show ();
-        solo_isolated_led->set_diameter (3);
-        solo_isolated_led->set_no_show_all (true);
-        solo_isolated_led->set_name (X_("solo isolate"));
-        solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-        solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release));
+       solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+       solo_isolated_led->show ();
+       solo_isolated_led->set_no_show_all (true);
+       solo_isolated_led->set_name (X_("solo isolate"));
+       solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+       solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false);
        UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
 
-        solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
-        solo_safe_led->show ();
-        solo_safe_led->set_diameter (3);
-        solo_safe_led->set_no_show_all (true);
-        solo_safe_led->set_name (X_("solo safe"));
-        solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-        solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release));
+       solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+       solo_safe_led->show ();
+       solo_safe_led->set_no_show_all (true);
+       solo_safe_led->set_name (X_("solo safe"));
+       solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+       solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false);
        UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
 
-       solo_safe_led->set_text (_("lock"));
-       solo_isolated_led->set_text (_("iso"));
+       solo_safe_led->set_text (S_("SoloLock|Lock"));
+       solo_isolated_led->set_text (_("Iso"));
 
        solo_iso_table.set_homogeneous (true);
        solo_iso_table.set_spacings (2);
@@ -262,20 +249,23 @@ MixerStrip::init ()
        bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1);
 
        name_button.set_name ("mixer strip button");
-       name_button.set_text (" "); /* non empty text, forces creation of the layout */
-       name_button.set_text (""); /* back to empty */
-       name_button.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
+       name_button.set_text_ellipsize (Pango::ELLIPSIZE_END);
        name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized));
-       name_button.set_size_request (-1, 20);
-       Gtkmm2ext::set_height_request_to_display_any_text (name_button, _button_vpad);
 
        ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
        group_button.set_name ("mixer strip button");
-       Gtkmm2ext::set_size_request_to_display_given_text_width (group_button, "Grp", 2, _button_vpad);
 
        _comment_button.set_name (X_("mixer strip button"));
        _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor));
-       Gtkmm2ext::set_size_request_to_display_given_text_width (_comment_button, "Cmt", 2, _button_vpad);
+
+       // TODO implement ArdourKnob::on_size_request properly
+#define PX_SCALE(px) std::max((float)px, rintf((float)px * ARDOUR_UI::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);
@@ -293,10 +283,12 @@ MixerStrip::init ()
        width_hide_box.pack_end (hide_button, false, true);
 
        number_label.set_text ("-");
+       number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
        number_label.set_no_show_all ();
        number_label.set_name ("tracknumber label");
        number_label.set_fixed_colors (0x80808080, 0x80808080);
        number_label.set_alignment (.5, .5);
+       number_label.set_fallthrough_to_parent (true);
 
        global_vpacker.set_spacing (2);
        if (!ARDOUR::Profile->get_trx()) {
@@ -337,12 +329,21 @@ MixerStrip::init ()
        _session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context());
 
        input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false);
-       output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_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);
 
-       /* ditto for this button and busses */
+       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);
+
        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);
 
        _width = (Width) -1;
@@ -385,7 +386,7 @@ MixerStrip::init ()
        _visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
 
        parameter_changed (X_("mixer-element-visibility"));
-
+       ARDOUR_UI::config()->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());
 
@@ -405,7 +406,7 @@ MixerStrip::~MixerStrip ()
 }
 
 bool
-MixerStrip::mixer_strip_enter_event (GdkEventCrossing *ev)
+MixerStrip::mixer_strip_enter_event (GdkEventCrossing* /*ev*/)
 {
        _entered_mixer_strip = this;
        
@@ -464,11 +465,6 @@ 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
@@ -485,7 +481,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);
+       mute_solo_table.attach (gpm.peak_display,1,2,1,2, EXPAND|FILL, EXPAND);
 
        if (solo_button->get_parent()) {
                mute_solo_table.remove (*solo_button);
@@ -500,6 +496,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                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);
+               }
        } else {
                bottom_button_table.attach (group_button, 1, 2, 0, 1);
                mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
@@ -529,11 +528,21 @@ 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 (ArdourButton::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"));
@@ -612,7 +621,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);
@@ -696,12 +705,13 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        set_button_names ();
 
+       const float scale = std::max(1.f, ARDOUR_UI::ui_scale);
+
        switch (w) {
        case Wide:
 
                if (show_sends_button)  {
-                       show_sends_button->set_text (_("Aux\nSends"));
-                       show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER);
+                       show_sends_button->set_text (_("Aux"));
                }
 
                gpm.gain_automation_style_button.set_text (
@@ -716,9 +726,12 @@ MixerStrip::set_width_enum (Width w, void* owner)
                                        panners.astate_string(_route->panner()->automation_state()));
                }
 
-
-               Gtkmm2ext::set_size_request_to_display_given_text_width (name_button, longest_label.c_str(), 2, _button_vpad);
-               set_size_request (-1, -1);
+               {
+                       // panners expect an even number of horiz. pixels
+                       int width = rintf (max (110.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1;
+                       width &= ~1;
+                       set_size_request (width, -1);
+               }
                break;
 
        case Narrow:
@@ -740,8 +753,12 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
 
-               Gtkmm2ext::set_size_request_to_display_given_text_width (name_button, "long", 2, _button_vpad);
-               set_size_request (max (50, gpm.get_gm_width()), -1);
+               {
+                       // panners expect an even number of horiz. pixels
+                       int width = rintf (max (60.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1;
+                       width &= ~1;
+                       set_size_request (width, -1);
+               }
                break;
        }
 
@@ -774,6 +791,18 @@ struct RouteCompareByName {
        }
 };
 
+gint
+MixerStrip::output_release (GdkEventButton *ev)
+{
+       switch (ev->button) {
+       case 3:
+               edit_output_configuration ();
+               break;
+       }
+       
+       return false;
+}
+
 gint
 MixerStrip::output_press (GdkEventButton *ev)
 {
@@ -787,11 +816,10 @@ MixerStrip::output_press (GdkEventButton *ev)
        MenuList& citems = output_menu.items();
        switch (ev->button) {
 
-       case 1:
-               edit_output_configuration ();
-               break;
-
        case 3:
+               return false;  //wait for the mouse-up to pop the dialog
+
+       case 1:
        {
                output_menu.set_name ("ArdourContextMenu");
                citems.clear ();
@@ -799,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 ();
 
@@ -841,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,6 +884,23 @@ MixerStrip::output_press (GdkEventButton *ev)
        return TRUE;
 }
 
+gint
+MixerStrip::input_release (GdkEventButton *ev)
+{
+       switch (ev->button) {
+
+       case 3:
+               edit_input_configuration ();
+               break;
+       default:
+               break;
+
+       }
+
+       return false;
+}
+
+
 gint
 MixerStrip::input_press (GdkEventButton *ev)
 {
@@ -871,23 +921,13 @@ MixerStrip::input_press (GdkEventButton *ev)
 
        switch (ev->button) {
 
-       case 1:
-               edit_input_configuration ();
-               break;
-
        case 3:
+               return false;  //don't handle the mouse-down here.  wait for mouse-up to pop the menu
+
+       case 1:
        {
                citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
 
-               for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
-                       citems.push_back (
-                               MenuElem (
-                                       string_compose ("Add %1 port", (*i).to_i18n_string()),
-                                       sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i)
-                                       )
-                               );
-               }
-
                citems.push_back (SeparatorElem());
                uint32_t const n_with_separator = citems.size ();
                
@@ -923,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:
@@ -1129,7 +1183,6 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
        uint32_t other_connection_count = 0;
 
        ostringstream label;
-       string label_string;
 
        bool have_label = false;
        bool each_io_has_one_connection = true;
@@ -1142,6 +1195,11 @@ 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;
 
        if (for_input) {
                io_count = route->n_inputs().n_total();
@@ -1158,6 +1216,10 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                } else {
                        port = route->output()->nth (io_index);
                }
+               
+               //ignore any port connections that don't match our DataType
+               if (port->type() != dt)
+                       continue;  
 
                port_connections.clear ();
                port->get_connections(port_connections);
@@ -1165,12 +1227,20 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
                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 << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1))
+                                               << " -> "
+                                               << Glib::Markup::escape_text( pn.empty() ? connection_name : pn );
                                } else {
-                                       tooltip << ", " << Glib::Markup::escape_text(connection_name);
+                                       tooltip << ", "
+                                               << Glib::Markup::escape_text( pn.empty() ? connection_name : pn );
                                }
 
                                if (connection_name.find("ardour:") == 0) {
@@ -1185,6 +1255,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"
@@ -1268,19 +1364,10 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                }
        }
 
-       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());
        }
 }
 
@@ -1377,8 +1464,6 @@ MixerStrip::setup_comment_button ()
                _comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
                );
 
-       Gtkmm2ext::set_size_request_to_display_given_text_width (
-               _comment_button, _comment_button.get_text().c_str(), 2, _button_vpad);
 }
 
 bool
@@ -1490,17 +1575,45 @@ MixerStrip::build_route_ops_menu ()
        }
 
        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);
+                       }
+                       
+                       items.push_front (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks)));
+               }
+       }
 }
 
 gboolean
 MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-       /* show menu for either button 1 or 3, so as not to confuse people
-          and also not hide stuff from them.
-       */
+       if (ev->button == 3) {
+               list_route_operations ();
 
-       if (ev->button == 3 || ev->button == 1) {
+               /* do not allow rename if the track is record-enabled */
+               rename_menu_item->set_sensitive (!_route->record_enabled());
+               route_ops_menu->popup (1, ev->time);
+
+               return true;
+       }
+
+       return false;
+}
+
+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 */
@@ -1520,6 +1633,8 @@ 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;
        }
 
        return false;
@@ -1563,39 +1678,44 @@ void
 MixerStrip::name_changed ()
 {
        switch (_width) {
-       case Wide:
-               if (_session->config.get_track_name_number()) {
-                       const int64_t track_number = _route->track_number ();
-                       if (track_number == 0) {
-                               number_label.set_text ("-");
-                       } else {
-                               number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
-                       }
-               } else {
-                       number_label.set_text ("");
-               }
-               name_button.set_text (_route->name());
-               break;
-       case Narrow:
-               if (_session->config.get_track_name_number()) {
-                       name_button.set_markup(track_number_to_string (_route->track_number (), " ",
-                                               PBD::short_version (_route->name (), 5)));
-               } else {
+               case Wide:
+                       name_button.set_text (_route->name());
+                       break;
+               case Narrow:
                        name_button.set_text (PBD::short_version (_route->name(), 5));
+                       break;
+       }
+
+       ARDOUR_UI::instance()->set_tip (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));
                }
-               break;
+       } else {
+               number_label.set_text ("");
        }
+}
 
-       Gtkmm2ext::set_size_request_to_display_given_text_width (
-               name_button, name_button.get_text().c_str(), 2, _button_vpad);
+void
+MixerStrip::input_button_resized (Gtk::Allocation& alloc)
+{
+       input_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
+}
 
-       ARDOUR_UI::instance()->set_tip (name_button, _route->name());
+void
+MixerStrip::output_button_resized (Gtk::Allocation& alloc)
+{
+       output_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
 }
 
 void
 MixerStrip::name_button_resized (Gtk::Allocation& alloc)
 {
-       name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE);
+       name_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
 }
 
 bool
@@ -1747,48 +1867,48 @@ MixerStrip::meter_point_string (MeterPoint mp)
        case Wide:
                switch (mp) {
                case MeterInput:
-                       return _("in");
+                       return _("In");
                        break;
                        
                case MeterPreFader:
-                       return _("pre");
+                       return _("Pre");
                        break;
                        
                case MeterPostFader:
-                       return _("post");
+                       return _("Post");
                        break;
                        
                case MeterOutput:
-                       return _("out");
+                       return _("Out");
                        break;
                        
                case MeterCustom:
                default:
-                       return _("custom");
+                       return _("Custom");
                        break;
                }
                break;
        case Narrow:
                switch (mp) {
                case MeterInput:
-                       return _("in");
+                       return S_("Meter|In");
                        break;
                        
                case MeterPreFader:
-                       return _("pr");
+                       return S_("Meter|Pr");
                        break;
                        
                case MeterPostFader:
-                       return _("po");
+                       return S_("Meter|Po");
                        break;
                        
                case MeterOutput:
-                       return _("o");
+                       return S_("Meter|O");
                        break;
                        
                case MeterCustom:
                default:
-                       return _("c");
+                       return S_("Meter|C");
                        break;
                }
                break;
@@ -1934,7 +2054,6 @@ MixerStrip::set_button_names ()
 {
        switch (_width) {
        case Wide:
-               rec_enable_button->set_text (_("Rec"));
                mute_button->set_text (_("Mute"));
                monitor_input_button->set_text (_("In"));
                monitor_disk_button->set_text (_("Disk"));
@@ -1956,15 +2075,14 @@ MixerStrip::set_button_names ()
                                break;
                        }
                }
-               solo_isolated_led->set_text (_("iso"));
-               solo_safe_led->set_text (_("lock"));
+               solo_isolated_led->set_text (_("Iso"));
+               solo_safe_led->set_text (S_("SoloLock|Lock"));
                break;
 
        default:
-               rec_enable_button->set_text (_("R"));
-               mute_button->set_text (_("M"));
-               monitor_input_button->set_text (_("I"));
-               monitor_disk_button->set_text (_("D"));
+               mute_button->set_text (S_("Mute|M"));
+               monitor_input_button->set_text (S_("MonitorInput|I"));
+               monitor_disk_button->set_text (S_("MonitorDisk|D"));
 
                if (_route && _route->solo_safe()) {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
@@ -1972,20 +2090,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;
        }
 
@@ -1994,18 +2112,6 @@ MixerStrip::set_button_names ()
        } else {
                meter_point_button.set_text ("");
        }
-
-       // Update size request of changed buttons
-       Gtkmm2ext::set_size_request_to_display_given_text_width (
-               *rec_enable_button, rec_enable_button->get_text().c_str(), 2, _button_vpad);
-       Gtkmm2ext::set_size_request_to_display_given_text_width (
-               *mute_button, mute_button->get_text().c_str(), 2, _button_vpad);
-       Gtkmm2ext::set_size_request_to_display_given_text_width (
-               *monitor_input_button, monitor_input_button->get_text().c_str(), 2, _button_vpad);
-       Gtkmm2ext::set_size_request_to_display_given_text_width (
-               *monitor_disk_button, monitor_disk_button->get_text().c_str(), 2, _button_vpad);
-       Gtkmm2ext::set_size_request_to_display_given_text_width (
-               *solo_button, solo_button->get_text().c_str(), 2, _button_vpad);
 }
 
 PluginSelector*
@@ -2069,7 +2175,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 (ARDOUR_UI::config()->get_mixer_strip_visibility ());
        }
        else if (p == "track-name-number") {
                name_changed ();
@@ -2188,10 +2294,17 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
        add_level_meter_item_point (items, group, _("Output"), MeterOutput);
        add_level_meter_item_point (items, group, _("Custom"), MeterCustom);
 
+       if (gpm.meter_channels().n_audio() == 0) {
+               m->popup (ev->button, ev->time);
+               _suspend_menu_callbacks = false;
+               return;
+       }
+
        RadioMenuItem::Group tgroup;
        items.push_back (SeparatorElem());
 
        add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+       add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak0dB), MeterPeak0dB);
        add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterKrms),  MeterKrms);
        add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
        add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);