remove use of a boost::fast_pool_allocator without a mutex for Evoral::ControlList...

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 536b4f110b9e5f7482511e9f9c64320a40a7d626..447f359187ad119d9da36ce2da2757df081d754f 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -120,6 +120,7 @@ RouteUI::init ()
 
        rec_enable_button = manage (new ArdourButton);
        rec_enable_button->set_name ("record enable button");
+       rec_enable_button->set_tweaks (ArdourButton::ImplicitUsesSolidColor);
        UI::instance()->set_tip (rec_enable_button, _("Enable recording on this track"), "");
 
        show_sends_button = manage (new ArdourButton);
@@ -1738,12 +1739,23 @@ RouteUI::open_remote_control_id_dialog ()
                dialog.add_button (Stock::APPLY, RESPONSE_ACCEPT);
        } else {
                Label* l = manage (new Label());
-               l->set_markup (string_compose (_("Remote Control IDs are currently determined by track/bus ordering in %1\n\n"
-                                                "This %2 has remote control ID %3\n\n\n"
-                                                "<span size=\"small\" style=\"italic\">Use the User Interaction tab of the Preferences window if you want to change this</span>"),
-                                              (Config->get_remote_model() == MixerOrdered ? _("the mixer") : ("the editor")),
-                                              (is_track() ? _("track") : _("bus")),
-                                              _route->remote_control_id()));
+               if (_route->is_master() || _route->is_monitor()) {
+                       l->set_markup (string_compose (_("The remote control ID of %1 is: %2\n\n\n"
+                                                        "The remote control ID of %3 cannot be changed."),
+                                                      Glib::Markup::escape_text (_route->name()),
+                                                      _route->remote_control_id(),
+                                                      (_route->is_master() ? _("the master bus") : _("the monitor bus"))));
+               } else {
+                       l->set_markup (string_compose (_("The remote control ID of %6 is: %3\n\n\n"
+                                                        "Remote Control IDs are currently determined by track/bus ordering in %1\n\n"
+                                                        "%4Use the User Interaction tab of the Preferences window if you want to change this%5"),
+                                                      (Config->get_remote_model() == MixerOrdered ? _("the mixer") : ("the editor")),
+                                                      (is_track() ? _("track") : _("bus")),
+                                                      _route->remote_control_id(),
+                                                      "<span size=\"small\" style=\"italic\">",
+                                                      "</span>",
+                                                      Glib::Markup::escape_text (_route->name())));
+               }
                dialog.get_vbox()->pack_start (*l);
                dialog.add_button (Stock::OK, RESPONSE_CANCEL);
        }
@@ -1776,10 +1788,11 @@ RouteUI::setup_invert_buttons ()
 
        for (uint32_t i = 0; i < to_add; ++i) {
                ArdourButton* b = manage (new ArdourButton);
+               b->set_size_request(20,20);
                b->signal_button_press_event().connect (sigc::mem_fun (*this, &RouteUI::invert_press));
                b->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::invert_release), i));
 
-               b->set_name (X_("mixer strip button"));
+               b->set_name (X_("invert button"));
                if (to_add == 1) {
                        if (N > 1) {
                                b->set_text (string_compose (X_("Ø (%1)"), N));