make meter point button work again, and allow momentary button action to work again
[ardour.git] / gtk2_ardour / mixer_strip.cc
index c98f4c5a0f59167e1542ee7aa900526d7c44b183..20f75f1100f1a281a989cb9f2efbe2bc2a4f0330 100644 (file)
@@ -21,8 +21,9 @@
 
 #include <sigc++/bind.h>
 
-#include <pbd/convert.h>
-#include <pbd/enumwriter.h>
+#include "pbd/convert.h"
+#include "pbd/enumwriter.h"
+#include "pbd/replace_all.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/bindable_button.h>
 
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/audioengine.h>
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/panner.h>
-#include <ardour/send.h>
-#include <ardour/processor.h>
-#include <ardour/profile.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/auto_bundle.h>
-#include <ardour/user_bundle.h>
+#include "ardour/ardour.h"
+#include "ardour/amp.h"
+#include "ardour/session.h"
+#include "ardour/audioengine.h"
+#include "ardour/route.h"
+#include "ardour/route_group.h"
+#include "ardour/audio_track.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/panner.h"
+#include "ardour/send.h"
+#include "ardour/processor.h"
+#include "ardour/profile.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/user_bundle.h"
 
 #include "ardour_ui.h"
 #include "ardour_dialog.h"
@@ -66,44 +68,60 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
 
+sigc::signal<void,boost::shared_ptr<Route> > MixerStrip::SwitchIO;
+
 int MixerStrip::scrollbar_height = 0;
 
-#ifdef VARISPEED_IN_MIXER_STRIP
-static void 
-speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg)
+MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer)
+       : AxisView(sess)
+       , RouteUI (sess, _("Mute"), _("Solo"), _("Record"))
+       ,_mixer(mx)
+       , _mixer_owned (in_mixer)
+       , pre_processor_box (PreFader, sess, mx.plugin_selector(), mx.selection(), this, in_mixer)
+       , post_processor_box (PostFader, sess, mx.plugin_selector(), mx.selection(), this, in_mixer)
+       , gpm (sess)
+       , panners (sess)
+       , button_table (3, 2)
+       , middle_button_table (1, 2)
+       , bottom_button_table (1, 2)
+       , meter_point_label (_("pre"))
+       , comment_button (_("Comments"))
+                        
 {
-       float val = adj.get_value ();
-
-       if (val == 1.0) {
-               strcpy (buf, "1");
-       } else {
-               snprintf (buf, 32, "%.3f", val);
+       init ();
+       
+       if (!_mixer_owned) {
+               /* the editor mixer strip: don't destroy it every time
+                  the underlying route goes away.
+               */
+               
+               self_destruct = false;
        }
 }
-#endif 
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt, bool in_mixer)
-       : AxisView(sess),
-         RouteUI (rt, sess, _("Mute"), _("Solo"), _("Record")),
-         _mixer(mx),
-         _mixer_owned (in_mixer),
-         pre_processor_box (PreFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
-         post_processor_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
-         gpm (_route, sess),
-         panners (_route, sess),
-         button_table (3, 2),
-         middle_button_table (1, 2),
-         bottom_button_table (1, 2),
-         meter_point_label (_("pre")),
-         comment_button (_("Comments")),
-         speed_adjustment (1.0, 0.001, 4.0, 0.001, 0.1),
-         speed_spinner (&speed_adjustment, "MixerStripSpeedBase", true)
-
+       : AxisView(sess)
+       , RouteUI (sess, _("Mute"), _("Solo"), _("Record"))
+       ,_mixer(mx)
+       , _mixer_owned (in_mixer)
+       , pre_processor_box (PreFader, sess, mx.plugin_selector(), mx.selection(), this, in_mixer)
+       , post_processor_box (PostFader, sess, mx.plugin_selector(), mx.selection(), this, in_mixer)
+       , gpm (sess)
+       , panners (sess)
+       , button_table (3, 2)
+       , middle_button_table (1, 2)
+       , bottom_button_table (1, 2)
+       , meter_point_label (_("pre"))
+       , comment_button (_("Comments"))
+                        
 {
-       if (set_color_from_route()) {
-               set_color (unique_random_color());
-       }
+       init ();
+       set_route (rt);
+}
 
+void
+MixerStrip::init ()
+{
        input_selector = 0;
        output_selector = 0;
        group_menu = 0;
@@ -111,45 +129,42 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        route_ops_menu = 0;
        ignore_comment_edit = false;
        ignore_toggle = false;
-       ignore_speed_adjustment = false;
        comment_window = 0;
        comment_area = 0;
        _width_owner = 0;
+       spacer = 0;
+
+       Gtk::Image* img;
+
+       img = manage (new Gtk::Image (::get_icon("strip_width")));
+       img->show ();
+
+       width_button.add (*img);
 
-       Gtk::Image *width_icon = manage (new Gtk::Image (::get_icon("strip_width")));
-       Gtk::Image *hide_icon = manage (new Gtk::Image (::get_icon("hide")));
-       width_button.add (*width_icon);
-       hide_button.add (*hide_icon);
+       img = manage (new Gtk::Image (::get_icon("hide")));
+       img->show ();
+
+       hide_button.add (*img);
 
        input_label.set_text (_("Input"));
+       ARDOUR_UI::instance()->set_tip (&input_button, _("Button 1 to choose inputs from a port matrix, button 3 to select inputs from a menu"), "");
        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);
 
        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);
 
-       _route->meter_change.connect (mem_fun(*this, &MixerStrip::meter_changed));
+       ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), "");
        meter_point_button.add (meter_point_label);
        meter_point_button.set_name ("MixerStripMeterPreButton");
        meter_point_label.set_name ("MixerStripMeterPreButton");
        
-       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;
-       }
-       
        /* TRANSLATORS: this string should be longest of the strings
           used to describe meter points. In english, it's "input".
        */
@@ -158,8 +173,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        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);
-       /* XXX what is this meant to do? */
-       //meter_point_button.signal_button_release_event().connect (mem_fun (gpm, &GainMeter::meter_release), false);
+       meter_point_button.signal_button_release_event().connect (mem_fun (gpm, &GainMeter::meter_release), false);
 
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
@@ -181,63 +195,23 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        bottom_button_table.set_homogeneous (true);
        bottom_button_table.attach (group_button, 0, 1, 0, 1);
        
-       if (is_audio_track()) {
-               boost::shared_ptr<AudioTrack> at = audio_track();
-
-               at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
-
-#ifdef VARISPEED_IN_MIXER_STRIP
-               speed_adjustment.signal_value_changed().connect (mem_fun(*this, &MixerStrip::speed_adjustment_changed));
-               
-               speed_frame.set_name ("BaseFrame");
-               speed_frame.set_shadow_type (Gtk::SHADOW_IN);
-               speed_frame.add (speed_spinner);
-               
-               speed_spinner.set_print_func (speed_printer, 0);
-
-               ARDOUR_UI::instance()->tooltips().set_tip (speed_spinner, _("Varispeed"));
-
-               button_table.attach (speed_frame, 0, 2, 5, 6);
-#endif /* VARISPEED_IN_MIXER_STRIP */
-
-       }
-       
-       if(rec_enable_button) {
-               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));
-       
-               rec_enable_button->set_name ("MixerRecordEnableButton");
-               button_table.attach (*rec_enable_button, 0, 2, 2, 3);
-       }
-       
        name_button.add (name_label);
        name_button.set_name ("MixerNameButton");
        Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
 
        name_label.set_name ("MixerNameButtonLabel");
-       if (_route->phase_invert()) {
-               name_label.set_text (X_("Ø ") + name_label.get_text());
-       } else {
-               name_label.set_text (_route->name());
-       }
-
+       ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
        group_button.add (group_label);
        group_button.set_name ("MixerGroupButton");
        group_label.set_name ("MixerGroupButtonLabel");
 
        comment_button.set_name ("MixerCommentButton");
 
-       ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment()==""        ?
-                                                       _("Click to Add/Edit Comments"):
-                                                       _route->comment());
-
        comment_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::comment_button_clicked));
        
        global_vpacker.set_border_width (0);
        global_vpacker.set_spacing (0);
 
-       VBox *whvbox = manage (new VBox);
-
        width_button.set_name ("MixerWidthButton");
        hide_button.set_name ("MixerHideButton");
        top_event_box.set_name ("MixerTopEventBox");
@@ -248,17 +222,16 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        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);
-       Gtk::Alignment *gain_meter_alignment = Gtk::manage(new Gtk::Alignment());
-       gain_meter_alignment->set_padding(0, 4, 0, 0);
-       gain_meter_alignment->add(gpm);
+       gain_meter_alignment.set_padding(0, 4, 0, 0);
+       gain_meter_alignment.add(gpm);
 
-       whvbox->pack_start (width_hide_box, true, true);
+       whvbox.pack_start (width_hide_box, true, true);
 
-       global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (pre_processor_box, true, true);
        global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (*gain_meter_alignment,Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (gain_meter_alignment,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (post_processor_box, true, true);
        if (!is_midi_track()) {
@@ -267,19 +240,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
 
-       if (route()->is_master() || route()->is_control()) {
-               
-               if (scrollbar_height == 0) {
-                       HScrollbar scrollbar;
-                       Gtk::Requisition requisition(scrollbar.size_request ());
-                       scrollbar_height = requisition.height;
-               }
-
-               EventBox* spacer = manage (new EventBox);
-               spacer->set_size_request (-1, scrollbar_height);
-               global_vpacker.pack_start (*spacer, false, false);
-       }
-
        global_frame.add (global_vpacker);
        global_frame.set_shadow_type (Gtk::SHADOW_IN);
        global_frame.set_name ("BaseFrame");
@@ -296,22 +256,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 
        _session.engine().Stopped.connect (mem_fun(*this, &MixerStrip::engine_stopped));
        _session.engine().Running.connect (mem_fun(*this, &MixerStrip::engine_running));
-       _route->input_changed.connect (mem_fun(*this, &MixerStrip::input_changed));
-       _route->output_changed.connect (mem_fun(*this, &MixerStrip::output_changed));
-       _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
-       _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
-       _route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
-       _route->mix_group_changed.connect (mem_fun(*this, &MixerStrip::mix_group_changed));
-       _route->panner().Changed.connect (mem_fun(*this, &MixerStrip::connect_to_pan));
-
-       if (is_audio_track()) {
-               audio_track()->DiskstreamChanged.connect (mem_fun(*this, &MixerStrip::diskstream_changed));
-               get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed));
-       }
-
-       _route->NameChanged.connect (mem_fun(*this, &RouteUI::name_changed));
-       _route->comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed));
-       _route->gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed));
 
        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);
@@ -321,11 +265,27 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        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);
 
+       /* 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_mix_group), false);
 
        _width = (Width) -1;
-       set_stuff_from_route ();
+
+       /* start off as a passthru strip. we'll correct this, if necessary,
+          in update_diskstream_display().
+       */
 
        /* start off as a passthru strip. we'll correct this, if necessary,
           in update_diskstream_display().
@@ -336,6 +296,142 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        else
                set_name ("AudioTrackStripBase");
 
+       add_events (Gdk::BUTTON_RELEASE_MASK);
+
+       SwitchIO.connect (mem_fun (*this, &MixerStrip::switch_io));
+       
+}
+
+MixerStrip::~MixerStrip ()
+{
+       GoingAway(); /* EMIT_SIGNAL */
+
+       delete input_selector;
+       delete output_selector;
+}
+
+void
+MixerStrip::set_route (boost::shared_ptr<Route> rt)
+{
+       if (rec_enable_button->get_parent()) {
+               button_table.remove (*rec_enable_button);
+       }
+
+       if (show_sends_button->get_parent()) {
+               button_table.remove (*show_sends_button);
+       }
+
+       RouteUI::set_route (rt);
+
+       delete input_selector;
+       input_selector = 0;
+
+       delete output_selector;
+       output_selector = 0;
+
+       boost::shared_ptr<Send> send;
+
+       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->gain_control(), rt->amp());
+       pre_processor_box.set_route (rt);
+       post_processor_box.set_route (rt);
+
+       if (set_color_from_route()) {
+               set_color (unique_random_color());
+       }
+
+       if (_mixer_owned && (route()->is_master() || route()->is_control())) {
+               
+               if (scrollbar_height == 0) {
+                       HScrollbar scrollbar;
+                       Gtk::Requisition requisition(scrollbar.size_request ());
+                       scrollbar_height = requisition.height;
+               }
+
+               spacer = manage (new EventBox);
+               spacer->set_size_request (-1, scrollbar_height);
+               global_vpacker.pack_start (*spacer, false, false);
+       }
+
+       if (is_audio_track()) {
+
+               boost::shared_ptr<AudioTrack> at = audio_track();
+
+               connections.push_back (at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen)));
+
+               button_table.attach (*rec_enable_button, 0, 2, 2, 3);
+               rec_enable_button->show();
+
+       } else if (!is_track()) {
+               /* non-master bus */
+
+               if (!_route->is_master()) {
+                       button_table.attach (*show_sends_button, 0, 2, 2, 3);
+                       show_sends_button->show();
+               }
+       }
+
+       if (_route->phase_invert()) {
+               name_label.set_text (X_("Ø ") + name_label.get_text());
+       } else {
+               name_label.set_text (_route->name());
+       }
+
+       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;
+       }
+
+       delete route_ops_menu;
+       route_ops_menu = 0;
+       
+       ARDOUR_UI::instance()->tooltips().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->mix_group_changed.connect (
+                       mem_fun(*this, &MixerStrip::mix_group_changed)));
+
+       if (_route->panner()) {
+               connections.push_back (_route->panner()->Changed.connect (
+                       mem_fun(*this, &MixerStrip::connect_to_pan)));
+       }
+
+       if (is_audio_track()) {
+               connections.push_back (audio_track()->DiskstreamChanged.connect (
+                       mem_fun(*this, &MixerStrip::diskstream_changed)));
+       }
+
+       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)));
+
+       set_stuff_from_route ();
+
        /* now force an update of all the various elements */
 
        pre_processor_box.update();
@@ -350,34 +446,32 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 
        panners.setup_pan ();
 
-       if (is_audio_track()) {
-               speed_changed ();
-       }
-
        update_diskstream_display ();
        update_input_display ();
        update_output_display ();
 
        add_events (Gdk::BUTTON_RELEASE_MASK);
 
-       whvbox->show();
-       hide_icon->show();
-       width_icon->show();
-       gain_meter_alignment->show_all();
-
        pre_processor_box.show();
 
        if (!route()->is_master() && !route()->is_control()) {
                /* we don't allow master or control routes to be hidden */
                hide_button.show();
        }
+
        width_button.show();
        width_hide_box.show();
+       whvbox.show ();
        global_frame.show();
        global_vpacker.show();
        button_table.show();
        middle_button_table.show();
        bottom_button_table.show();
+       pre_processor_box.show_all ();
+       gpm.show_all ();
+       panners.show_all ();
+       gain_meter_alignment.show ();
+       post_processor_box.show_all ();
        gain_unit_button.show();
        gain_unit_label.show();
        meter_point_button.show();
@@ -393,24 +487,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        comment_button.show();
        group_button.show();
        group_label.show();
-       speed_spinner.show();
-       speed_label.show();
-       speed_frame.show();
-
-       show();
-}
-
-MixerStrip::~MixerStrip ()
-{
-       GoingAway(); /* EMIT_SIGNAL */
 
-       if (input_selector) {
-               delete input_selector;
-       }
-
-       if (output_selector) {
-               delete output_selector;
-       }
+       show ();
 }
 
 void
@@ -422,11 +500,11 @@ MixerStrip::set_stuff_from_route ()
 
        /* if width is not set, it will be set by the MixerUI or editor */
 
-       if ((prop = xml_node->property ("strip_width")) != 0) {
+       if ((prop = xml_node->property ("strip-width")) != 0) {
                set_width (Width (string_2_enum (prop->value(), _width)), this);
        }
 
-       if ((prop = xml_node->property ("shown_mixer")) != 0) {
+       if ((prop = xml_node->property ("shown-mixer")) != 0) {
                if (prop->value() == "no") {
                        _marked_for_display = false;
                } else {
@@ -448,7 +526,7 @@ MixerStrip::set_width (Width w, void* owner)
        pre_processor_box.set_width (w);
        post_processor_box.set_width (w);
 
-       boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->list();
+       boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->alist();
 
        _width_owner = owner;
 
@@ -457,38 +535,52 @@ MixerStrip::set_width (Width w, void* owner)
        _width = w;
 
        if (_width_owner == this) {
-               xml_node->add_property ("strip_width", enum_2_string (_width));
+               xml_node->add_property ("strip-width", enum_2_string (_width));
        }
 
        switch (w) {
        case Wide:
-               set_size_request (-1, -1);
-               
+
                if (rec_enable_button)  {
-                       ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("record"));
+                       ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Record"));
+               }
+               if (show_sends_button)  {
+                       ((Gtk::Label*)show_sends_button->get_child())->set_text (_("Sends"));
                }
                ((Gtk::Label*)mute_button->get_child())->set_text  (_("Mute"));
                ((Gtk::Label*)solo_button->get_child())->set_text (_("Solo"));
 
                if (_route->comment() == "") {
-                      comment_button.unset_bg (STATE_NORMAL);
-                      ((Gtk::Label*)comment_button.get_child())->set_text (_("comments"));
+                       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*"));
+                       comment_button.modify_bg (STATE_NORMAL, color());
+                       ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
+               }
+
+               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
+                               gpm.astyle_string(gain_automation->automation_style()));
+               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
+                               gpm.astate_string(gain_automation->automation_state()));
+
+               if (_route->panner()) {
+                       ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (
+                                       panners.astyle_string(_route->panner()->automation_style()));
+                       ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (
+                                       panners.astate_string(_route->panner()->automation_state()));
                }
 
-               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(gain_automation->automation_style()));
-               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(gain_automation->automation_state()));
-               ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.astyle_string(_route->panner().automation_style()));
-               ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.astate_string(_route->panner().automation_state()));
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
+               set_size_request (-1, -1);
                break;
 
        case Narrow:
                if (rec_enable_button) {
                        ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Rec"));
                }
+               if (show_sends_button) {
+                       ((Gtk::Label*)show_sends_button->get_child())->set_text (_("Snd"));
+               }
                ((Gtk::Label*)mute_button->get_child())->set_text (_("M"));
                ((Gtk::Label*)solo_button->get_child())->set_text (_("S"));
 
@@ -500,20 +592,29 @@ MixerStrip::set_width (Width w, void* owner)
                       ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
                }
 
-               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(gain_automation->automation_style()));
-               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(gain_automation->automation_state()));
-               ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style()));
-               ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state()));
+               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
+                               gpm.short_astyle_string(gain_automation->automation_style()));
+               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
+                               gpm.short_astate_string(gain_automation->automation_state()));
+               
+               if (_route->panner()) {
+                       ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (
+                       panners.short_astyle_string(_route->panner()->automation_style()));
+                       ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (
+                       panners.short_astate_string(_route->panner()->automation_state()));
+               }
+
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
                set_size_request (max (50, gpm.get_gm_width()), -1);
                break;
        }
-
        update_input_display ();
        update_output_display ();
        mix_group_changed (0);
        name_changed ();
-
+#ifdef GTKOSX
+       WidthChanged();
+#endif
 }
 
 void
@@ -524,9 +625,9 @@ MixerStrip::set_packed (bool yn)
        ensure_xml_node ();
 
        if (_packed) {
-               xml_node->add_property ("shown_mixer", "yes");
+               xml_node->add_property ("shown-mixer", "yes");
        } else {
-               xml_node->add_property ("shown_mixer", "no");
+               xml_node->add_property ("shown-mixer", "no");
        }
 }
 
@@ -545,25 +646,38 @@ MixerStrip::output_press (GdkEventButton *ev)
        switch (ev->button) {
 
        case 1:
+               edit_output_configuration ();
+               break;
+               
+       case 3:
        {
                output_menu.set_name ("ArdourContextMenu");
                citems.clear();
                
-               citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_output_configuration)));
-               citems.push_back (SeparatorElem());
                citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
                citems.push_back (SeparatorElem());
 
-               std::vector<boost::shared_ptr<Bundle> > current = _route->bundles_connected_to_outputs ();
+               ARDOUR::BundleList current = _route->output()->bundles_connected ();
 
-               _session.foreach_bundle (
-                       bind (mem_fun (*this, &MixerStrip::add_bundle_to_output_menu), current)
-                       );
+               boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
+               for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
+                       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);
+               }
+
+               if (citems.size() == 2) {
+                       /* no routes added; remove the separator */
+                       citems.pop_back ();
+               }
 
                output_menu.popup (1, ev->time);
                break;
        }
-               
+
        default:
                break;
        }
@@ -574,7 +688,7 @@ void
 MixerStrip::edit_output_configuration ()
 {
        if (output_selector == 0) {
-               output_selector = new IOSelectorWindow (_session, _route, false);
+               output_selector = new IOSelectorWindow (_session, _route->output());
        } 
 
        if (output_selector->is_visible()) {
@@ -588,7 +702,7 @@ void
 MixerStrip::edit_input_configuration ()
 {
        if (input_selector == 0) {
-               input_selector = new IOSelectorWindow (_session, _route, true);
+               input_selector = new IOSelectorWindow (_session, _route->input());
        } 
 
        if (input_selector->is_visible()) {
@@ -616,17 +730,30 @@ MixerStrip::input_press (GdkEventButton *ev)
        switch (ev->button) {
 
        case 1:
+               edit_input_configuration ();
+               break;
+
+       case 3:
        {
-               citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_input_configuration)));
-               citems.push_back (SeparatorElem());
                citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
                citems.push_back (SeparatorElem());
 
-               std::vector<boost::shared_ptr<Bundle> > current = _route->bundles_connected_to_inputs ();
+               ARDOUR::BundleList current = _route->input()->bundles_connected ();
 
-               _session.foreach_bundle (
-                       bind (mem_fun (*this, &MixerStrip::add_bundle_to_input_menu), current)
-                       );
+               boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
+               for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
+                       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);
+               }
+
+               if (citems.size() == 2) {
+                       /* no routes added; remove the separator */
+                       citems.pop_back ();
+               }
 
                input_menu.popup (1, ev->time);
                break;
@@ -638,83 +765,86 @@ MixerStrip::input_press (GdkEventButton *ev)
 }
 
 void
-MixerStrip::bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
+MixerStrip::bundle_input_toggled (boost::shared_ptr<ARDOUR::Bundle> c)
 {
-       if (!ignore_toggle) {
+       if (ignore_toggle) {
+               return;
+       }
 
-               try { 
-                       _route->connect_input_ports_to_bundle (c, this);
-               }
+       ARDOUR::BundleList current = _route->input()->bundles_connected ();
 
-               catch (AudioEngine::PortRegistrationFailure& err) {
-                       error << _("could not register new ports required for that bundle")
-                             << endmsg;
-               }
+       if (std::find (current.begin(), current.end(), c) == current.end()) {
+               _route->input()->connect_ports_to_bundle (c, this);
+       } else {
+               _route->input()->disconnect_ports_from_bundle (c, this);
        }
 }
 
 void
-MixerStrip::bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
+MixerStrip::bundle_output_toggled (boost::shared_ptr<ARDOUR::Bundle> c)
 {
-       if (!ignore_toggle) {
+       if (ignore_toggle) {
+               return;
+       }
 
-               try { 
-                       _route->connect_output_ports_to_bundle (c, this);
-               }
+       ARDOUR::BundleList current = _route->output()->bundles_connected ();
 
-               catch (AudioEngine::PortRegistrationFailure& err) {
-                       error << _("could not register new ports required for that bundle")
-                             << endmsg;
-               }
+       if (std::find (current.begin(), current.end(), c) == current.end()) {
+               _route->output()->connect_ports_to_bundle (c, this);
+       } else {
+               _route->output()->disconnect_ports_from_bundle (c, this);
        }
 }
 
 void
-MixerStrip::add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, std::vector<boost::shared_ptr<Bundle> > const & current)
+MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
 {
        using namespace Menu_Helpers;
 
-       /* the input menu needs to contain only output bundles (that we
-          can connect inputs to */
-       if (b->ports_are_outputs() == false) {
+       if (b->ports_are_outputs() == false ||
+           route()->input()->default_type() != b->type() ||
+           b->nchannels() != _route->n_inputs().get (b->type ())) {
+               
                return;
        }
 
        MenuList& citems = input_menu.items();
        
-       if (b->nchannels() == _route->n_inputs()) {
-
-               citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), b)));
-
-               if (std::find (current.begin(), current.end(), b) != current.end()) {
-                       ignore_toggle = true;
-                       dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
-                       ignore_toggle = false;
-               }
+       std::string n = b->name ();
+       replace_all (n, "_", " ");
+       
+       citems.push_back (CheckMenuElem (n, bind (mem_fun(*this, &MixerStrip::bundle_input_toggled), b)));
+       
+       if (std::find (current.begin(), current.end(), b) != current.end()) {
+               ignore_toggle = true;
+               dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
+               ignore_toggle = false;
        }
 }
 
 void
-MixerStrip::add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, std::vector<boost::shared_ptr<Bundle> > const & current)
+MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
 {
        using namespace Menu_Helpers;
 
-       /* the output menu needs to contain only input bundles (that we
-          can connect outputs to */
-       if (b->ports_are_inputs() == false) {
+       if (b->ports_are_inputs() == false ||
+           route()->output()->default_type() != b->type() ||
+           b->nchannels() != _route->n_outputs().get (b->type ())) {
+               
                return;
        }
 
-       if (b->nchannels() == _route->n_outputs()) {
-
-               MenuList& citems = output_menu.items();
-               citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), b)));
-               
-               if (std::find (current.begin(), current.end(), b) != current.end()) {
-                       ignore_toggle = true;
-                       dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
-                       ignore_toggle = false;
-               }
+       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)));
+       
+       if (std::find (current.begin(), current.end(), b) != current.end()) {
+               ignore_toggle = true;
+               dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
+               ignore_toggle = false;
        }
 }
 
@@ -743,11 +873,17 @@ MixerStrip::connect_to_pan ()
        panstate_connection.disconnect ();
        panstyle_connection.disconnect ();
 
-       if (!_route->panner().empty()) {
-               StreamPanner* sp = _route->panner().front();
+       if (!_route->panner()) {
+               return;
+       }
+
+       boost::shared_ptr<ARDOUR::AutomationControl> pan_control
+               = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
+                               _route->panner()->data().control(Evoral::Parameter(PanAutomation)));
 
-               panstate_connection = sp->pan_control()->list()->automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
-               panstyle_connection = sp->pan_control()->list()->automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed));
+       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));
        }
 
        panners.pan_changed (this);
@@ -756,11 +892,12 @@ MixerStrip::connect_to_pan ()
 void
 MixerStrip::update_input_display ()
 {
-       std::vector<boost::shared_ptr<ARDOUR::Bundle> > c = _route->bundles_connected_to_inputs ();
+       ARDOUR::BundleList const c = _route->input()->bundles_connected();
 
-       /* XXX: how do we represent >1 connected bundle? */
-       if (c.empty() == false) {
-               input_label.set_text (c[0]->name());
+       if (c.size() > 1) {
+               input_label.set_text (_("Inputs"));
+       } else if (c.size() == 1) {
+               input_label.set_text (c[0]->name ());
        } else {
                switch (_width) {
                case Wide:
@@ -777,10 +914,12 @@ MixerStrip::update_input_display ()
 void
 MixerStrip::update_output_display ()
 {
-       std::vector<boost::shared_ptr<ARDOUR::Bundle> > c = _route->bundles_connected_to_outputs ();
+       ARDOUR::BundleList const c = _route->output()->bundles_connected ();
 
        /* XXX: how do we represent >1 connected bundle? */
-       if (c.empty() == false) {
+       if (c.size() > 1) {
+               output_label.set_text (_("Outputs"));
+       } else if (c.size() == 1) {
                output_label.set_text (c[0]->name());
        } else {
                switch (_width) {
@@ -792,6 +931,7 @@ MixerStrip::update_output_display ()
                        break;
                }
        }
+
        gpm.setup_meters ();
        panners.setup_pan ();
 }
@@ -1025,12 +1165,14 @@ void
 MixerStrip::build_route_ops_menu ()
 {
        using namespace Menu_Helpers;
-       route_ops_menu = manage (new Menu);
+       route_ops_menu = new Menu;
        route_ops_menu->set_name ("ArdourContextMenu");
 
        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)));
+       rename_menu_item = &items.back();
        items.push_back (SeparatorElem());
        items.push_back (CheckMenuElem (_("Active"), mem_fun (*this, &RouteUI::toggle_route_active)));
        route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
@@ -1048,11 +1190,10 @@ MixerStrip::build_route_ops_menu ()
        denormal_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
        denormal_menu_item->set_active (_route->denormal_protection());
 
-       build_remote_control_menu ();
-       
-       items.push_back (SeparatorElem());
        if (!Profile->get_sae()) {
-              items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+               build_remote_control_menu ();
+               items.push_back (SeparatorElem());
+               items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
         }
 
        items.push_back (SeparatorElem());
@@ -1062,13 +1203,11 @@ MixerStrip::build_route_ops_menu ()
 gint
 MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-       if (ev->button == 1) {
+       if (ev->button == 1 || ev->button == 3) {
                list_route_operations ();
 
-               Menu_Helpers::MenuList& items = route_ops_menu->items();
                /* do not allow rename if the track is record-enabled */
-               static_cast<MenuItem*> (&items.front())->set_sensitive (!_route->record_enabled());
-
+               rename_menu_item->set_sensitive (!_route->record_enabled());
                route_ops_menu->popup (1, ev->time);
        }
        return FALSE;
@@ -1084,43 +1223,6 @@ MixerStrip::list_route_operations ()
        refresh_remote_control_menu();
 }
 
-
-void
-MixerStrip::speed_adjustment_changed ()
-{
-       /* since there is a usable speed adjustment, there has to be a diskstream */
-       if (!ignore_speed_adjustment) {
-               get_diskstream()->set_speed (speed_adjustment.get_value());
-       }
-}
-
-void
-MixerStrip::speed_changed ()
-{
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_speed_display));
-}
-
-void
-MixerStrip::update_speed_display ()
-{
-       float val;
-       
-       val = get_diskstream()->speed();
-
-       if (val != 1.0) {
-               speed_spinner.set_name ("MixerStripSpeedBaseNotOne");
-       } else {
-               speed_spinner.set_name ("MixerStripSpeedBase");
-       }
-
-       if (speed_adjustment.get_value() != val) {
-               ignore_speed_adjustment = true;
-               speed_adjustment.set_value (val);
-               ignore_speed_adjustment = false;
-       }
-}                      
-
-
 void
 MixerStrip::set_selected (bool yn)
 {
@@ -1167,16 +1269,16 @@ MixerStrip::width_clicked ()
 void
 MixerStrip::hide_clicked ()
 {
-    // LAME fix to reset the button status for when it is redisplayed (part 1)
-    hide_button.set_sensitive(false);
-    
+       // LAME fix to reset the button status for when it is redisplayed (part 1)
+       hide_button.set_sensitive(false);
+       
        if (_embedded) {
-                Hiding(); /* EMIT_SIGNAL */
+               Hiding(); /* EMIT_SIGNAL */
        } else {
                _mixer.hide_strip (this);
        }
        
-    // (part 2)
+       // (part 2)
        hide_button.set_sensitive(true);
 }
 
@@ -1198,12 +1300,10 @@ MixerStrip::map_frozen ()
                case AudioTrack::Frozen:
                        pre_processor_box.set_sensitive (false);
                        post_processor_box.set_sensitive (false);
-                       speed_spinner.set_sensitive (false);
                        break;
                default:
                        pre_processor_box.set_sensitive (true);
                        post_processor_box.set_sensitive (true);
-                       speed_spinner.set_sensitive (true);
                        // XXX need some way, maybe, to retoggle redirect editors
                        break;
                }
@@ -1215,12 +1315,17 @@ MixerStrip::map_frozen ()
 void
 MixerStrip::hide_redirect_editors ()
 {
-       _route->foreach_processor (this, &MixerStrip::hide_processor_editor);
+       _route->foreach_processor (mem_fun (*this, &MixerStrip::hide_processor_editor));
 }
 
 void
-MixerStrip::hide_processor_editor (boost::shared_ptr<Processor> processor)
+MixerStrip::hide_processor_editor (boost::weak_ptr<Processor> p)
 {
+       boost::shared_ptr<Processor> processor (p.lock ());
+       if (!processor) {
+               return;
+       }
+       
        void* gui = processor->get_gui ();
        
        if (gui) {
@@ -1284,26 +1389,91 @@ MixerStrip::engine_running ()
 void
 MixerStrip::meter_changed (void *src)
 {
-
        ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src));
 
        switch (_route->meter_point()) {
-               case MeterInput:
-                       meter_point_label.set_text (_("input"));
-                       break;
-
-               case MeterPreFader:
-                       meter_point_label.set_text (_("pre"));
-                       break;
+       case MeterInput:
+               meter_point_label.set_text (_("input"));
+               break;
 
-               case MeterPostFader:
-                       meter_point_label.set_text (_("post"));
-                       break;
+       case MeterPreFader:
+               meter_point_label.set_text (_("pre"));
+               break;
+               
+       case MeterPostFader:
+               meter_point_label.set_text (_("post"));
+               break;
        }
 
        gpm.setup_meters ();
-               // reset peak when meter point changes
-               gpm.reset_peak_display();
-               set_width(_width, this);
+       // reset peak when meter point changes
+       gpm.reset_peak_display();
+       set_width(_width, this);
+}
+
+void
+MixerStrip::switch_io (boost::shared_ptr<Route> target)
+{
+       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;
+       }
+       
+       boost::shared_ptr<Send> send;
+
+       if (_current_delivery && (send = boost::dynamic_pointer_cast<Send>(_current_delivery))) {
+               send->set_metering (false);
+       }
+       
+       _current_delivery = _route->send_for (target->input());
+
+       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()->gain_control(), send->amp());
+               panner_ui().set_panner (_current_delivery->panner());
+
+       } else {
+               _current_delivery = _route->main_outs ();
+               gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->gain_control(), _route->amp());
+               panner_ui().set_panner (_route->main_outs()->panner());
+       }
+       
+       gain_meter().setup_meters ();
+       panner_ui().setup_pan ();
+}
+
+
+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);
+       }
+       
+       _current_delivery = _route->main_outs();
+
+       gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->gain_control(), _route->amp());
+       gain_meter().setup_meters ();
+       panner_ui().set_panner (_route->main_outs()->panner());
+       panner_ui().setup_pan ();
 }