Update mixer strip colours when route active state changes
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 4bd50e9d37790266ac662fdc3a239354bd42c734..f767396308265762650428719fbdc7ae953d2856 100644 (file)
@@ -24,6 +24,7 @@
 #include "pbd/convert.h"
 #include "pbd/enumwriter.h"
 #include "pbd/replace_all.h"
+#include "pbd/stacktrace.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include "ardour/route.h"
 #include "ardour/route_group.h"
 #include "ardour/audio_track.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"
@@ -54,7 +57,7 @@
 #include "mixer_strip.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
-#include "led.h"
+#include "ardour_button.h"
 #include "public_editor.h"
 #include "send_ui.h"
 #include "io_selector.h"
@@ -70,8 +73,6 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
 
-sigc::signal<void,boost::shared_ptr<Route> > MixerStrip::SwitchIO;
-
 int MixerStrip::scrollbar_height = 0;
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
@@ -83,11 +84,16 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer)
        , gpm (sess, 250)
        , panners (sess)
-       , button_table (4, 2)
-       , solo_led_table (2, 2)
+       , button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
+       , button_table (3, 1)
+       , rec_solo_table (2, 2)
+       , top_button_table (1, 2)
        , middle_button_table (1, 2)
        , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
+       , midi_input_enable_button (0)
+       , _comment_button (_("Comments"))
+       , _visibility (X_("mixer-strip-visibility"))
 {
        init ();
 
@@ -108,10 +114,14 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , 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_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
+       , button_table (3, 1)
        , middle_button_table (1, 2)
        , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
+       , midi_input_enable_button (0)
+       , _comment_button (_("Comments"))
+       , _visibility (X_("mixer-strip-visibility"))
 {
        init ();
        set_route (rt);
@@ -123,7 +133,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;
@@ -152,8 +161,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"), "");
@@ -179,56 +187,74 @@ MixerStrip::init ()
 
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-       mute_button->set_name ("MixerMuteButton");
-       solo_button->set_name ("MixerSoloButton");
+       monitor_input_button->set_diameter (3);
+       monitor_disk_button->set_diameter (3);
 
-        solo_isolated_led = manage (new LED);
+        solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
         solo_isolated_led->show ();
-        solo_isolated_led->set_diameter (6);
+        solo_isolated_led->set_diameter (3);
         solo_isolated_led->set_no_show_all (true);
-        solo_isolated_led->set_name (X_("SoloIsolatedLED"));
+        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));
        UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
 
-        solo_safe_led = manage (new LED);
+        solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
         solo_safe_led->show ();
-        solo_safe_led->set_diameter (6);
+        solo_safe_led->set_diameter (3);
         solo_safe_led->set_no_show_all (true);
-        solo_safe_led->set_name (X_("SoloSafeLED"));
+        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));
        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_safe_led->set_text (_("lock"));
+       solo_isolated_led->set_text (_("iso"));
 
-        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);
+       top_button_table.set_homogeneous (true);
+       top_button_table.set_spacings (2);
+       top_button_table.attach (*monitor_input_button, 0, 1, 0, 1);
+        top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1);
+       top_button_table.show ();
 
-        solo_led_table.show ();
-        solo_led_box.pack_end (solo_led_table, false, false);
-        solo_led_box.show ();
+       rec_solo_table.set_homogeneous (false);
+       rec_solo_table.set_row_spacings (2);
+       rec_solo_table.set_col_spacings (2);
+        rec_solo_table.attach (*solo_isolated_led, 1, 2, 0, 1);
+        rec_solo_table.attach (*solo_safe_led, 1, 2, 1, 2);
+        rec_solo_table.show ();
 
-       button_table.set_homogeneous (true);
+       button_table.set_homogeneous (false);
        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);
+       if (solo_button) {
+               button_size_group->add_widget (*solo_button);
+       }
+       if (mute_button) {
+               button_size_group->add_widget (*mute_button);
+       }
+       if (solo_isolated_led) {
+               button_size_group->add_widget (*solo_isolated_led);
+       }
+       if (solo_safe_led) {
+               button_size_group->add_widget (*solo_safe_led);
+       }
+       if (rec_enable_button) {
+               button_size_group->add_widget (*rec_enable_button);
+       }
+       if (monitor_disk_button) {
+               button_size_group->add_widget (*monitor_disk_button);
+       }
+       if (monitor_input_button) {
+               button_size_group->add_widget (*monitor_input_button);
+       }
+
+       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.set_spacings (2);
        middle_button_table.attach (*mute_button, 0, 1, 0, 1);
         middle_button_table.attach (*solo_button, 1, 2, 0, 1);
 
@@ -244,9 +270,12 @@ 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);
+       Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
        group_label.set_name ("MixerGroupButtonLabel");
 
+       _comment_button.set_name (X_("MixerCommentButton"));
+       _comment_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::toggle_comment));
+
        global_vpacker.set_border_width (0);
        global_vpacker.set_spacing (0);
 
@@ -260,20 +289,20 @@ 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 (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);
+       global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK, 2);
+       global_vpacker.pack_start (rec_solo_table, Gtk::PACK_SHRINK, 2);
+       global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK, 2);
+       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);
@@ -295,12 +324,6 @@ MixerStrip::init ()
        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);
 
-       /* 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");
-
        /* ditto for this button and busses */
 
        name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
@@ -316,10 +339,11 @@ MixerStrip::init ()
           in update_diskstream_display().
        */
 
-       if (is_midi_track())
+       if (is_midi_track()) {
                set_name ("MidiTrackStripBase");
-       else
+       } else {
                set_name ("AudioTrackStripBase");
+       }
 
        add_events (Gdk::BUTTON_RELEASE_MASK|
                    Gdk::ENTER_NOTIFY_MASK|
@@ -329,11 +353,24 @@ 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, _2), gui_context ()
+               *this, invalidator (*this), boost::bind (&MixerStrip::port_connected_or_disconnected, this, _1, _3), gui_context ()
                );
+
+       /* Add the widgets under visibility control to the VisibilityGroup; the names used here
+          must be the same as those used in RCOptionEditor so that the configuration changes
+          are recognised when they occur.
+       */
+       _visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert"));
+       _visibility.add (solo_safe_led, X_("SoloSafe"), _("Solo Safe"), true, boost::bind (&MixerStrip::override_solo_visibility, this));
+       _visibility.add (solo_isolated_led, X_("SoloIsolated"), _("Solo Isolated"), true, boost::bind (&MixerStrip::override_solo_visibility, this));
+       _visibility.add (&_comment_button, X_("Comments"), _("Comments"));
+       _visibility.add (&group_button, X_("Group"), _("Group"));
+       _visibility.add (&meter_point_button, X_("MeterPoint"), _("Meter Point"));
+
+       parameter_changed (X_("mixer-strip-visibility"));
+
+       Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, ui_bind (&MixerStrip::parameter_changed, this, _1), gui_context());
 }
 
 MixerStrip::~MixerStrip ()
@@ -349,11 +386,11 @@ void
 MixerStrip::set_route (boost::shared_ptr<Route> rt)
 {
        if (rec_enable_button->get_parent()) {
-               button_table.remove (*rec_enable_button);
+               rec_solo_table.remove (*rec_enable_button);
        }
 
        if (show_sends_button->get_parent()) {
-               button_table.remove (*show_sends_button);
+               rec_solo_table.remove (*show_sends_button);
        }
 
        processor_box.set_route (rt);
@@ -373,18 +410,14 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        revert_to_default_display ();
 
-       if (set_color_from_route()) {
-               set_color (unique_random_color());
+       if (route()->is_master()) {
+               solo_button->hide ();
+               rec_solo_table.hide ();
+       } else {
+               solo_button->show ();
+               rec_solo_table.show ();
        }
 
-        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) {
@@ -398,6 +431,39 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                global_vpacker.pack_start (*spacer, false, false);
        }
 
+       if (is_track()) {
+               monitor_input_button->show ();
+               monitor_disk_button->show ();
+       } else {
+               monitor_input_button->hide();
+               monitor_disk_button->hide ();
+       }
+
+       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());
@@ -410,38 +476,22 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        if (is_track ()) {
-               
-               button_table.attach (*rec_enable_button, 0, 2, 2, 3);
+
+               rec_solo_table.attach (*rec_enable_button, 0, 1, 0, 2);
                rec_enable_button->set_sensitive (_session->writable());
                rec_enable_button->show();
 
        } else {
-               
+
                /* non-master bus */
 
                if (!_route->is_master()) {
-                       button_table.attach (*show_sends_button, 0, 2, 2, 3);
+                       rec_solo_table.attach (*show_sends_button, 0, 1, 0, 2);
                        show_sends_button->show();
                }
        }
 
-       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;
@@ -449,8 +499,8 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        _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, invalidator (*this), 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()) {
@@ -458,20 +508,18 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        _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);
-        update_solo_display ();
+       update_solo_display ();
        name_changed ();
        comment_changed (0);
        route_group_changed ();
 
        connect_to_pan ();
-
        panners.setup_pan ();
 
        update_diskstream_display ();
@@ -496,47 +544,34 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        middle_button_table.show();
        bottom_button_table.show();
        gpm.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();
 
+       parameter_changed ("mixer-strip-visibility");
+
        show ();
 }
 
 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);
        }
 }
 
@@ -552,12 +587,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 ();
@@ -565,7 +598,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
        switch (w) {
        case Wide:
                if (show_sends_button)  {
-                       ((Gtk::Label*)show_sends_button->get_child())->set_text (_("Sends"));
+                       show_sends_button->set_text (_("Sends"));
                }
 
                ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
@@ -580,13 +613,16 @@ MixerStrip::set_width_enum (Width w, void* owner)
                                        panners.astate_string(_route->panner()->automation_state()));
                }
 
+               solo_isolated_led->set_text (_("iso"));
+               solo_safe_led->set_text (_("lock"));
+
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
                set_size_request (-1, -1);
                break;
 
        case Narrow:
                if (show_sends_button) {
-                       ((Gtk::Label*)show_sends_button->get_child())->set_text (_("Snd"));
+                       show_sends_button->set_text (_("Snd"));
                }
 
                ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
@@ -600,6 +636,9 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
+               
+               solo_isolated_led->set_text ("");
+               solo_safe_led->set_text ("");
 
                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);
@@ -607,9 +646,10 @@ MixerStrip::set_width_enum (Width w, void* owner)
        }
 
        processor_box.set_width (w);
-       
+
        update_input_display ();
        update_output_display ();
+       setup_comment_button ();
        route_group_changed ();
        name_changed ();
        WidthChanged ();
@@ -620,22 +660,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;
        }
@@ -654,6 +698,16 @@ MixerStrip::output_press (GdkEventButton *ev)
                output_menu_bundles.clear ();
 
                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());
 
                ARDOUR::BundleList current = _route->output()->bundles_connected ();
@@ -661,7 +715,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);
@@ -673,9 +727,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);
                }
 
@@ -689,7 +745,7 @@ MixerStrip::output_press (GdkEventButton *ev)
        }
 
        default:
-               break;
+               break;
        }
        return TRUE;
 }
@@ -698,7 +754,7 @@ void
 MixerStrip::edit_output_configuration ()
 {
        if (output_selector == 0) {
-               
+
                boost::shared_ptr<Send> send;
                boost::shared_ptr<IO> output;
 
@@ -707,11 +763,11 @@ MixerStrip::edit_output_configuration ()
                                output = send->output();
                        } else {
                                output = _route->output ();
-                       } 
+                       }
                } else {
                        output = _route->output ();
                }
-               
+
                output_selector = new IOSelectorWindow (_session, output);
        }
 
@@ -746,12 +802,12 @@ 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()) 
+       if (_session->actively_recording() && _route->record_enabled())
                return true;
 
        switch (ev->button) {
@@ -763,6 +819,16 @@ MixerStrip::input_press (GdkEventButton *ev)
        case 3:
        {
                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());
                input_menu_bundles.clear ();
 
@@ -771,7 +837,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);
@@ -783,9 +849,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);
                }
 
@@ -798,7 +866,7 @@ MixerStrip::input_press (GdkEventButton *ev)
                break;
        }
        default:
-               break;
+               break;
        }
        return TRUE;
 }
@@ -840,7 +908,7 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR:
 {
        using namespace Menu_Helpers;
 
-       if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs()) {
+       if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) {
                return;
        }
 
@@ -874,7 +942,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
 {
        using namespace Menu_Helpers;
 
-       if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs()) {
+       if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) {
                return;
        }
 
@@ -888,7 +956,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 ();
@@ -912,7 +980,7 @@ MixerStrip::update_diskstream_display ()
                        input_selector->hide_all ();
                }
 
-               show_route_color ();
+               route_color_changed ();
 
        } else {
 
@@ -932,12 +1000,12 @@ MixerStrip::connect_to_pan ()
                return;
        }
 
-        boost::shared_ptr<Pannable> p = _route->pannable ();
+       boost::shared_ptr<Pannable> p = _route->pannable ();
 
-        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());
+       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.panner_changed (this);
+       panners.panshell_changed ();
 }
 
 
@@ -985,7 +1053,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 {
        uint32_t io_count;
        uint32_t io_index;
-       Port *port;
+       boost::shared_ptr<Port> port;
        vector<string> port_connections;
 
        uint32_t total_connection_count = 0;
@@ -1023,7 +1091,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;
@@ -1177,32 +1245,63 @@ MixerStrip::diskstream_changed ()
 }
 
 void
-MixerStrip::port_connected_or_disconnected (Port* a, Port* b)
+MixerStrip::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost::weak_ptr<Port> wb)
 {
-       if (_route->input()->has_port (a) || _route->input()->has_port (b)) {
+       boost::shared_ptr<Port> a = wa.lock ();
+       boost::shared_ptr<Port> b = wb.lock ();
+
+       if ((a && _route->input()->has_port (a)) || (b && _route->input()->has_port (b))) {
                update_input_display ();
                set_width_enum (_width, this);
        }
 
-       if (_route->output()->has_port (a) || _route->output()->has_port (b)) {
+       if ((a && _route->output()->has_port (a)) || (b && _route->output()->has_port (b))) {
                update_output_display ();
                set_width_enum (_width, this);
        }
 }
 
+void
+MixerStrip::setup_comment_button ()
+{
+       switch (_width) {
+
+       case Wide:
+               if (_route->comment().empty ()) {
+                       _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*"));
+               }
+               break;
+
+       case Narrow:
+               if (_route->comment().empty ()) {
+                       _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*"));
+               }
+               break;
+       }
+
+       ARDOUR_UI::instance()->set_tip (
+               _comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
+               );
+}
+
 void
 MixerStrip::comment_editor_done_editing ()
 {
-       ignore_toggle = true;
-       _comment_menu_item->set_active (false);
-       ignore_toggle = false;
-       
        string const str = comment_area->get_buffer()->get_text();
        if (str == _route->comment ()) {
                return;
        }
-       
+
        _route->set_comment (str, this);
+       setup_comment_button ();
 }
 
 void
@@ -1211,7 +1310,7 @@ MixerStrip::toggle_comment ()
        if (ignore_toggle) {
                return;
        }
-       
+
        if (comment_window == 0) {
                setup_comment_editor ();
        }
@@ -1221,25 +1320,25 @@ MixerStrip::toggle_comment ()
                return;
        }
 
-       comment_window->show();
+       string title;
+       title = _route->name();
+       title += _(": comment editor");
+
+       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());
@@ -1263,19 +1362,6 @@ MixerStrip::comment_changed (void *src)
        }
 }
 
-/** Set the route group for this strip's route, or remove it from its current group.
- *  @param rg New RouteGroup, or 0.
- */
-void
-MixerStrip::set_route_group (RouteGroup *rg)
-{
-       if (rg) {
-               rg->add (_route);
-       } else if (_route->route_group ()) {
-               _route->route_group()->remove (_route);
-       }
-}
-
 bool
 MixerStrip::select_route_group (GdkEventButton *ev)
 {
@@ -1292,10 +1378,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;
@@ -1309,7 +1397,7 @@ MixerStrip::route_group_changed ()
        RouteGroup *rg = _route->route_group();
 
        if (rg) {
-                group_label.set_text (PBD::short_version (rg->name(), 5));
+               group_label.set_text (PBD::short_version (rg->name(), 5));
        } else {
                switch (_width) {
                case Wide:
@@ -1322,31 +1410,18 @@ MixerStrip::route_group_changed ()
        }
 }
 
-
-void
-MixerStrip::route_gui_changed (string what_changed, void*)
-{
-       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
@@ -1359,14 +1434,17 @@ MixerStrip::build_route_ops_menu ()
        MenuList& items = route_ops_menu->items();
 
        items.push_back (CheckMenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::toggle_comment)));
-       _comment_menu_item = dynamic_cast<CheckMenuItem*> (&items.back ());
+       CheckMenuItem* i = dynamic_cast<CheckMenuItem*> (&items.back ());
+       i->set_active (comment_window && comment_window->is_visible ());
        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")));
+       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());
 
@@ -1380,10 +1458,10 @@ MixerStrip::build_route_ops_menu ()
        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)));
 }
 
 gboolean
@@ -1397,8 +1475,8 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
                route_ops_menu->popup (1, ev->time);
 
        } else if (ev->button == 1) {
-                revert_to_default_display ();
-        }
+               revert_to_default_display ();
+       }
 
        return false;
 }
@@ -1406,9 +1484,8 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
 void
 MixerStrip::list_route_operations ()
 {
-       if (route_ops_menu == 0) {
-               build_route_ops_menu ();
-       }
+       delete route_ops_menu;
+       build_route_ops_menu ();
 }
 
 void
@@ -1433,7 +1510,7 @@ MixerStrip::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;
        }
 }
@@ -1515,13 +1592,6 @@ MixerStrip::hide_processor_editor (boost::weak_ptr<Processor> p)
        }
 }
 
-void
-MixerStrip::route_active_changed ()
-{
-       RouteUI::route_active_changed ();
-       reset_strip_style ();
-}
-
 void
 MixerStrip::reset_strip_style ()
 {
@@ -1530,7 +1600,7 @@ MixerStrip::reset_strip_style ()
                gpm.set_fader_name ("SendStripBase");
 
        } else {
-               
+
                if (is_midi_track()) {
                        if (_route->active()) {
                                set_name ("MidiTrackStripBase");
@@ -1558,7 +1628,7 @@ MixerStrip::reset_strip_style ()
                                gpm.set_meter_strip_name ("AudioBusMetricsInactive");
                        }
                        gpm.set_fader_name ("AudioBusFader");
-                       
+
                        /* (no MIDI busses yet) */
                }
        }
@@ -1580,66 +1650,58 @@ MixerStrip::engine_running ()
 {
 }
 
-/** Called when the metering point has changed */
-void
-MixerStrip::meter_changed ()
+string
+MixerStrip::meter_point_string (MeterPoint mp)
 {
-       ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed)
-
-       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();
 }
 
+/** The bus that we are displaying sends to has changed, or been turned off.
+ *  @param send_to New bus that we are displaying sends to, or 0.
+ */
 void
-MixerStrip::switch_io (boost::shared_ptr<Route> target)
+MixerStrip::bus_send_display_changed (boost::shared_ptr<Route> send_to)
 {
-       /* don't respond to switch IO signal outside of the mixer window */
-
-       if (!_mixer_owned) {
-               return;
-       }
-
-       if (_route == target || _route->is_master()) {
-               /* don't change the display for the target or the master bus */
-               return;
-       } else if (!is_track() && show_sends_button) {
-               /* make sure our show sends button is inactive, and we no longer blink,
-                  since we're not the target.
-               */
-               send_blink_connection.disconnect ();
-               show_sends_button->set_active (false);
-               show_sends_button->set_state (STATE_NORMAL);
-       }
-
-       if (!target) {
-               /* switch back to default */
-               revert_to_default_display ();
-               return;
-       }
+       RouteUI::bus_send_display_changed (send_to);
 
-       boost::shared_ptr<Send> send = _route->internal_send_for (target);
-
-       if (send) {
-               show_send (send);
+       if (send_to) {
+               boost::shared_ptr<Send> send = _route->internal_send_for (send_to);
+               if (send) {
+                       show_send (send);
+               } else {
+                       revert_to_default_display ();
+               }
        } else {
                revert_to_default_display ();
        }
@@ -1657,14 +1719,17 @@ 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);
+       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);
+       monitor_input_button->set_sensitive (true);
+       monitor_disk_button->set_sensitive (true);
+       _comment_button.set_sensitive (true);
 }
 
 void
@@ -1689,18 +1754,21 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
        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);
+       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);
+       monitor_input_button->set_sensitive (false);
+       monitor_disk_button->set_sensitive (false);
+       _comment_button.set_sensitive (false);
 
        if (boost::dynamic_pointer_cast<InternalSend>(send)) {
                output_button.set_sensitive (false);
@@ -1712,10 +1780,6 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
 void
 MixerStrip::revert_to_default_display ()
 {
-       if (show_sends_button) {
-               show_sends_button->set_active (false);
-       }
-
        drop_send ();
 
        set_current_delivery (_route->main_outs ());
@@ -1723,7 +1787,7 @@ MixerStrip::revert_to_default_display ()
        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 ();
@@ -1732,46 +1796,63 @@ 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 (_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;
-                                }
-                        }
-                }
+               rec_enable_button->set_text (_("Rec"));
+               mute_button->set_text (_("Mute"));
+               monitor_input_button->set_text (_("In"));
+               monitor_disk_button->set_text (_("Disk"));
+
+               if (_route && _route->solo_safe()) {
+                       if (solo_safe_pixbuf == 0) {
+                               solo_safe_pixbuf = ::get_icon("solo-safe-icon");
+                       }
+                       solo_button->set_image (solo_safe_pixbuf);
+                       solo_button->set_text (string());
+               } else {
+                       solo_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
+                       if (!Config->get_solo_control_is_listen_control()) {
+                               solo_button->set_text (_("Solo"));
+                       } else {
+                               switch (Config->get_listen_position()) {
+                               case AfterFaderListen:
+                                       solo_button->set_text (_("AFL"));
+                                       break;
+                               case PreFaderListen:
+                                       solo_button->set_text (_("PFL"));
+                                       break;
+                               }
+                       }
+               }
                break;
 
        default:
-               rec_enable_button_label.set_text (_("R"));
-               mute_button_label.set_text (_("M"));
-                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;
-                                }
-                        }
-                }
+               rec_enable_button->set_text (_("R"));
+               mute_button->set_text (_("M"));
+               monitor_input_button->set_text (_("I"));
+               monitor_disk_button->set_text (_("D"));
+               if (_route && _route->solo_safe()) {
+                       solo_button->remove ();
+                       if (solo_safe_pixbuf == 0) {
+                               solo_safe_pixbuf =::get_icon("solo-safe-icon");
+                       }
+                       solo_button->set_image (solo_safe_pixbuf);
+                       solo_button->set_text (string());
+               } else {
+                       solo_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
+                       if (!Config->get_solo_control_is_listen_control()) {
+                               solo_button->set_text (_("S"));
+                       } else {
+                               switch (Config->get_listen_position()) {
+                               case AfterFaderListen:
+                                       solo_button->set_text (_("A"));
+                                       break;
+                               case PreFaderListen:
+                                       solo_button->set_text (_("P"));
+                                       break;
+                               }
+                       }
+               }
                break;
 
        }
@@ -1797,7 +1878,6 @@ MixerStrip::on_key_press_event (GdkEventKey* ev)
                break;
 
        case GDK_r:
-                cerr << "Stole that r\n";
                rec_enable_press (&fake);
                return true;
                break;
@@ -1850,7 +1930,6 @@ MixerStrip::on_key_release_event (GdkEventKey* ev)
                break;
 
        case GDK_r:
-                cerr << "Stole that r\n";
                rec_enable_release (&fake);
                return true;
                break;
@@ -1874,7 +1953,7 @@ MixerStrip::on_key_release_event (GdkEventKey* ev)
 bool
 MixerStrip::on_enter_notify_event (GdkEventCrossing*)
 {
-        Keyboard::magic_widget_grab_focus ();
+       Keyboard::magic_widget_grab_focus ();
        return false;
 }
 
@@ -1896,3 +1975,105 @@ MixerStrip::plugin_selector()
 {
        return _mixer.plugin_selector();
 }
+
+void
+MixerStrip::hide_things ()
+{
+       processor_box.hide_things ();
+}
+
+bool
+MixerStrip::input_active_button_press (GdkEventButton*)
+{
+       /* 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());
+}
+
+void
+MixerStrip::parameter_changed (string p)
+{
+       if (p == _visibility.get_state_name()) {
+               /* 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 ());
+       }
+}
+
+/** Called to decide whether the solo isolate / solo lock button visibility should
+ *  be overridden from that configured by the user.  We do this for the master bus.
+ *
+ *  @return optional value that is present if visibility state should be overridden.
+ */
+boost::optional<bool>
+MixerStrip::override_solo_visibility () const
+{
+       if (_route && _route->is_master ()) {
+               return boost::optional<bool> (false);
+       }
+       
+       return boost::optional<bool> ();
+}
+
+void
+MixerStrip::add_input_port (DataType t)
+{
+       _route->input()->add_port ("", this, t);
+}
+
+void
+MixerStrip::add_output_port (DataType t)
+{
+       _route->output()->add_port ("", this, t);
+}
+
+void
+MixerStrip::route_active_changed ()
+{
+       reset_strip_style ();
+}