Preserve stacked / overlaid state of tracks in the session file.
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 6f591bc6c0059567a959dde3fead2880a1f8be76..8ab7454ab8846e519714b2095955d14864bae692 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/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"
@@ -55,6 +58,7 @@
 #include "io_selector.h"
 #include "utils.h"
 #include "gui_thread.h"
+#include "route_group_menu.h"
 
 #include "i18n.h"
 
@@ -65,29 +69,16 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
 
-int MixerStrip::scrollbar_height = 0;
-
-#ifdef VARISPEED_IN_MIXER_STRIP
-static void 
-speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg)
-{
-       float val = adj.get_value ();
+sigc::signal<void,boost::shared_ptr<Route> > MixerStrip::SwitchIO;
 
-       if (val == 1.0) {
-               strcpy (buf, "1");
-       } else {
-               snprintf (buf, 32, "%.3f", val);
-       }
-}
-#endif 
+int MixerStrip::scrollbar_height = 0;
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer)
        : AxisView(sess)
-       , RouteUI (sess, _("Mute"), _("Solo"), _("Record"))
+       , RouteUI (sess)
        ,_mixer(mx)
        , _mixer_owned (in_mixer)
-       , pre_processor_box (PreFader, sess, mx.plugin_selector(), mx.selection(), in_mixer)
-       , post_processor_box (PostFader, sess, mx.plugin_selector(), mx.selection(), in_mixer)
+       , processor_box (sess, mx.plugin_selector(), mx.selection(), this, in_mixer)
        , gpm (sess)
        , panners (sess)
        , button_table (3, 2)
@@ -95,20 +86,25 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer)
        , 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)
                         
 {
        init ();
+       
+       if (!_mixer_owned) {
+               /* the editor mixer strip: don't destroy it every time
+                  the underlying route goes away.
+               */
+               
+               self_destruct = false;
+       }
 }
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt, bool in_mixer)
        : AxisView(sess)
-       , RouteUI (sess, _("Mute"), _("Solo"), _("Record"))
+       , RouteUI (sess)
        ,_mixer(mx)
        , _mixer_owned (in_mixer)
-       , pre_processor_box (PreFader, sess, mx.plugin_selector(), mx.selection(), in_mixer)
-       , post_processor_box (PostFader, sess, mx.plugin_selector(), mx.selection(), in_mixer)
+       , processor_box (sess, mx.plugin_selector(), mx.selection(), this, in_mixer)
        , gpm (sess)
        , panners (sess)
        , button_table (3, 2)
@@ -116,11 +112,10 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        , 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)
                         
 {
        init ();
+       set_button_names ();
        set_route (rt);
 }
 
@@ -134,7 +129,6 @@ MixerStrip::init ()
        route_ops_menu = 0;
        ignore_comment_edit = false;
        ignore_toggle = false;
-       ignore_speed_adjustment = false;
        comment_window = 0;
        comment_area = 0;
        _width_owner = 0;
@@ -153,16 +147,18 @@ MixerStrip::init ()
        hide_button.add (*img);
 
        input_label.set_text (_("Input"));
-       ARDOUR_UI::instance()->set_tip (&input_button, _("Click to choose inputs"), "");
+       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, _("Click to choose outputs"), "");
+       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);
 
        ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), "");
        meter_point_button.add (meter_point_label);
@@ -177,8 +173,7 @@ 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);
-       /* 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));
 
@@ -234,11 +229,10 @@ MixerStrip::init ()
 
        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 (processor_box, true, true);
        global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (gain_meter_alignment,Gtk::PACK_SHRINK);
        global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (post_processor_box, true, true);
        if (!is_midi_track()) {
                global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
        }
@@ -278,8 +272,13 @@ MixerStrip::init ()
        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);
+       group_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::select_route_group), false);
 
        _width = (Width) -1;
 
@@ -296,7 +295,16 @@ MixerStrip::init ()
        else
                set_name ("AudioTrackStripBase");
 
-       add_events (Gdk::BUTTON_RELEASE_MASK);
+       add_events (Gdk::BUTTON_RELEASE_MASK|
+                   Gdk::ENTER_NOTIFY_MASK|
+                   Gdk::LEAVE_NOTIFY_MASK|
+                   Gdk::KEY_PRESS_MASK|
+                   Gdk::KEY_RELEASE_MASK);
+
+       set_flags (get_flags() | Gtk::CAN_FOCUS);
+       
+       SwitchIO.connect (mem_fun (*this, &MixerStrip::switch_io));
+       
 }
 
 MixerStrip::~MixerStrip ()
@@ -314,11 +322,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                button_table.remove (*rec_enable_button);
        }
 
-#ifdef VARISPEED_IN_MIXER_STRIP
-       if (speed_frame->get_parent()) {
-               button_table.remove (*speed_frame);
+       if (show_sends_button->get_parent()) {
+               button_table.remove (*show_sends_button);
        }
-#endif
 
        RouteUI::set_route (rt);
 
@@ -328,10 +334,17 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        delete output_selector;
        output_selector = 0;
 
-       panners.set_io (rt);
-       gpm.set_io (rt);
-       pre_processor_box.set_route (rt);
-       post_processor_box.set_route (rt);
+       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->amp());
+       processor_box.set_route (rt);
 
        if (set_color_from_route()) {
                set_color (unique_random_color());
@@ -356,22 +369,16 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
                connections.push_back (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 */
-
                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()) {
@@ -401,51 +408,54 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                                                   _("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->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed)));
-       connections.push_back (_route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed)));
-       connections.push_back (_route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed)));
-       connections.push_back (_route->mix_group_changed.connect (mem_fun(*this, &MixerStrip::mix_group_changed)));
-       connections.push_back (_route->panner().Changed.connect (mem_fun(*this, &MixerStrip::connect_to_pan)));
+       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)));
+
+       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 (get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed)));
+               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)));
+       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();
-       post_processor_box.update();
+       processor_box.update();
        mute_changed (0);
        solo_changed (0);
        name_changed ();
        comment_changed (0);
-       mix_group_changed (0);
+       route_group_changed (0);
 
        connect_to_pan ();
 
        panners.setup_pan ();
 
-       if (is_audio_track()) {
-               speed_changed ();
-       }
-
        update_diskstream_display ();
        update_input_display ();
        update_output_display ();
 
        add_events (Gdk::BUTTON_RELEASE_MASK);
 
-       pre_processor_box.show();
+       processor_box.show();
 
        if (!route()->is_master() && !route()->is_control()) {
                /* we don't allow master or control routes to be hidden */
@@ -460,11 +470,10 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        button_table.show();
        middle_button_table.show();
        bottom_button_table.show();
-       pre_processor_box.show_all ();
+       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();
@@ -480,9 +489,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        comment_button.show();
        group_button.show();
        group_label.show();
-       speed_spinner.show();
-       speed_label.show();
-       speed_frame.show();
 
        show ();
 }
@@ -497,7 +503,7 @@ 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) {
-               set_width (Width (string_2_enum (prop->value(), _width)), this);
+               set_width_enum (Width (string_2_enum (prop->value(), _width)), this);
        }
 
        if ((prop = xml_node->property ("shown-mixer")) != 0) {
@@ -513,14 +519,13 @@ MixerStrip::set_stuff_from_route ()
 }
 
 void
-MixerStrip::set_width (Width w, void* owner)
+MixerStrip::set_width_enum (Width w, void* owner)
 {
        /* always set the gpm width again, things may be hidden */
 
        gpm.set_width (w);
        panners.set_width (w);
-       pre_processor_box.set_width (w);
-       post_processor_box.set_width (w);
+       processor_box.set_width (w);
 
        boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->alist();
 
@@ -534,37 +539,42 @@ MixerStrip::set_width (Width w, void* owner)
                xml_node->add_property ("strip-width", enum_2_string (_width));
        }
 
+       set_button_names ();
+
        switch (w) {
        case Wide:
-
-               if (rec_enable_button)  {
-                       ((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"));
 
                if (_route->comment() == "") {
                       comment_button.unset_bg (STATE_NORMAL);
@@ -574,21 +584,27 @@ 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);
+       route_group_changed (0);
        name_changed ();
-#ifdef GTKOSX
-       WidthChanged();
-#endif
+       WidthChanged ();
 }
 
 void
@@ -620,25 +636,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 ();
+
+               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);
+               }
 
-               _session.foreach_bundle (
-                       bind (mem_fun (*this, &MixerStrip::add_bundle_to_output_menu), current)
-                       );
+               if (citems.size() == 2) {
+                       /* no routes added; remove the separator */
+                       citems.pop_back ();
+               }
 
                output_menu.popup (1, ev->time);
                break;
        }
-               
+
        default:
                break;
        }
@@ -649,7 +678,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()) {
@@ -663,7 +692,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()) {
@@ -691,17 +720,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 ();
+
+               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);
+               }
 
-               _session.foreach_bundle (
-                       bind (mem_fun (*this, &MixerStrip::add_bundle_to_input_menu), 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;
@@ -713,83 +755,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().get (b->type ())) {
-
-               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().get (b->type ())) {
-
-               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;
        }
 }
 
@@ -818,9 +863,13 @@ MixerStrip::connect_to_pan ()
        panstate_connection.disconnect ();
        panstyle_connection.disconnect ();
 
-               boost::shared_ptr<ARDOUR::AutomationControl> pan_control
-                       = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
-                               _route->panner().data().control(Evoral::Parameter( PanAutomation ) ));
+       if (!_route->panner()) {
+               return;
+       }
+
+       boost::shared_ptr<ARDOUR::AutomationControl> pan_control
+               = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
+                               _route->panner()->data().control(Evoral::Parameter(PanAutomation)));
 
        if (pan_control) {
                panstate_connection = pan_control->alist()->automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
@@ -833,11 +882,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:
@@ -854,10 +904,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) {
@@ -887,17 +939,17 @@ MixerStrip::diskstream_changed ()
 }      
 
 void
-MixerStrip::input_changed (IOChange change, void *src)
+MixerStrip::input_changed (IOChange /*change*/, void */*src*/)
 {
        Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_input_display));
-       set_width(_width, this);
+       set_width_enum (_width, this);
 }
 
 void
-MixerStrip::output_changed (IOChange change, void *src)
+MixerStrip::output_changed (IOChange /*change*/, void */*src*/)
 {
        Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display));
-       set_width(_width, this);
+       set_width_enum (_width, this);
 }
 
 
@@ -1002,64 +1054,48 @@ MixerStrip::comment_changed (void *src)
 }
 
 void
-MixerStrip::set_mix_group (RouteGroup *rg)
-{
-       _route->set_mix_group (rg, this);
-}
-
-void
-MixerStrip::add_mix_group_to_menu (RouteGroup *rg, RadioMenuItem::Group* group)
+MixerStrip::set_route_group (RouteGroup *rg)
 {
-       using namespace Menu_Helpers;
-
-       MenuList& items = group_menu->items();
-
-       items.push_back (RadioMenuElem (*group, rg->name(), bind (mem_fun(*this, &MixerStrip::set_mix_group), rg)));
-
-       if (_route->mix_group() == rg) {
-               static_cast<RadioMenuItem*>(&items.back())->set_active ();
-       }
+       _route->set_route_group (rg, this);
 }
 
 bool
-MixerStrip::select_mix_group (GdkEventButton *ev)
+MixerStrip::select_route_group (GdkEventButton *ev)
 {
        using namespace Menu_Helpers;
 
-       if (group_menu == 0) {
-               group_menu = new Menu;
-       } 
-       group_menu->set_name ("ArdourContextMenu");
-       MenuList& items = group_menu->items();
-       RadioMenuItem::Group group;
+       if (ev->button == 1) {
 
-       switch (ev->button) {
-       case 1:
-
-               items.clear ();
-               items.push_back (RadioMenuElem (group, _("No group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
-
-               _session.foreach_mix_group (bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group));
+               if (group_menu == 0) {
+                       
+                       group_menu = new RouteGroupMenu (
+                               _session,
+                               (RouteGroup::Property) (RouteGroup::Gain | RouteGroup::Mute | RouteGroup::Solo)
+                               );
+                       
+                       group_menu->GroupSelected.connect (mem_fun (*this, &MixerStrip::set_route_group));
+               }
 
                group_menu->popup (1, ev->time);
-               break;
-
-       default:
-               break;
        }
        
        return true;
 }      
 
 void
-MixerStrip::mix_group_changed (void *ignored)
+MixerStrip::route_group_changed (void *ignored)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::mix_group_changed), ignored));
-       
-       RouteGroup *rg = _route->mix_group();
+       ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_group_changed), ignored));
        
+       RouteGroup *rg = _route->route_group();
+
        if (rg) {
-               group_label.set_text (rg->name());
+               /* XXX: this needs a better algorithm */
+               string truncated = rg->name ();
+               if (truncated.length () > 5) {
+                       truncated = truncated.substr (0, 5);
+               }
+               group_label.set_text (truncated);
        } else {
                switch (_width) {
                case Wide:
@@ -1108,7 +1144,9 @@ 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)));
+       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());
@@ -1142,10 +1180,8 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
        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;
@@ -1161,43 +1197,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)
 {
@@ -1233,10 +1232,10 @@ MixerStrip::width_clicked ()
 {
        switch (_width) {
        case Wide:
-               set_width (Narrow, this);
+               set_width_enum (Narrow, this);
                break;
        case Narrow:
-               set_width (Wide, this);
+               set_width_enum (Wide, this);
                break;
        }
 }
@@ -1244,16 +1243,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);
 }
 
@@ -1273,14 +1272,10 @@ MixerStrip::map_frozen ()
        if (at) {
                switch (at->freeze_state()) {
                case AudioTrack::Frozen:
-                       pre_processor_box.set_sensitive (false);
-                       post_processor_box.set_sensitive (false);
-                       speed_spinner.set_sensitive (false);
+                       processor_box.set_sensitive (false);
                        break;
                default:
-                       pre_processor_box.set_sensitive (true);
-                       post_processor_box.set_sensitive (true);
-                       speed_spinner.set_sensitive (true);
+                       processor_box.set_sensitive (true);
                        // XXX need some way, maybe, to retoggle redirect editors
                        break;
                }
@@ -1348,9 +1343,9 @@ MixerStrip::route_active_changed ()
 }
 
 RouteGroup*
-MixerStrip::mix_group() const
+MixerStrip::route_group() const
 {
-       return _route->mix_group();
+       return _route->route_group();
 }
 
 void
@@ -1366,7 +1361,6 @@ MixerStrip::engine_running ()
 void
 MixerStrip::meter_changed (void *src)
 {
-
        ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src));
 
        switch (_route->meter_point()) {
@@ -1386,6 +1380,228 @@ MixerStrip::meter_changed (void *src)
        gpm.setup_meters ();
        // reset peak when meter point changes
        gpm.reset_peak_display();
-       set_width(_width, this);
+       set_width_enum (_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->internal_send_for (target);
+
+       cerr << "internal send from " << _route->name() << " to " << target->name() << " = " 
+            << _current_delivery << endl;
+
+       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());
+
+       } 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());
+       }
+       
+       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->amp());
+       gain_meter().setup_meters ();
+       panner_ui().set_panner (_route->main_outs()->panner());
+       panner_ui().setup_pan ();
+}
+
+void
+MixerStrip::set_button_names ()
+{
+       switch (_width) {
+       case Wide:
+               rec_enable_button_label.set_text (_("Rec"));
+               mute_button_label.set_text (_("Mute"));
+               if (!Config->get_solo_control_is_listen_control()) {
+                       solo_button_label.set_text (_("Solo"));
+               } else {
+                       switch (Config->get_listen_position()) {
+                       case AfterFaderListen:
+                               solo_button_label.set_text (_("AFL"));
+                               break;
+                       case PreFaderListen:
+                               solo_button_label.set_text (_("PFL"));
+                               break;
+                       }
+               }
+               break;
+
+       default:
+               rec_enable_button_label.set_text (_("R"));
+               mute_button_label.set_text (_("M"));
+               if (!Config->get_solo_control_is_listen_control()) {
+                       solo_button_label.set_text (_("S"));
+               } else {
+                       switch (Config->get_listen_position()) {
+                       case AfterFaderListen:
+                               solo_button_label.set_text (_("A"));
+                               break;
+                       case PreFaderListen:
+                               solo_button_label.set_text (_("P"));
+                               break;
+                       }
+               }
+               break;
+               
+       }
+}
+
+bool
+MixerStrip::on_key_press_event (GdkEventKey* ev)
+{
+       GdkEventButton fake;
+       fake.type = GDK_BUTTON_PRESS;
+       fake.button = 1;
+       fake.state = ev->state;
+
+       switch (ev->keyval) {
+       case GDK_m:
+               mute_press (&fake);
+               return true;
+               break;
+               
+       case GDK_s:
+               solo_press (&fake);
+               return true;
+               break;
+               
+       case GDK_r:
+               rec_enable_press (&fake);
+               return true;
+               break;
+               
+       case GDK_e:
+               show_sends_press (&fake);
+               return true;
+               break;                  
+               
+       case GDK_g:
+               if (ev->state & Keyboard::PrimaryModifier) {
+                       step_gain_down ();
+               } else {
+                       step_gain_up ();
+               }
+               return true;
+               break;
+
+       case GDK_0:
+               if (_route) {
+                       _route->set_gain (1.0, this);
+               }
+               return true;
+               
+       default:
+               break;
+       }
+
+       return false;
+}
+
+
+bool
+MixerStrip::on_key_release_event (GdkEventKey* ev)
+{
+       GdkEventButton fake;
+       fake.type = GDK_BUTTON_RELEASE;
+       fake.button = 1;
+       fake.state = ev->state;
+
+       switch (ev->keyval) {
+       case GDK_m:
+               mute_release (&fake);
+               return true;
+               break;
+               
+       case GDK_s:
+               solo_release (&fake);
+               return true;
+               break;
+               
+       case GDK_r:
+               rec_enable_release (&fake);
+               return true;
+               break;
+               
+       case GDK_e:
+               show_sends_release (&fake);
+               return true;
+               break;                  
+               
+       case GDK_g:
+               return true;
+               break;
+               
+       default:
+               break;
+       }
+
+       return false;
+}
+
+bool
+MixerStrip::on_enter_notify_event (GdkEventCrossing*)
+{
+       Keyboard::magic_widget_grab_focus ();
+       grab_focus ();
+       return false;
+}
+
+bool
+MixerStrip::on_leave_notify_event (GdkEventCrossing* ev)
+{
+       switch (ev->detail) {
+       case GDK_NOTIFY_INFERIOR:
+               break;
+       default:
+               Keyboard::magic_widget_drop_focus ();
+       }
+
+       return false;
+}