lots of tricks & tweaks related to the monitor section and All That It Uses
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 17761798c27901a26cc5558eac67bc9d6cdf3333..6b92873569c8b2e7414c7d80d1904924cc152124 100644 (file)
@@ -37,6 +37,7 @@
 #include "ardour/amp.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
+#include "ardour/internal_send.h"
 #include "ardour/route.h"
 #include "ardour/route_group.h"
 #include "ardour/audio_track.h"
@@ -62,7 +63,6 @@
 
 #include "i18n.h"
 
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
@@ -72,21 +72,22 @@ using namespace std;
 sigc::signal<void,boost::shared_ptr<Route> > MixerStrip::SwitchIO;
 
 int MixerStrip::scrollbar_height = 0;
+PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
-MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer)
-       : AxisView(sess)
+MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
+       : AxisView(sess)
        , RouteUI (sess)
        ,_mixer(mx)
        , _mixer_owned (in_mixer)
-       , processor_box (sess, mx.plugin_selector(), mx.selection(), this, in_mixer)
-       , gpm (sess)
+       , 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)
        , middle_button_table (1, 2)
-       , bottom_button_table (1, 2)
+       , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
-       , comment_button (_("Comments"))
-
+       , comment_button (_("Comments"))
 {
        init ();
 
@@ -99,20 +100,19 @@ 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)
+MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt, bool in_mixer)
+       : AxisView(sess)
        , RouteUI (sess)
        ,_mixer(mx)
        , _mixer_owned (in_mixer)
-       , processor_box (sess, mx.plugin_selector(), mx.selection(), this, in_mixer)
-       , gpm (sess)
+       , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
+       , gpm (sess, 250)
        , panners (sess)
        , button_table (3, 2)
        , middle_button_table (1, 2)
-       , bottom_button_table (1, 2)
+       , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
-       , comment_button (_("Comments"))
-
+       , comment_button (_("Comments"))
 {
        init ();
        set_button_names ();
@@ -134,6 +134,9 @@ MixerStrip::init ()
        _width_owner = 0;
        spacer = 0;
 
+       /* the length of this string determines the width of the mixer strip when it is set to `wide' */
+       longest_label = "longest label";
+
        Gtk::Image* img;
 
        img = manage (new Gtk::Image (::get_icon("strip_width")));
@@ -151,14 +154,15 @@ 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", 4, 4);
+
+       Gtkmm2ext::set_size_request_to_display_given_text (input_button, longest_label.c_str(), 4, 4);
 
        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"), "");
        output_button.add (output_label);
        output_button.set_name ("MixerIOButton");
        output_label.set_name ("MixerIOButtonLabel");
-       Gtkmm2ext::set_size_request_to_display_given_text (output_button, "longest label", 4, 4);
+       Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4);
 
        ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), "");
        meter_point_button.add (meter_point_label);
@@ -172,8 +176,8 @@ MixerStrip::init ()
 
        bottom_button_table.attach (meter_point_button, 1, 2, 0, 1);
 
-       meter_point_button.signal_button_press_event().connect (mem_fun (gpm, &GainMeter::meter_press), false);
-       meter_point_button.signal_button_release_event().connect (mem_fun (gpm, &GainMeter::meter_release), false);
+       meter_point_button.signal_button_press_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_press), false);
+       meter_point_button.signal_button_release_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_release), false);
 
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
@@ -189,7 +193,7 @@ MixerStrip::init ()
        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);
@@ -197,17 +201,18 @@ MixerStrip::init ()
 
        name_button.add (name_label);
        name_button.set_name ("MixerNameButton");
-       Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
+       Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
 
        name_label.set_name ("MixerNameButtonLabel");
        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 (mem_fun(*this, &MixerStrip::comment_button_clicked));
+       comment_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::comment_button_clicked));
 
        global_vpacker.set_border_width (0);
        global_vpacker.set_spacing (0);
@@ -216,8 +221,8 @@ MixerStrip::init ()
        hide_button.set_name ("MixerHideButton");
        top_event_box.set_name ("MixerTopEventBox");
 
-       width_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::width_clicked));
-       hide_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::hide_clicked));
+       width_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::width_clicked));
+       hide_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::hide_clicked));
 
        width_hide_box.pack_start (width_button, false, true);
        width_hide_box.pack_start (top_event_box, true, true);
@@ -236,6 +241,7 @@ MixerStrip::init ()
        if (!is_midi_track()) {
                global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
        }
+       global_vpacker.pack_start (_mono_button, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
 
@@ -253,32 +259,22 @@ MixerStrip::init ()
        _packed = false;
        _embedded = false;
 
-       _session.engine().Stopped.connect (mem_fun(*this, &MixerStrip::engine_stopped));
-       _session.engine().Running.connect (mem_fun(*this, &MixerStrip::engine_running));
+       _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());
 
-       input_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::input_press), false);
-       output_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::output_press), false);
-
-       solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false);
-       solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false);
-       mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false);
-       mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
+       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");
-       rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false);
-       rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
 
        /* ditto for this button and busses */
 
-       show_sends_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::show_sends_press), false);
-       show_sends_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::show_sends_release));
-
-       name_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::name_button_button_press), false);
-       group_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::select_route_group), false);
+       name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
+       group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::select_route_group), false);
 
        _width = (Width) -1;
 
@@ -303,15 +299,16 @@ MixerStrip::init ()
 
        set_flags (get_flags() | Gtk::CAN_FOCUS);
 
-       SwitchIO.connect (mem_fun (*this, &MixerStrip::switch_io));
+       SwitchIO.connect (sigc::mem_fun (*this, &MixerStrip::switch_io));
 }
 
 MixerStrip::~MixerStrip ()
 {
-       GoingAway(); /* EMIT_SIGNAL */
+       CatchDeletion (this);
 
        delete input_selector;
        delete output_selector;
+       delete comment_window;
 }
 
 void
@@ -333,22 +330,20 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        delete output_selector;
        output_selector = 0;
 
-       boost::shared_ptr<Send> send;
+       revert_to_default_display ();
 
-       if (_current_delivery && (send = boost::dynamic_pointer_cast<Send>(_current_delivery))) {
-               send->set_metering (false);
-       }
-
-       _current_delivery = _route->main_outs ();
-
-       panners.set_panner (rt->main_outs()->panner());
-       gpm.set_controls (rt, rt->shared_peak_meter(), rt->amp());
        processor_box.set_route (rt);
 
        if (set_color_from_route()) {
                set_color (unique_random_color());
        }
 
+        if (route()->is_master()) {
+                solo_button->hide ();
+        } else {
+                solo_button->show ();
+        }
+
        if (_mixer_owned && (route()->is_master() || route()->is_control())) {
 
                if (scrollbar_height == 0) {
@@ -366,10 +361,10 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
                boost::shared_ptr<AudioTrack> at = audio_track();
 
-               connections.push_back (at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen)));
+               at->FreezeChange.connect (route_connections, boost::bind (&MixerStrip::map_frozen, this), gui_context());
 
                button_table.attach (*rec_enable_button, 0, 2, 2, 3);
-               rec_enable_button->set_sensitive (_session.writable());
+               rec_enable_button->set_sensitive (_session->writable());
                rec_enable_button->show();
 
        } else if (!is_track()) {
@@ -387,6 +382,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                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"));
@@ -399,51 +397,44 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        case MeterPostFader:
                meter_point_label.set_text (_("post"));
                break;
+
+       case MeterCustom:
+               meter_point_label.set_text (_("custom"));
+               break;
        }
 
        delete route_ops_menu;
        route_ops_menu = 0;
 
-       ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment().empty() ?
+       ARDOUR_UI::instance()->set_tip (comment_button, _route->comment().empty() ?
                                                   _("Click to Add/Edit Comments"):
                                                   _route->comment());
 
-       connections.push_back (_route->meter_change.connect (
-                       mem_fun(*this, &MixerStrip::meter_changed)));
-       connections.push_back (_route->input()->changed.connect (
-                       mem_fun(*this, &MixerStrip::input_changed)));
-       connections.push_back (_route->output()->changed.connect (
-                       mem_fun(*this, &MixerStrip::output_changed)));
-       connections.push_back (_route->route_group_changed.connect (
-                       mem_fun(*this, &MixerStrip::route_group_changed)));
+       _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());
 
        if (_route->panner()) {
-               connections.push_back (_route->panner()->Changed.connect (
-                       mem_fun(*this, &MixerStrip::connect_to_pan)));
+               _route->panner()->Changed.connect (route_connections, boost::bind (&MixerStrip::connect_to_pan, this), gui_context());
        }
 
        if (is_audio_track()) {
-               connections.push_back (audio_track()->DiskstreamChanged.connect (
-                       mem_fun(*this, &MixerStrip::diskstream_changed)));
+               audio_track()->DiskstreamChanged.connect (route_connections, boost::bind (&MixerStrip::diskstream_changed, this), gui_context());
        }
 
-       connections.push_back (_route->NameChanged.connect (
-                       mem_fun(*this, &RouteUI::name_changed)));
-       connections.push_back (_route->comment_changed.connect (
-                       mem_fun(*this, &MixerStrip::comment_changed)));
-       connections.push_back (_route->gui_changed.connect (
-                       mem_fun(*this, &MixerStrip::route_gui_changed)));
+       _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());
 
        set_stuff_from_route ();
 
        /* now force an update of all the various elements */
 
-       processor_box.update();
        mute_changed (0);
        solo_changed (0);
        name_changed ();
        comment_changed (0);
-       route_group_changed (0);
+       route_group_changed ();
 
        connect_to_pan ();
 
@@ -525,7 +516,6 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        gpm.set_width (w);
        panners.set_width (w);
-       processor_box.set_width (w);
 
        boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->alist();
 
@@ -596,13 +586,16 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
 
-               Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
+               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 (0);
+       route_group_changed ();
        name_changed ();
        WidthChanged ();
 }
@@ -626,7 +619,7 @@ gint
 MixerStrip::output_press (GdkEventButton *ev)
 {
         using namespace Menu_Helpers;
-       if (!_session.engine().connected()) {
+       if (!_session->engine().connected()) {
                MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
                msg.run ();
                return true;
@@ -642,19 +635,31 @@ MixerStrip::output_press (GdkEventButton *ev)
        case 3:
        {
                output_menu.set_name ("ArdourContextMenu");
-               citems.clear();
+               citems.clear ();
+               output_menu_bundles.clear ();
 
-               citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
+               citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
                citems.push_back (SeparatorElem());
 
                ARDOUR::BundleList current = _route->output()->bundles_connected ();
 
-               boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
+               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) {
-                       maybe_add_bundle_to_output_menu (*i, current);
+                       if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
+                               maybe_add_bundle_to_output_menu (*i, current);
+                       }
                }
 
-               boost::shared_ptr<ARDOUR::RouteList> routes = _session.get_routes ();
+               for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
+                       if (boost::dynamic_pointer_cast<UserBundle> (*i) == 0) {
+                               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) {
                        maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current);
                }
@@ -678,7 +683,21 @@ void
 MixerStrip::edit_output_configuration ()
 {
        if (output_selector == 0) {
-               output_selector = new IOSelectorWindow (_session, _route->output());
+               
+               boost::shared_ptr<Send> send;
+               boost::shared_ptr<IO> output;
+
+               if ((send = boost::dynamic_pointer_cast<Send>(_current_delivery)) != 0) {
+                       if (!boost::dynamic_pointer_cast<InternalSend>(send)) {
+                               output = send->output();
+                       } else {
+                               output = _route->output ();
+                       } 
+               } else {
+                       output = _route->output ();
+               }
+               
+               output_selector = new IOSelectorWindow (_session, output);
        }
 
        if (output_selector->is_visible()) {
@@ -711,7 +730,7 @@ MixerStrip::input_press (GdkEventButton *ev)
        input_menu.set_name ("ArdourContextMenu");
        citems.clear();
 
-       if (!_session.engine().connected()) {
+       if (!_session->engine().connected()) {
                MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
                msg.run ();
                return true;
@@ -725,17 +744,29 @@ MixerStrip::input_press (GdkEventButton *ev)
 
        case 3:
        {
-               citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
+               citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
                citems.push_back (SeparatorElem());
+               input_menu_bundles.clear ();
 
                ARDOUR::BundleList current = _route->input()->bundles_connected ();
 
-               boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
+               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) {
-                       maybe_add_bundle_to_input_menu (*i, current);
+                       if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
+                               maybe_add_bundle_to_input_menu (*i, current);
+                       }
                }
 
-               boost::shared_ptr<ARDOUR::RouteList> routes = _session.get_routes ();
+               for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
+                       if (boost::dynamic_pointer_cast<UserBundle> (*i) == 0) {
+                               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) {
                        maybe_add_bundle_to_input_menu ((*i)->output()->bundle(), current);
                }
@@ -798,12 +829,23 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR:
                return;
        }
 
+       list<boost::shared_ptr<Bundle> >::iterator i = input_menu_bundles.begin ();
+       while (i != input_menu_bundles.end() && b->has_same_ports (*i) == false) {
+               ++i;
+       }
+
+       if (i != input_menu_bundles.end()) {
+               return;
+       }
+
+       input_menu_bundles.push_back (b);
+
        MenuList& citems = input_menu.items();
 
        std::string n = b->name ();
        replace_all (n, "_", " ");
 
-       citems.push_back (CheckMenuElem (n, bind (mem_fun(*this, &MixerStrip::bundle_input_toggled), b)));
+       citems.push_back (CheckMenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_toggled), b)));
 
        if (std::find (current.begin(), current.end(), b) != current.end()) {
                ignore_toggle = true;
@@ -824,12 +866,23 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
                return;
        }
 
+       list<boost::shared_ptr<Bundle> >::iterator i = output_menu_bundles.begin ();
+       while (i != output_menu_bundles.end() && b->has_same_ports (*i) == false) {
+               ++i;
+       }
+
+       if (i != output_menu_bundles.end()) {
+               return;
+       }
+
+       output_menu_bundles.push_back (b);
+       
        MenuList& citems = output_menu.items();
 
        std::string n = b->name ();
        replace_all (n, "_", " ");
 
-       citems.push_back (CheckMenuElem (n, bind (mem_fun(*this, &MixerStrip::bundle_output_toggled), b)));
+       citems.push_back (CheckMenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_toggled), b)));
 
        if (std::find (current.begin(), current.end(), b) != current.end()) {
                ignore_toggle = true;
@@ -858,7 +911,7 @@ MixerStrip::update_diskstream_display ()
 void
 MixerStrip::connect_to_pan ()
 {
-       ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::connect_to_pan));
+       ENSURE_GUI_THREAD (*this, &MixerStrip::connect_to_pan)
 
        panstate_connection.disconnect ();
        panstyle_connection.disconnect ();
@@ -869,11 +922,11 @@ MixerStrip::connect_to_pan ()
 
        boost::shared_ptr<ARDOUR::AutomationControl> pan_control
                = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
-                               _route->panner()->data().control(Evoral::Parameter(PanAutomation)));
+                               _route->panner()->control(Evoral::Parameter(PanAutomation)));
 
        if (pan_control) {
-               panstate_connection = pan_control->alist()->automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
-               panstyle_connection = pan_control->alist()->automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed));
+               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());
        }
 
        panners.pan_changed (this);
@@ -925,7 +978,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
        uint32_t io_count;
        uint32_t io_index;
        Port *port;
-       vector<string> connections;
+       vector<string> port_connections;
 
        uint32_t total_connection_count = 0;
        uint32_t io_connection_count = 0;
@@ -963,12 +1016,13 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
                } else {
                        port = route->output()->nth (io_index);
                }
-
-               port->get_connections(connections);
+               
+               port_connections.clear ();
+               port->get_connections(port_connections);
                io_connection_count = 0;
 
-               if (!connections.empty()) {
-                       for (vector<string>::iterator i = connections.begin(); i != connections.end(); ++i) {
+               if (!port_connections.empty()) {
+                       for (vector<string>::iterator i = port_connections.begin(); i != port_connections.end(); ++i) {
                                string& connection_name (*i);
 
                                if (io_connection_count == 0) {
@@ -1115,20 +1169,20 @@ MixerStrip::fast_update ()
 void
 MixerStrip::diskstream_changed ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_diskstream_display));
+       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_diskstream_display, this));
 }
 
 void
 MixerStrip::input_changed (IOChange /*change*/, void */*src*/)
 {
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_input_display));
+       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_input_display, this));
        set_width_enum (_width, this);
 }
 
 void
 MixerStrip::output_changed (IOChange /*change*/, void */*src*/)
 {
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display));
+       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_output_display, this));
        set_width_enum (_width, this);
 }
 
@@ -1163,7 +1217,7 @@ MixerStrip::comment_editor_done_editing()
                        break;
                }
 
-               ARDOUR_UI::instance()->tooltips().set_tip (comment_button,
+               ARDOUR_UI::instance()->set_tip (comment_button,
                                str.empty() ? _("Click to Add/Edit Comments") : str);
        }
 
@@ -1205,7 +1259,7 @@ MixerStrip::setup_comment_editor ()
        comment_window = new ArdourDialog (title, false);
        comment_window->set_position (Gtk::WIN_POS_MOUSE);
        comment_window->set_skip_taskbar_hint (true);
-       comment_window->signal_hide().connect (mem_fun(*this, &MixerStrip::comment_editor_done_editing));
+       comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing));
 
        comment_area = manage (new TextView());
        comment_area->set_name ("MixerTrackCommentArea");
@@ -1222,7 +1276,7 @@ MixerStrip::setup_comment_editor ()
 void
 MixerStrip::comment_changed (void *src)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::comment_changed), src));
+       ENSURE_GUI_THREAD (*this, &MixerStrip::comment_changed, src)
 
        if (src != this) {
                ignore_comment_edit = true;
@@ -1236,7 +1290,7 @@ MixerStrip::comment_changed (void *src)
 void
 MixerStrip::set_route_group (RouteGroup *rg)
 {
-       _route->set_route_group (rg, this);
+       rg->add (_route);
 }
 
 bool
@@ -1248,12 +1302,14 @@ MixerStrip::select_route_group (GdkEventButton *ev)
 
                if (group_menu == 0) {
 
-                       group_menu = new RouteGroupMenu (
-                               _session,
-                               (RouteGroup::Property) (RouteGroup::Gain | RouteGroup::Mute | RouteGroup::Solo)
-                               );
+                       PropertyList* plist = new PropertyList();
+
+                       plist->add (Properties::gain, true);
+                       plist->add (Properties::mute, true);
+                       plist->add (Properties::solo, true);
 
-                       group_menu->GroupSelected.connect (mem_fun (*this, &MixerStrip::set_route_group));
+                       group_menu = new RouteGroupMenu (_session, plist);
+                       group_menu->GroupSelected.connect (sigc::mem_fun (*this, &MixerStrip::set_route_group));
                }
 
                group_menu->popup (1, ev->time);
@@ -1263,19 +1319,14 @@ MixerStrip::select_route_group (GdkEventButton *ev)
 }
 
 void
-MixerStrip::route_group_changed (void *ignored)
+MixerStrip::route_group_changed ()
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_group_changed), ignored));
+       ENSURE_GUI_THREAD (*this, &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:
@@ -1292,7 +1343,7 @@ MixerStrip::route_group_changed (void *ignored)
 void
 MixerStrip::route_gui_changed (string what_changed, void* ignored)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_gui_changed), what_changed, ignored));
+       ENSURE_GUI_THREAD (*this, &MixerStrip::route_gui_changed, what_changed, ignored)
 
        if (what_changed == "color") {
                if (set_color_from_route () == 0) {
@@ -1324,33 +1375,33 @@ MixerStrip::build_route_ops_menu ()
 
        MenuList& items = route_ops_menu->items();
 
-       items.push_back (MenuElem (_("Save As Template"), mem_fun(*this, &RouteUI::save_as_template)));
-       items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteUI::route_rename)));
+       items.push_back (MenuElem (_("Save As Template"), sigc::mem_fun(*this, &RouteUI::save_as_template)));
+       items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &RouteUI::route_rename)));
        rename_menu_item = &items.back();
        items.push_back (SeparatorElem());
-       items.push_back (CheckMenuElem (_("Active"), mem_fun (*this, &RouteUI::toggle_route_active)));
+       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 (SeparatorElem());
 
-       items.push_back (MenuElem (_("Adjust latency"), 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"), mem_fun (*this, &RouteUI::toggle_polarity)));
+       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"), 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..."), mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
+               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"), mem_fun(*this, &RouteUI::remove_this_route)));
+       items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
 }
 
 gint
@@ -1393,7 +1444,7 @@ 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));
@@ -1442,7 +1493,7 @@ MixerStrip::set_embedded (bool yn)
 void
 MixerStrip::map_frozen ()
 {
-       ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen));
+       ENSURE_GUI_THREAD (*this, &MixerStrip::map_frozen)
 
        boost::shared_ptr<AudioTrack> at = audio_track();
 
@@ -1464,7 +1515,7 @@ MixerStrip::map_frozen ()
 void
 MixerStrip::hide_redirect_editors ()
 {
-       _route->foreach_processor (mem_fun (*this, &MixerStrip::hide_processor_editor));
+       _route->foreach_processor (sigc::mem_fun (*this, &MixerStrip::hide_processor_editor));
 }
 
 void
@@ -1486,36 +1537,48 @@ void
 MixerStrip::route_active_changed ()
 {
        RouteUI::route_active_changed ();
+       reset_strip_style ();
+}
+
+void
+MixerStrip::reset_strip_style ()
+{
+       if (_current_delivery && boost::dynamic_pointer_cast<Send>(_current_delivery)) {
+
+               gpm.set_fader_name ("SendStripBase");
 
-       if (is_midi_track()) {
-               if (_route->active()) {
-                       set_name ("MidiTrackStripBase");
-                       gpm.set_meter_strip_name ("MidiTrackStripBase");
-               } else {
-                       set_name ("MidiTrackStripBaseInactive");
-                       gpm.set_meter_strip_name ("MidiTrackStripBaseInactive");
-               }
-               gpm.set_fader_name ("MidiTrackFader");
-       } else if (is_audio_track()) {
-               if (_route->active()) {
-                       set_name ("AudioTrackStripBase");
-                       gpm.set_meter_strip_name ("AudioTrackMetrics");
-               } else {
-                       set_name ("AudioTrackStripBaseInactive");
-                       gpm.set_meter_strip_name ("AudioTrackMetricsInactive");
-               }
-               gpm.set_fader_name ("AudioTrackFader");
        } else {
-               if (_route->active()) {
-                       set_name ("AudioBusStripBase");
-                       gpm.set_meter_strip_name ("AudioBusMetrics");
+               
+               if (is_midi_track()) {
+                       if (_route->active()) {
+                               set_name ("MidiTrackStripBase");
+                               gpm.set_meter_strip_name ("MidiTrackStripBase");
+                       } else {
+                               set_name ("MidiTrackStripBaseInactive");
+                               gpm.set_meter_strip_name ("MidiTrackStripBaseInactive");
+                       }
+                       gpm.set_fader_name ("MidiTrackFader");
+               } else if (is_audio_track()) {
+                       if (_route->active()) {
+                               set_name ("AudioTrackStripBase");
+                               gpm.set_meter_strip_name ("AudioTrackMetrics");
+                       } else {
+                               set_name ("AudioTrackStripBaseInactive");
+                               gpm.set_meter_strip_name ("AudioTrackMetricsInactive");
+                       }
+                       gpm.set_fader_name ("AudioTrackFader");
                } else {
-                       set_name ("AudioBusStripBaseInactive");
-                       gpm.set_meter_strip_name ("AudioBusMetricsInactive");
+                       if (_route->active()) {
+                               set_name ("AudioBusStripBase");
+                               gpm.set_meter_strip_name ("AudioBusMetrics");
+                       } else {
+                               set_name ("AudioBusStripBaseInactive");
+                               gpm.set_meter_strip_name ("AudioBusMetricsInactive");
+                       }
+                       gpm.set_fader_name ("AudioBusFader");
+                       
+                       /* (no MIDI busses yet) */
                }
-               gpm.set_fader_name ("AudioBusFader");
-
-               /* (no MIDI busses yet) */
        }
 }
 
@@ -1535,10 +1598,11 @@ MixerStrip::engine_running ()
 {
 }
 
+/** Called when the metering point has changed */
 void
 MixerStrip::meter_changed (void *src)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src));
+       ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed, src)
 
        switch (_route->meter_point()) {
        case MeterInput:
@@ -1552,17 +1616,26 @@ MixerStrip::meter_changed (void *src)
        case MeterPostFader:
                meter_point_label.set_text (_("post"));
                break;
+
+       case MeterCustom:
+               meter_point_label.set_text (_("custom"));
+               break;
        }
 
        gpm.setup_meters ();
        // reset peak when meter point changes
        gpm.reset_peak_display();
-       set_width_enum (_width, this);
 }
 
 void
 MixerStrip::switch_io (boost::shared_ptr<Route> target)
 {
+       /* 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;
@@ -1581,52 +1654,74 @@ MixerStrip::switch_io (boost::shared_ptr<Route> target)
                return;
        }
 
-       boost::shared_ptr<Send> send;
+       boost::shared_ptr<Send> send = _route->internal_send_for (target);
 
-       if (_current_delivery && (send = boost::dynamic_pointer_cast<Send>(_current_delivery))) {
-               send->set_metering (false);
+       if (send) {
+               show_send (send);
+       } else {
+               revert_to_default_display ();
        }
+}
 
-       _current_delivery = _route->internal_send_for (target);
+void
+MixerStrip::drop_send ()
+{
+       boost::shared_ptr<Send> current_send;
 
-       cerr << "internal send from " << _route->name() << " to " << target->name() << " = "
-            << _current_delivery << endl;
+       if (_current_delivery && (current_send = boost::dynamic_pointer_cast<Send>(_current_delivery))) {
+               current_send->set_metering (false);
+       }
 
-       if (_current_delivery) {
-               send = boost::dynamic_pointer_cast<Send>(_current_delivery);
-               send->set_metering (true);
-               _current_delivery->GoingAway.connect (mem_fun (*this, &MixerStrip::revert_to_default_display));
-               gain_meter().set_controls (_route, send->meter(), send->amp());
-               panner_ui().set_panner (_current_delivery->panner());
+       send_gone_connection.disconnect ();
+       input_button.set_sensitive (true);
+       output_button.set_sensitive (true);
+}
 
-       } else {
-               _current_delivery = _route->main_outs ();
-               gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp());
-               panner_ui().set_panner (_route->main_outs()->panner());
-       }
+void
+MixerStrip::show_send (boost::shared_ptr<Send> send)
+{
+       assert (send != 0);
+
+       drop_send ();
 
+       _current_delivery = send;
+
+       send->set_metering (true);
+       _current_delivery->DropReferences.connect (send_gone_connection, boost::bind (&MixerStrip::revert_to_default_display, this), gui_context());
+
+       gain_meter().set_controls (_route, send->meter(), send->amp());
        gain_meter().setup_meters ();
+
+       panner_ui().set_panner (_current_delivery->panner());
        panner_ui().setup_pan ();
-}
 
+       input_button.set_sensitive (false);
+
+       if (boost::dynamic_pointer_cast<InternalSend>(send)) {
+               output_button.set_sensitive (false);
+       }
+
+       reset_strip_style ();
+}
 
 void
 MixerStrip::revert_to_default_display ()
 {
-       show_sends_button->set_active (false);
-
-       boost::shared_ptr<Send> send;
-
-       if (_current_delivery && (send = boost::dynamic_pointer_cast<Send>(_current_delivery))) {
-               send->set_metering (false);
+       if (show_sends_button) {
+               show_sends_button->set_active (false);
        }
 
+       drop_send ();
+
        _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().setup_pan ();
+
+       reset_strip_style ();
 }
 
 void
@@ -1782,3 +1877,15 @@ MixerStrip::on_leave_notify_event (GdkEventCrossing* ev)
 
        return false;
 }
+
+void
+MixerStrip::mono_button_clicked ()
+{
+       panners.set_mono (_mono_button.get_active ());
+}
+
+PluginSelector*
+MixerStrip::plugin_selector()
+{
+       return _mixer.plugin_selector();
+}