fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 5be6ec9f5a1434dafd649a27f5837b75fd6047d7..15550f4cd451e283bfb5a19d85a67a19cdce7809 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/midi_track.h"
+#include "ardour/pannable.h"
 #include "ardour/panner.h"
+#include "ardour/panner_shell.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"
@@ -77,17 +80,17 @@ 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 (3, 1)
+       , solo_led_table (2, 2)
        , middle_button_table (1, 2)
        , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
-       , comment_button (_("Comments"))
+       , midi_input_enable_button (0)
 {
        init ();
 
@@ -103,19 +106,18 @@ 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)
-       , button_table (3, 2)
+       , button_table (3, 1)
        , middle_button_table (1, 2)
        , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
-       , comment_button (_("Comments"))
+       , midi_input_enable_button (0)
 {
        init ();
-       set_button_names ();
        set_route (rt);
 }
 
@@ -125,7 +127,6 @@ MixerStrip::init ()
        input_selector = 0;
        output_selector = 0;
        group_menu = 0;
-       _marked_for_display = false;
        route_ops_menu = 0;
        ignore_comment_edit = false;
        ignore_toggle = false;
@@ -154,8 +155,7 @@ MixerStrip::init ()
        input_button.add (input_label);
        input_button.set_name ("MixerIOButton");
        input_label.set_name ("MixerIOButtonLabel");
-
-       Gtkmm2ext::set_size_request_to_display_given_text (input_button, longest_label.c_str(), 4, 4);
+       input_button_box.pack_start (input_button, true, true);
 
        output_label.set_text (_("Output"));
        ARDOUR_UI::instance()->set_tip (&output_button, _("Button 1 to choose outputs from a port matrix, button 3 to select inputs from a menu"), "");
@@ -184,16 +184,57 @@ 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"), "");
+
+       _iso_label = manage (new Label (_("iso")));
+       _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 ();
+       below_panner_box.set_border_width (2);
+       below_panner_box.set_spacing (2);
+        below_panner_box.pack_end (solo_led_table, false, false);
+        below_panner_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 (name_button, 0, 1, 0, 1);
+       button_table.attach (input_button_box, 0, 1, 1, 2);
+       button_table.attach (_invert_button_box, 0, 1, 2, 3);
 
        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);
@@ -207,12 +248,9 @@ 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));
-
        global_vpacker.set_border_width (0);
        global_vpacker.set_spacing (0);
 
@@ -226,23 +264,18 @@ MixerStrip::init ()
        width_hide_box.pack_start (width_button, false, true);
        width_hide_box.pack_start (top_event_box, true, true);
        width_hide_box.pack_end (hide_button, false, true);
-       gain_meter_alignment.set_padding(0, 4, 0, 0);
-       gain_meter_alignment.add(gpm);
 
        whvbox.pack_start (width_hide_box, true, true);
 
        global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (processor_box, true, true);
-       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 (panners, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (below_panner_box, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
 
        global_frame.add (global_vpacker);
        global_frame.set_shadow_type (Gtk::SHADOW_IN);
@@ -258,8 +291,8 @@ 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);
@@ -299,6 +332,10 @@ MixerStrip::init ()
        set_flags (get_flags() | Gtk::CAN_FOCUS);
 
        SwitchIO.connect (sigc::mem_fun (*this, &MixerStrip::switch_io));
+
+       AudioEngine::instance()->PortConnectedOrDisconnected.connect (
+               *this, invalidator (*this), boost::bind (&MixerStrip::port_connected_or_disconnected, this, _1, _3), gui_context ()
+               );
 }
 
 MixerStrip::~MixerStrip ()
@@ -314,15 +351,22 @@ void
 MixerStrip::set_route (boost::shared_ptr<Route> rt)
 {
        if (rec_enable_button->get_parent()) {
-               button_table.remove (*rec_enable_button);
+               below_panner_box.remove (*rec_enable_button);
        }
 
        if (show_sends_button->get_parent()) {
-               button_table.remove (*show_sends_button);
+               below_panner_box.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;
 
@@ -331,13 +375,15 @@ 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 (route()->is_master()) {
+               solo_button->hide ();
+               below_panner_box.hide ();
+       } else {
+               solo_button->show ();
+               below_panner_box.show ();
        }
 
-       if (_mixer_owned && (route()->is_master() || route()->is_control())) {
+       if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {
 
                if (scrollbar_height == 0) {
                        HScrollbar scrollbar;
@@ -350,87 +396,87 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                global_vpacker.pack_start (*spacer, false, false);
        }
 
-       if (is_audio_track()) {
+       if (is_midi_track()) {
+               if (midi_input_enable_button == 0) {
+                       Image* img = manage (new Image (get_icon (X_("midi_socket_small"))));
+                       midi_input_enable_button = manage (new StatefulToggleButton);
+                       midi_input_enable_button->set_name ("MixerMidiInputEnableButton");
+                       midi_input_enable_button->set_image (*img);
+                       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"));
+               } else {
+                       input_button_box.remove (*midi_input_enable_button);
+               }
+               /* get current state */
+               midi_input_status_changed ();
+               input_button_box.pack_start (*midi_input_enable_button, false, false);
+               /* follow changes */
+               midi_track()->InputActiveChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::midi_input_status_changed, this), gui_context());
+       } else {
+               if (midi_input_enable_button) {
+                       /* removal from the container will delete it */
+                       input_button_box.remove (*midi_input_enable_button);
+                       midi_input_enable_button = 0;
+               }
+       }
 
+       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());
+       }
+
+       if (has_audio_outputs ()) {
+               panners.show_all ();
+       } else {
+               panners.hide_all ();
+       }
 
-               at->FreezeChange.connect (route_connections, boost::bind (&MixerStrip::map_frozen, this), gui_context());
+       if (is_track ()) {
 
-               button_table.attach (*rec_enable_button, 0, 2, 2, 3);
+               below_panner_box.pack_start (*rec_enable_button);
                rec_enable_button->set_sensitive (_session->writable());
                rec_enable_button->show();
 
-       } else if (!is_track()) {
+       } else {
+
                /* non-master bus */
 
                if (!_route->is_master()) {
-                       button_table.attach (*show_sends_button, 0, 2, 2, 3);
+                       below_panner_box.pack_start (*show_sends_button);
                        show_sends_button->show();
                }
        }
 
-       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"));
-               break;
-
-       case MeterPreFader:
-               meter_point_label.set_text (_("pre"));
-               break;
-
-       case MeterPostFader:
-               meter_point_label.set_text (_("post"));
-               break;
-
-       case MeterCustom:
-               meter_point_label.set_text (_("custom"));
-               break;
-       }
+       meter_point_label.set_text (meter_point_string (_route->meter_point()));
 
        delete route_ops_menu;
        route_ops_menu = 0;
 
-       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->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());
+       if (_route->panner_shell()) {
+               _route->panner_shell()->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->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());
 
        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 ();
 
        connect_to_pan ();
-
        panners.setup_pan ();
 
        update_diskstream_display ();
@@ -439,9 +485,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        add_events (Gdk::BUTTON_RELEASE_MASK);
 
-       processor_box.show();
+       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();
        }
@@ -454,23 +500,18 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        button_table.show();
        middle_button_table.show();
        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();
        meter_point_button.show();
        meter_point_label.show();
        diskstream_button.show();
        diskstream_label.show();
-       input_button.show();
-       input_label.show();
+       input_button_box.show_all();
        output_button.show();
        output_label.show();
        name_label.show();
        name_button.show();
-       comment_button.show();
        group_button.show();
        group_label.show();
 
@@ -480,25 +521,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 void
 MixerStrip::set_stuff_from_route ()
 {
-       XMLProperty *prop;
-
-       ensure_xml_node ();
-
        /* if width is not set, it will be set by the MixerUI or editor */
 
-       if ((prop = xml_node->property ("strip-width")) != 0) {
-               set_width_enum (Width (string_2_enum (prop->value(), _width)), this);
-       }
-
-       if ((prop = xml_node->property ("shown-mixer")) != 0) {
-               if (prop->value() == "no") {
-                       _marked_for_display = false;
-               } else {
-                       _marked_for_display = true;
-               }
-       } else {
-               /* backwards compatibility */
-               _marked_for_display = true;
+       string str = gui_property ("strip-width");
+       if (!str.empty()) {
+               set_width_enum (Width (string_2_enum (str, _width)), this);
        }
 }
 
@@ -514,12 +541,10 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        _width_owner = owner;
 
-       ensure_xml_node ();
-
        _width = w;
 
        if (_width_owner == this) {
-               xml_node->add_property ("strip-width", enum_2_string (_width));
+               set_gui_property ("strip-width", enum_2_string (_width));
        }
 
        set_button_names ();
@@ -530,14 +555,6 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        ((Gtk::Label*)show_sends_button->get_child())->set_text (_("Sends"));
                }
 
-               if (_route->comment() == "") {
-                       comment_button.unset_bg (STATE_NORMAL);
-                       ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
-               } else {
-                       comment_button.modify_bg (STATE_NORMAL, color());
-                       ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
-               }
-
                ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
                                gpm.astyle_string(gain_automation->automation_style()));
                ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
@@ -550,6 +567,9 @@ MixerStrip::set_width_enum (Width w, void* owner)
                                        panners.astate_string(_route->panner()->automation_state()));
                }
 
+               _iso_label->show ();
+               _safe_label->show ();
+
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
                set_size_request (-1, -1);
                break;
@@ -559,14 +579,6 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        ((Gtk::Label*)show_sends_button->get_child())->set_text (_("Snd"));
                }
 
-               if (_route->comment() == "") {
-                      comment_button.unset_bg (STATE_NORMAL);
-                      ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
-               } else {
-                      comment_button.modify_bg (STATE_NORMAL, color());
-                      ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
-               }
-
                ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
                                gpm.short_astyle_string(gain_automation->automation_style()));
                ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
@@ -579,13 +591,16 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
 
+               _iso_label->hide ();
+               _safe_label->hide ();
+
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
                set_size_request (max (50, gpm.get_gm_width()), -1);
                break;
        }
 
        processor_box.set_width (w);
-       
+
        update_input_display ();
        update_output_display ();
        route_group_changed ();
@@ -598,22 +613,26 @@ MixerStrip::set_packed (bool yn)
 {
        _packed = yn;
 
-       ensure_xml_node ();
-
        if (_packed) {
-               xml_node->add_property ("shown-mixer", "yes");
+               set_gui_property ("visible", true);
        } else {
-               xml_node->add_property ("shown-mixer", "no");
+               set_gui_property ("visible", false);
        }
 }
 
 
+struct RouteCompareByName {
+       bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
+               return a->name().compare (b->name()) < 0;
+       }
+};
+
 gint
 MixerStrip::output_press (GdkEventButton *ev)
 {
-        using namespace Menu_Helpers;
+       using namespace Menu_Helpers;
        if (!_session->engine().connected()) {
-               MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
+               MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
                msg.run ();
                return true;
        }
@@ -639,7 +658,7 @@ MixerStrip::output_press (GdkEventButton *ev)
                boost::shared_ptr<ARDOUR::BundleList> b = _session->bundles ();
 
                /* give user bundles first chance at being in the menu */
-               
+
                for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
                        if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
                                maybe_add_bundle_to_output_menu (*i, current);
@@ -651,9 +670,11 @@ MixerStrip::output_press (GdkEventButton *ev)
                                maybe_add_bundle_to_output_menu (*i, current);
                        }
                }
-               
+
                boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
-               for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+               RouteList copy = *routes;
+               copy.sort (RouteCompareByName ());
+               for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
                        maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current);
                }
 
@@ -667,7 +688,7 @@ MixerStrip::output_press (GdkEventButton *ev)
        }
 
        default:
-               break;
+               break;
        }
        return TRUE;
 }
@@ -676,7 +697,7 @@ void
 MixerStrip::edit_output_configuration ()
 {
        if (output_selector == 0) {
-               
+
                boost::shared_ptr<Send> send;
                boost::shared_ptr<IO> output;
 
@@ -685,11 +706,11 @@ MixerStrip::edit_output_configuration ()
                                output = send->output();
                        } else {
                                output = _route->output ();
-                       } 
+                       }
                } else {
                        output = _route->output ();
                }
-               
+
                output_selector = new IOSelectorWindow (_session, output);
        }
 
@@ -724,11 +745,14 @@ MixerStrip::input_press (GdkEventButton *ev)
        citems.clear();
 
        if (!_session->engine().connected()) {
-               MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
+               MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
                msg.run ();
                return true;
        }
 
+       if (_session->actively_recording() && _route->record_enabled())
+               return true;
+
        switch (ev->button) {
 
        case 1:
@@ -746,7 +770,7 @@ MixerStrip::input_press (GdkEventButton *ev)
                boost::shared_ptr<ARDOUR::BundleList> b = _session->bundles ();
 
                /* give user bundles first chance at being in the menu */
-               
+
                for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
                        if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
                                maybe_add_bundle_to_input_menu (*i, current);
@@ -758,9 +782,11 @@ MixerStrip::input_press (GdkEventButton *ev)
                                maybe_add_bundle_to_input_menu (*i, current);
                        }
                }
-               
+
                boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
-               for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+               RouteList copy = *routes;
+               copy.sort (RouteCompareByName ());
+               for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
                        maybe_add_bundle_to_input_menu ((*i)->output()->bundle(), current);
                }
 
@@ -773,7 +799,7 @@ MixerStrip::input_press (GdkEventButton *ev)
                break;
        }
        default:
-               break;
+               break;
        }
        return TRUE;
 }
@@ -815,10 +841,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;
        }
 
@@ -852,10 +875,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;
        }
 
@@ -869,7 +889,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
        }
 
        output_menu_bundles.push_back (b);
-       
+
        MenuList& citems = output_menu.items();
 
        std::string n = b->name ();
@@ -893,7 +913,7 @@ MixerStrip::update_diskstream_display ()
                        input_selector->hide_all ();
                }
 
-               show_route_color ();
+               route_color_changed ();
 
        } else {
 
@@ -913,16 +933,12 @@ MixerStrip::connect_to_pan ()
                return;
        }
 
-       boost::shared_ptr<ARDOUR::AutomationControl> pan_control
-               = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
-                               _route->panner()->control(Evoral::Parameter(PanAutomation)));
+       boost::shared_ptr<Pannable> p = _route->pannable ();
 
-       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());
-       }
+       p->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context());
+       p->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context());
 
-       panners.pan_changed (this);
+       panners.panshell_changed ();
 }
 
 
@@ -981,7 +997,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;
@@ -1009,7 +1024,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                } else {
                        port = route->output()->nth (io_index);
                }
-               
+
                port_connections.clear ();
                port->get_connections(port_connections);
                io_connection_count = 0;
@@ -1128,13 +1143,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);
        }
 }
 
@@ -1162,101 +1174,73 @@ 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*/)
+MixerStrip::port_connected_or_disconnected (Port* a, Port* b)
 {
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_input_display, this));
-       set_width_enum (_width, this);
-}
+       if (_route->input()->has_port (a) || _route->input()->has_port (b)) {
+               update_input_display ();
+               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));
-       set_width_enum (_width, this);
+       if (_route->output()->has_port (a) || _route->output()->has_port (b)) {
+               update_output_display ();
+               set_width_enum (_width, this);
+       }
 }
 
-
 void
-MixerStrip::comment_editor_done_editing()
+MixerStrip::comment_editor_done_editing ()
 {
-       string str =  comment_area->get_buffer()->get_text();
-       if (_route->comment() != str) {
-               _route->set_comment (str, this);
-
-               switch (_width) {
-
-               case Wide:
-                       if (! str.empty()) {
-                               comment_button.modify_bg (STATE_NORMAL, color());
-                               ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
-                       } else {
-                               comment_button.unset_bg (STATE_NORMAL);
-                               ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
-                       }
-                       break;
-
-               case Narrow:
-                       if (! str.empty()) {
-                               comment_button.modify_bg (STATE_NORMAL, color());
-                               ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
-                       } else {
-                               comment_button.unset_bg (STATE_NORMAL);
-                               ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
-                       }
-                       break;
-               }
+       ignore_toggle = true;
+       _comment_menu_item->set_active (false);
+       ignore_toggle = false;
 
-               ARDOUR_UI::instance()->set_tip (comment_button,
-                               str.empty() ? _("Click to Add/Edit Comments") : str);
+       string const str = comment_area->get_buffer()->get_text();
+       if (str == _route->comment ()) {
+               return;
        }
 
+       _route->set_comment (str, this);
 }
 
 void
-MixerStrip::comment_button_clicked ()
+MixerStrip::toggle_comment ()
 {
+       if (ignore_toggle) {
+               return;
+       }
+
        if (comment_window == 0) {
                setup_comment_editor ();
        }
 
-    int x, y, cw_width, cw_height;
-
-       if (comment_window->is_visible()) {
+       if (comment_window->is_visible ()) {
                comment_window->hide ();
                return;
        }
 
-       comment_window->get_size (cw_width, cw_height);
-       comment_window->get_position(x, y);
-       comment_window->move(x, y - (cw_height / 2) - 45);
-       /*
-          half the dialog height minus the comments button height
-          with some window decoration fudge thrown in.
-       */
+       string title;
+       title = _route->name();
+       title += _(": comment editor");
 
-       comment_window->show();
+       comment_window->set_title (title);
        comment_window->present();
 }
 
 void
 MixerStrip::setup_comment_editor ()
 {
-       string title;
-       title = _route->name();
-       title += _(": comment editor");
-
-       comment_window = new ArdourDialog (title, false);
+       comment_window = new ArdourDialog ("", false); // title will be reset to show route
        comment_window->set_position (Gtk::WIN_POS_MOUSE);
        comment_window->set_skip_taskbar_hint (true);
        comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing));
+       comment_window->set_default_size (400, 200);
 
        comment_area = manage (new TextView());
        comment_area->set_name ("MixerTrackCommentArea");
-       comment_area->set_size_request (110, 178);
        comment_area->set_wrap_mode (WRAP_WORD);
        comment_area->set_editable (true);
        comment_area->get_buffer()->set_text (_route->comment());
@@ -1280,12 +1264,6 @@ MixerStrip::comment_changed (void *src)
        }
 }
 
-void
-MixerStrip::set_route_group (RouteGroup *rg)
-{
-       rg->add (_route);
-}
-
 bool
 MixerStrip::select_route_group (GdkEventButton *ev)
 {
@@ -1302,10 +1280,12 @@ MixerStrip::select_route_group (GdkEventButton *ev)
                        plist->add (Properties::solo, true);
 
                        group_menu = new RouteGroupMenu (_session, plist);
-                       group_menu->GroupSelected.connect (sigc::mem_fun (*this, &MixerStrip::set_route_group));
                }
 
-               group_menu->popup (1, ev->time);
+               WeakRouteList r;
+               r.push_back (route ());
+               group_menu->build (r);
+               group_menu->menu()->popup (1, ev->time);
        }
 
        return true;
@@ -1319,12 +1299,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:
@@ -1337,31 +1312,18 @@ MixerStrip::route_group_changed ()
        }
 }
 
-
 void
-MixerStrip::route_gui_changed (string what_changed, void* ignored)
-{
-       ENSURE_GUI_THREAD (*this, &MixerStrip::route_gui_changed, what_changed, ignored)
-
-       if (what_changed == "color") {
-               if (set_color_from_route () == 0) {
-                       show_route_color ();
-               }
-       }
-}
-
-void
-MixerStrip::show_route_color ()
+MixerStrip::route_color_changed ()
 {
        name_button.modify_bg (STATE_NORMAL, color());
        top_event_box.modify_bg (STATE_NORMAL, color());
-       route_active_changed ();
+       reset_strip_style ();
 }
 
 void
 MixerStrip::show_passthru_color ()
 {
-       route_active_changed ();
+       reset_strip_style ();
 }
 
 void
@@ -1373,54 +1335,57 @@ 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 (CheckMenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::toggle_comment)));
+       _comment_menu_item = dynamic_cast<CheckMenuItem*> (&items.back ());
+       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)));
-       route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
-       route_active_menu_item->set_active (_route->active());
+       items.push_back (CheckMenuElem (_("Active")));
+       CheckMenuItem* i = dynamic_cast<CheckMenuItem *> (&items.back());
+       i->set_active (_route->active());
+       i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), !_route->active(), false));
 
        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());
 
        if (!Profile->get_sae()) {
                items.push_back (SeparatorElem());
                items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
-        }
+       }
 
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
+       items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false)));
 }
 
-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);
+
+       } else if (ev->button == 1) {
+               revert_to_default_display ();
        }
-       return FALSE;
+
+       return false;
 }
 
 void
 MixerStrip::list_route_operations ()
 {
-       if (route_ops_menu == 0) {
-               build_route_ops_menu ();
-       }
+       delete route_ops_menu;
+       build_route_ops_menu ();
 }
 
 void
@@ -1442,15 +1407,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));
+               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
@@ -1499,6 +1461,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);
@@ -1506,8 +1469,6 @@ MixerStrip::map_frozen ()
                        break;
                }
        }
-
-       hide_redirect_editors ();
 }
 
 void
@@ -1524,20 +1485,13 @@ 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 ();
        }
 }
 
-void
-MixerStrip::route_active_changed ()
-{
-       RouteUI::route_active_changed ();
-       reset_strip_style ();
-}
-
 void
 MixerStrip::reset_strip_style ()
 {
@@ -1546,14 +1500,14 @@ MixerStrip::reset_strip_style ()
                gpm.set_fader_name ("SendStripBase");
 
        } else {
-               
+
                if (is_midi_track()) {
                        if (_route->active()) {
                                set_name ("MidiTrackStripBase");
-                               gpm.set_meter_strip_name ("MidiTrackStripBase");
+                               gpm.set_meter_strip_name ("MidiTrackMetrics");
                        } else {
                                set_name ("MidiTrackStripBaseInactive");
-                               gpm.set_meter_strip_name ("MidiTrackStripBaseInactive");
+                               gpm.set_meter_strip_name ("MidiTrackMetricsInactive");
                        }
                        gpm.set_fader_name ("MidiTrackFader");
                } else if (is_audio_track()) {
@@ -1574,7 +1528,7 @@ MixerStrip::reset_strip_style ()
                                gpm.set_meter_strip_name ("AudioBusMetricsInactive");
                        }
                        gpm.set_fader_name ("AudioBusFader");
-                       
+
                        /* (no MIDI busses yet) */
                }
        }
@@ -1596,30 +1550,38 @@ MixerStrip::engine_running ()
 {
 }
 
-/** Called when the metering point has changed */
-void
-MixerStrip::meter_changed (void *src)
+string
+MixerStrip::meter_point_string (MeterPoint mp)
 {
-       ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed, src)
-
-       switch (_route->meter_point()) {
+       switch (mp) {
        case MeterInput:
-               meter_point_label.set_text (_("input"));
+               return _("in");
                break;
 
        case MeterPreFader:
-               meter_point_label.set_text (_("pre"));
+               return _("pre");
                break;
 
        case MeterPostFader:
-               meter_point_label.set_text (_("post"));
+               return _("post");
+               break;
+
+       case MeterOutput:
+               return _("out");
                break;
 
        case MeterCustom:
-               meter_point_label.set_text (_("custom"));
+       default:
+               return _("custom");
                break;
        }
+}
 
+/** Called when the metering point has changed */
+void
+MixerStrip::meter_changed ()
+{
+       meter_point_label.set_text (meter_point_string (_route->meter_point()));
        gpm.setup_meters ();
        // reset peak when meter point changes
        gpm.reset_peak_display();
@@ -1673,6 +1635,21 @@ MixerStrip::drop_send ()
        send_gone_connection.disconnect ();
        input_button.set_sensitive (true);
        output_button.set_sensitive (true);
+       group_button.set_sensitive (true);
+       set_invert_sensitive (true);
+       meter_point_button.set_sensitive (true);
+       mute_button->set_sensitive (true);
+       solo_button->set_sensitive (true);
+       rec_enable_button->set_sensitive (true);
+       solo_isolated_led->set_sensitive (true);
+       solo_safe_led->set_sensitive (true);
+}
+
+void
+MixerStrip::set_current_delivery (boost::shared_ptr<Delivery> d)
+{
+       _current_delivery = d;
+       DeliveryChanged (_current_delivery);
 }
 
 void
@@ -1682,18 +1659,26 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
 
        drop_send ();
 
-       _current_delivery = send;
+       set_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 ();
 
-       panner_ui().set_panner (_current_delivery->panner());
+       panner_ui().set_panner (_current_delivery->panner_shell(), _current_delivery->panner());
        panner_ui().setup_pan ();
 
        input_button.set_sensitive (false);
+       group_button.set_sensitive (false);
+       set_invert_sensitive (false);
+       meter_point_button.set_sensitive (false);
+       mute_button->set_sensitive (false);
+       solo_button->set_sensitive (false);
+       rec_enable_button->set_sensitive (false);
+       solo_isolated_led->set_sensitive (false);
+       solo_safe_led->set_sensitive (false);
 
        if (boost::dynamic_pointer_cast<InternalSend>(send)) {
                output_button.set_sensitive (false);
@@ -1711,12 +1696,12 @@ MixerStrip::revert_to_default_display ()
 
        drop_send ();
 
-       _current_delivery = _route->main_outs();
+       set_current_delivery (_route->main_outs ());
 
        gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp());
        gain_meter().setup_meters ();
 
-       panner_ui().set_panner (_route->main_outs()->panner());
+       panner_ui().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner());
        panner_ui().setup_pan ();
 
        reset_strip_style ();
@@ -1729,16 +1714,20 @@ MixerStrip::set_button_names ()
        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"));
+               if (_route && _route->solo_safe()) {
+                       solo_button_label.set_text (X_("!"));
                } 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 (!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;
@@ -1746,16 +1735,19 @@ MixerStrip::set_button_names ()
        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;
@@ -1859,7 +1851,6 @@ bool
 MixerStrip::on_enter_notify_event (GdkEventCrossing*)
 {
        Keyboard::magic_widget_grab_focus ();
-       grab_focus ();
        return false;
 }
 
@@ -1876,14 +1867,66 @@ MixerStrip::on_leave_notify_event (GdkEventCrossing* ev)
        return false;
 }
 
+PluginSelector*
+MixerStrip::plugin_selector()
+{
+       return _mixer.plugin_selector();
+}
+
 void
-MixerStrip::mono_button_clicked ()
+MixerStrip::hide_things ()
 {
-       panners.set_mono (_mono_button.get_active ());
+       processor_box.hide_things ();
 }
 
-PluginSelector*
-MixerStrip::plugin_selector()
+bool
+MixerStrip::input_active_button_press (GdkEventButton*)
 {
-       return _mixer.plugin_selector();
+       /* nothing happens on press */
+       return true;
+}
+
+bool
+MixerStrip::input_active_button_release (GdkEventButton* ev)
+{
+       boost::shared_ptr<MidiTrack> mt = midi_track ();
+
+       if (!mt) {
+               return true;
+       }
+
+       if (mt->input_active()) {
+               if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
+                       /* turn all other tracks using this input off */
+                       _session->set_exclusive_input_active (mt, false);
+               } else {
+                       mt->set_input_active (false);
+               }
+
+       } else {
+               if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
+                       /* turn all other tracks using this input on */
+                       _session->set_exclusive_input_active (mt, true);
+               } else {
+                       mt->set_input_active (true);
+               }
+       }
+
+       return true;
+}
+
+void
+MixerStrip::midi_input_status_changed ()
+{
+       if (midi_input_enable_button) {
+               boost::shared_ptr<MidiTrack> mt = midi_track ();
+               assert (mt);
+               midi_input_enable_button->set_active (mt->input_active ());
+       }
+}
+
+string
+MixerStrip::state_id () const
+{
+       return string_compose ("strip %1", _route->id().to_s());
 }