Give VSTPluginUI its own header.
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 38d60233de02fa8b76c53030df28c2db9bcb194a..324f36cf91e7cfe6dceb19b5e7b6f07ccf1fe37e 100644 (file)
@@ -28,7 +28,6 @@
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/bindable_button.h>
 #include "ardour/route.h"
 #include "ardour/route_group.h"
 #include "ardour/audio_track.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/panner.h"
 #include "ardour/send.h"
 #include "ardour/processor.h"
 #include "ardour/profile.h"
 #include "ardour/ladspa_plugin.h"
 #include "ardour/user_bundle.h"
+#include "ardour/port.h"
 
 #include "ardour_ui.h"
 #include "ardour_dialog.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
+#include "led.h"
 #include "public_editor.h"
 #include "send_ui.h"
 #include "io_selector.h"
@@ -72,17 +72,19 @@ using namespace std;
 sigc::signal<void,boost::shared_ptr<Route> > MixerStrip::SwitchIO;
 
 int MixerStrip::scrollbar_height = 0;
+PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        : AxisView(sess)
        , RouteUI (sess)
-       ,_mixer(mx)
+       , _mixer(mx)
        , _mixer_owned (in_mixer)
        , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer)
        , gpm (sess, 250)
        , panners (sess)
        , _mono_button (_("Mono"))
-       , button_table (3, 2)
+       , button_table (4, 2)
+       , solo_led_table (2, 2)
        , middle_button_table (1, 2)
        , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
@@ -102,11 +104,12 @@ 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)
        , RouteUI (sess)
-       ,_mixer(mx)
+       , _mixer(mx)
        , _mixer_owned (in_mixer)
        , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
        , gpm (sess, 250)
        , panners (sess)
+       , _mono_button (_("Mono"))
        , button_table (3, 2)
        , middle_button_table (1, 2)
        , bottom_button_table (1, 2)
@@ -114,7 +117,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , comment_button (_("Comments"))
 {
        init ();
-       set_button_names ();
        set_route (rt);
 }
 
@@ -183,16 +185,55 @@ MixerStrip::init ()
        mute_button->set_name ("MixerMuteButton");
        solo_button->set_name ("MixerSoloButton");
 
+        solo_isolated_led = manage (new LED);
+        solo_isolated_led->show ();
+        solo_isolated_led->set_diameter (6);
+        solo_isolated_led->set_no_show_all (true);
+        solo_isolated_led->set_name (X_("SoloIsolatedLED"));
+        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));
+       UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
+
+        solo_safe_led = manage (new LED);
+        solo_safe_led->show ();
+        solo_safe_led->set_diameter (6);
+        solo_safe_led->set_no_show_all (true);
+        solo_safe_led->set_name (X_("SoloSafeLED"));
+        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));
+       UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
+
+        Label* iso_label = manage (new Label (_("iso")));
+        Label* safe_label = manage (new Label (_("lock")));
+        
+        iso_label->set_name (X_("SoloLEDLabel"));
+        safe_label->set_name (X_("SoloLEDLabel"));
+
+        iso_label->show ();
+        safe_label->show (); 
+
+        solo_led_table.set_spacings (0);
+        solo_led_table.set_border_width (1);
+        solo_led_table.attach (*iso_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
+        solo_led_table.attach (*solo_isolated_led, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
+        solo_led_table.attach (*safe_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
+        solo_led_table.attach (*solo_safe_led, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
+
+        solo_led_table.show ();
+        solo_led_box.pack_end (solo_led_table, false, false);
+        solo_led_box.show ();
+
        button_table.set_homogeneous (true);
        button_table.set_spacings (0);
 
        button_table.attach (name_button, 0, 2, 0, 1);
        button_table.attach (input_button, 0, 2, 1, 2);
+       button_table.attach (_invert_button_box, 0, 2, 3, 4);
 
        middle_button_table.set_homogeneous (true);
        middle_button_table.set_spacings (0);
        middle_button_table.attach (*mute_button, 0, 1, 0, 1);
-       middle_button_table.attach (*solo_button, 1, 2, 0, 1);
+        middle_button_table.attach (*solo_button, 1, 2, 0, 1);
 
        bottom_button_table.set_col_spacings (0);
        bottom_button_table.set_homogeneous (true);
@@ -206,12 +247,15 @@ MixerStrip::init ()
        ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
        group_button.add (group_label);
        group_button.set_name ("MixerGroupButton");
+        Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
        group_label.set_name ("MixerGroupButtonLabel");
 
        comment_button.set_name ("MixerCommentButton");
-
        comment_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::comment_button_clicked));
 
+       _mono_button.set_name ("MixerMonoButton");
+       _mono_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::mono_button_clicked));
+
        global_vpacker.set_border_width (0);
        global_vpacker.set_spacing (0);
 
@@ -233,12 +277,11 @@ MixerStrip::init ()
        global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (processor_box, true, true);
+       global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (solo_led_box,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (gain_meter_alignment,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
-       if (!is_midi_track()) {
-               global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
-       }
        global_vpacker.pack_start (_mono_button, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
@@ -257,30 +300,20 @@ MixerStrip::init ()
        _packed = false;
        _embedded = false;
 
-       _session->engine().Stopped.connect (*this, boost::bind (&MixerStrip::engine_stopped, this), gui_context());
-       _session->engine().Running.connect (*this, boost::bind (&MixerStrip::engine_running, this), gui_context());
+       _session->engine().Stopped.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_stopped, this), gui_context());
+       _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);
 
-       solo_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::solo_press), false);
-       solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false);
-       mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false);
-       mute_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false);
-
        /* we don't need this if its not an audio track, but we don't know that yet and it doesn't
           hurt (much).
        */
 
        rec_enable_button->set_name ("MixerRecordEnableButton");
-       rec_enable_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_press), false);
-       rec_enable_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_release));
 
        /* ditto for this button and busses */
 
-       show_sends_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::show_sends_press), false);
-       show_sends_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::show_sends_release));
-
        name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
        group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::select_route_group), false);
 
@@ -330,8 +363,15 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                button_table.remove (*show_sends_button);
        }
 
+       processor_box.set_route (rt);
+
        RouteUI::set_route (rt);
 
+       /* map the current state */
+
+       mute_changed (0);
+       update_solo_display ();
+
        delete input_selector;
        input_selector = 0;
 
@@ -340,13 +380,19 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        revert_to_default_display ();
 
-       processor_box.set_route (rt);
-
        if (set_color_from_route()) {
                set_color (unique_random_color());
        }
 
-       if (_mixer_owned && (route()->is_master() || route()->is_control())) {
+        if (route()->is_master()) {
+                solo_button->hide ();
+                solo_led_box.hide ();
+        } else {
+                solo_button->show ();
+                solo_led_box.show ();
+        }
+
+       if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {
 
                if (scrollbar_height == 0) {
                        HScrollbar scrollbar;
@@ -360,16 +406,26 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        if (is_audio_track()) {
-
                boost::shared_ptr<AudioTrack> at = audio_track();
+               at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::map_frozen, this), gui_context());
+       }
 
-               at->FreezeChange.connect (route_connections, boost::bind (&MixerStrip::map_frozen, this), gui_context());
+       if (has_audio_outputs ()) {
+               _mono_button.show ();
+               panners.show_all ();
+       } else {
+               _mono_button.hide ();
+               panners.hide_all ();
+       }
 
+       if (is_track ()) {
+               
                button_table.attach (*rec_enable_button, 0, 2, 2, 3);
                rec_enable_button->set_sensitive (_session->writable());
                rec_enable_button->show();
 
-       } else if (!is_track()) {
+       } else {
+               
                /* non-master bus */
 
                if (!_route->is_master()) {
@@ -378,15 +434,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                }
        }
 
-       if (_route->phase_invert()) {
-               name_label.set_text (X_("Ø ") + name_label.get_text());
-       } else {
-               name_label.set_text (_route->name());
-       }
-
-       _mono_button.set_name ("MixerMonoButton");
-       _mono_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::mono_button_clicked));
-
        switch (_route->meter_point()) {
        case MeterInput:
                meter_point_label.set_text (_("input"));
@@ -408,33 +455,32 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        delete route_ops_menu;
        route_ops_menu = 0;
 
-       ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment().empty() ?
+       ARDOUR_UI::instance()->set_tip (comment_button, _route->comment().empty() ?
                                                   _("Click to Add/Edit Comments"):
                                                   _route->comment());
 
-       _route->meter_change.connect (route_connections, ui_bind (&MixerStrip::meter_changed, this, _1), gui_context());
-       _route->input()->changed.connect (route_connections, ui_bind (&MixerStrip::input_changed, this, _1, _2), gui_context());
-       _route->output()->changed.connect (route_connections, ui_bind (&MixerStrip::output_changed, this, _1, _2), gui_context());
-       _route->route_group_changed.connect (route_connections, boost::bind (&MixerStrip::route_group_changed, this), gui_context());
+       _route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context());
+       _route->input()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::input_changed, this, _1, _2), gui_context());
+       _route->output()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::output_changed, this, _1, _2), gui_context());
+       _route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context());
 
        if (_route->panner()) {
-               _route->panner()->Changed.connect (route_connections, boost::bind (&MixerStrip::connect_to_pan, this), gui_context());
+               _route->panner()->Changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context());
        }
 
        if (is_audio_track()) {
-               audio_track()->DiskstreamChanged.connect (route_connections, boost::bind (&MixerStrip::diskstream_changed, this), gui_context());
+               audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context());
        }
 
-       _route->NameChanged.connect (route_connections, boost::bind (&RouteUI::name_changed, this), gui_context());
-       _route->comment_changed.connect (route_connections, ui_bind (&MixerStrip::comment_changed, this, _1), gui_context());
-       _route->gui_changed.connect (route_connections, ui_bind (&MixerStrip::route_gui_changed, this, _1, _2), gui_context());
+       _route->comment_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::comment_changed, this, _1), gui_context());
+       _route->gui_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::route_gui_changed, this, _1, _2), gui_context());
 
        set_stuff_from_route ();
 
        /* now force an update of all the various elements */
 
        mute_changed (0);
-       solo_changed (0);
+        update_solo_display ();
        name_changed ();
        comment_changed (0);
        route_group_changed ();
@@ -451,7 +497,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        processor_box.show();
 
-       if (!route()->is_master() && !route()->is_control()) {
+       if (!route()->is_master() && !route()->is_monitor()) {
                /* we don't allow master or control routes to be hidden */
                hide_button.show();
        }
@@ -466,7 +512,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        bottom_button_table.show();
        processor_box.show_all ();
        gpm.show_all ();
-       panners.show_all ();
        gain_meter_alignment.show ();
        gain_unit_button.show();
        gain_unit_label.show();
@@ -739,6 +784,9 @@ MixerStrip::input_press (GdkEventButton *ev)
                return true;
        }
 
+       if (_session->actively_recording() && _route->record_enabled()) 
+               return true;
+
        switch (ev->button) {
 
        case 1:
@@ -825,10 +873,7 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR:
 {
        using namespace Menu_Helpers;
 
-       if (b->ports_are_outputs() == false ||
-           route()->input()->default_type() != b->type() ||
-           b->nchannels() != _route->n_inputs().get (b->type ())) {
-
+       if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs()) {
                return;
        }
 
@@ -862,10 +907,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
 {
        using namespace Menu_Helpers;
 
-       if (b->ports_are_inputs() == false ||
-           route()->output()->default_type() != b->type() ||
-           b->nchannels() != _route->n_outputs().get (b->type ())) {
-
+       if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs()) {
                return;
        }
 
@@ -925,14 +967,14 @@ MixerStrip::connect_to_pan ()
 
        boost::shared_ptr<ARDOUR::AutomationControl> pan_control
                = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
-                               _route->panner()->data().control(Evoral::Parameter(PanAutomation)));
+                               _route->panner()->control(Evoral::Parameter(PanAutomation)));
 
        if (pan_control) {
-               pan_control->alist()->automation_state_changed.connect (panstate_connection, boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context());
-               pan_control->alist()->automation_style_changed.connect (panstyle_connection, boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context());
+               pan_control->alist()->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context());
+               pan_control->alist()->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context());
        }
 
-       panners.pan_changed (this);
+       panners.panner_changed (this);
 }
 
 
@@ -991,7 +1033,6 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
        ostringstream label;
        string label_string;
-       char * label_cstr;
 
        bool have_label = false;
        bool each_io_has_one_connection = true;
@@ -1138,13 +1179,10 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                break;
        }
 
-       label_cstr = new char[label_string.size() + 1];
-       strcpy(label_cstr, label_string.c_str());
-
        if (for_input) {
-               input_label.set_text (label_cstr);
+               input_label.set_text (label_string);
        } else {
-               output_label.set_text (label_cstr);
+               output_label.set_text (label_string);
        }
 }
 
@@ -1172,20 +1210,20 @@ MixerStrip::fast_update ()
 void
 MixerStrip::diskstream_changed ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_diskstream_display, this));
+       Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_diskstream_display, this));
 }
 
 void
 MixerStrip::input_changed (IOChange /*change*/, void */*src*/)
 {
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_input_display, this));
+       Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_input_display, this));
        set_width_enum (_width, this);
 }
 
 void
 MixerStrip::output_changed (IOChange /*change*/, void */*src*/)
 {
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_output_display, this));
+       Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_output_display, this));
        set_width_enum (_width, this);
 }
 
@@ -1220,7 +1258,7 @@ MixerStrip::comment_editor_done_editing()
                        break;
                }
 
-               ARDOUR_UI::instance()->tooltips().set_tip (comment_button,
+               ARDOUR_UI::instance()->set_tip (comment_button,
                                str.empty() ? _("Click to Add/Edit Comments") : str);
        }
 
@@ -1305,11 +1343,13 @@ MixerStrip::select_route_group (GdkEventButton *ev)
 
                if (group_menu == 0) {
 
-                       group_menu = new RouteGroupMenu (
-                               _session,
-                               (RouteGroup::Property) (RouteGroup::Gain | RouteGroup::Mute | RouteGroup::Solo)
-                               );
+                       PropertyList* plist = new PropertyList();
 
+                       plist->add (Properties::gain, true);
+                       plist->add (Properties::mute, true);
+                       plist->add (Properties::solo, true);
+
+                       group_menu = new RouteGroupMenu (_session, plist);
                        group_menu->GroupSelected.connect (sigc::mem_fun (*this, &MixerStrip::set_route_group));
                }
 
@@ -1327,12 +1367,7 @@ MixerStrip::route_group_changed ()
        RouteGroup *rg = _route->route_group();
 
        if (rg) {
-               /* XXX: this needs a better algorithm */
-               string truncated = rg->name ();
-               if (truncated.length () > 5) {
-                       truncated = truncated.substr (0, 5);
-               }
-               group_label.set_text (truncated);
+                group_label.set_text (PBD::short_version (rg->name(), 5));
        } else {
                switch (_width) {
                case Wide:
@@ -1347,7 +1382,7 @@ MixerStrip::route_group_changed ()
 
 
 void
-MixerStrip::route_gui_changed (string what_changed, void* ignored)
+MixerStrip::route_gui_changed (string what_changed, void*)
 {
        ENSURE_GUI_THREAD (*this, &MixerStrip::route_gui_changed, what_changed, ignored)
 
@@ -1381,8 +1416,8 @@ MixerStrip::build_route_ops_menu ()
 
        MenuList& items = route_ops_menu->items();
 
-       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)));
+       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();
        items.push_back (SeparatorElem());
        items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun (*this, &RouteUI::toggle_route_active)));
@@ -1391,13 +1426,10 @@ MixerStrip::build_route_ops_menu ()
 
        items.push_back (SeparatorElem());
 
-       items.push_back (MenuElem (_("Adjust latency"), sigc::mem_fun (*this, &RouteUI::adjust_latency)));
+       items.push_back (MenuElem (_("Adjust Latency..."), sigc::mem_fun (*this, &RouteUI::adjust_latency)));
 
        items.push_back (SeparatorElem());
-       items.push_back (CheckMenuElem (_("Invert Polarity"), sigc::mem_fun (*this, &RouteUI::toggle_polarity)));
-       polarity_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
-       polarity_menu_item->set_active (_route->phase_invert());
-       items.push_back (CheckMenuElem (_("Protect against denormals"), sigc::mem_fun (*this, &RouteUI::toggle_denormal_protection)));
+       items.push_back (CheckMenuElem (_("Protect Against Denormals"), sigc::mem_fun (*this, &RouteUI::toggle_denormal_protection)));
        denormal_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
        denormal_menu_item->set_active (_route->denormal_protection());
 
@@ -1410,17 +1442,21 @@ MixerStrip::build_route_ops_menu ()
        items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
 }
 
-gint
+gboolean
 MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-       if (ev->button == 1 || ev->button == 3) {
+       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 FALSE;
+
+       } else if (ev->button == 1) {
+                revert_to_default_display ();
+        }
+
+       return false;
 }
 
 void
@@ -1450,15 +1486,12 @@ MixerStrip::name_changed ()
 {
        switch (_width) {
        case Wide:
-               RouteUI::name_changed ();
+               RouteUI::property_changed (PropertyChange (ARDOUR::Properties::name));
                break;
        case Narrow:
                name_label.set_text (PBD::short_version (_route->name(), 5));
                break;
        }
-       if (_route->phase_invert()) {
-               name_label.set_text (X_("Ø ") + name_label.get_text());
-       }
 }
 
 void
@@ -1507,6 +1540,7 @@ MixerStrip::map_frozen ()
                switch (at->freeze_state()) {
                case AudioTrack::Frozen:
                        processor_box.set_sensitive (false);
+                       hide_redirect_editors ();
                        break;
                default:
                        processor_box.set_sensitive (true);
@@ -1514,8 +1548,6 @@ MixerStrip::map_frozen ()
                        break;
                }
        }
-
-       hide_redirect_editors ();
 }
 
 void
@@ -1532,10 +1564,10 @@ MixerStrip::hide_processor_editor (boost::weak_ptr<Processor> p)
                return;
        }
 
-       void* gui = processor->get_gui ();
+       Gtk::Window* w = processor_box.get_processor_ui (processor);
 
-       if (gui) {
-               static_cast<Gtk::Widget*>(gui)->hide ();
+       if (w) {
+               w->hide ();
        }
 }
 
@@ -1606,9 +1638,9 @@ MixerStrip::engine_running ()
 
 /** Called when the metering point has changed */
 void
-MixerStrip::meter_changed (void *src)
+MixerStrip::meter_changed ()
 {
-       ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed, src)
+       ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed)
 
        switch (_route->meter_point()) {
        case MeterInput:
@@ -1693,7 +1725,7 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
        _current_delivery = send;
 
        send->set_metering (true);
-       _current_delivery->DropReferences.connect (send_gone_connection, boost::bind (&MixerStrip::revert_to_default_display, this), gui_context());
+       _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().setup_meters ();
@@ -1733,39 +1765,46 @@ MixerStrip::revert_to_default_display ()
 void
 MixerStrip::set_button_names ()
 {
-       switch (_width) {
+        switch (_width) {
        case Wide:
                rec_enable_button_label.set_text (_("Rec"));
                mute_button_label.set_text (_("Mute"));
-               if (!Config->get_solo_control_is_listen_control()) {
-                       solo_button_label.set_text (_("Solo"));
-               } else {
-                       switch (Config->get_listen_position()) {
-                       case AfterFaderListen:
-                               solo_button_label.set_text (_("AFL"));
-                               break;
-                       case PreFaderListen:
-                               solo_button_label.set_text (_("PFL"));
-                               break;
-                       }
-               }
+                if (_route && _route->solo_safe()) {
+                        solo_button_label.set_text (X_("!"));
+                } else {
+                        if (!Config->get_solo_control_is_listen_control()) {
+                                solo_button_label.set_text (_("Solo"));
+                        } else {
+                                switch (Config->get_listen_position()) {
+                                case AfterFaderListen:
+                                        solo_button_label.set_text (_("AFL"));
+                                        break;
+                                case PreFaderListen:
+                                        solo_button_label.set_text (_("PFL"));
+                                        break;
+                                }
+                        }
+                }
                break;
 
        default:
                rec_enable_button_label.set_text (_("R"));
                mute_button_label.set_text (_("M"));
-               if (!Config->get_solo_control_is_listen_control()) {
-                       solo_button_label.set_text (_("S"));
-               } else {
-                       switch (Config->get_listen_position()) {
-                       case AfterFaderListen:
-                               solo_button_label.set_text (_("A"));
-                               break;
-                       case PreFaderListen:
-                               solo_button_label.set_text (_("P"));
-                               break;
-                       }
-               }
+                if (_route && _route->solo_safe()) {
+                        solo_button_label.set_text (X_("!"));
+                        if (!Config->get_solo_control_is_listen_control()) {
+                                solo_button_label.set_text (_("S"));
+                        } else {
+                                switch (Config->get_listen_position()) {
+                                case AfterFaderListen:
+                                        solo_button_label.set_text (_("A"));
+                                        break;
+                                case PreFaderListen:
+                                        solo_button_label.set_text (_("P"));
+                                        break;
+                                }
+                        }
+                }
                break;
 
        }
@@ -1791,6 +1830,7 @@ MixerStrip::on_key_press_event (GdkEventKey* ev)
                break;
 
        case GDK_r:
+                cerr << "Stole that r\n";
                rec_enable_press (&fake);
                return true;
                break;
@@ -1843,6 +1883,7 @@ MixerStrip::on_key_release_event (GdkEventKey* ev)
                break;
 
        case GDK_r:
+                cerr << "Stole that r\n";
                rec_enable_release (&fake);
                return true;
                break;
@@ -1867,7 +1908,16 @@ bool
 MixerStrip::on_enter_notify_event (GdkEventCrossing*)
 {
        Keyboard::magic_widget_grab_focus ();
-       grab_focus ();
+
+       if (!panners._bar_spinner_active) {
+               /* This next grab_focus() causes a focus-out event to be sent to, amongst
+                * other things, panner BarControllers.  When they receive it, they abort
+                * the use of any SpinButton that might be in use to change pan settings.
+                * Hence we have this horrific hack which stops the grab_focus () call
+                * happening if a bar spinner is active.
+                */
+               grab_focus ();
+       }
        return false;
 }