Fix menu missing fit-tracks.
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 289fb4553678e30f51a5575674111a6e7862a83c..373babf417d47a4cc0701b73c13a96851e032d31 100644 (file)
 */
 
 #include <cmath>
+#include <algorithm>
 
 #include <sigc++/bind.h>
 
 #include <pbd/convert.h>
+#include <pbd/enumwriter.h>
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <ardour/audio_diskstream.h>
 #include <ardour/panner.h>
 #include <ardour/send.h>
-#include <ardour/insert.h>
+#include <ardour/processor.h>
+#include <ardour/profile.h>
 #include <ardour/ladspa_plugin.h>
-#include <ardour/connection.h>
-#include <ardour/session_connection.h>
+#include <ardour/auto_bundle.h>
+#include <ardour/user_bundle.h>
 
 #include "ardour_ui.h"
 #include "ardour_dialog.h"
@@ -61,6 +64,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace std;
 
 int MixerStrip::scrollbar_height = 0;
 
@@ -82,8 +86,9 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        : AxisView(sess),
          RouteUI (rt, sess, _("Mute"), _("Solo"), _("Record")),
          _mixer(mx),
-         pre_redirect_box (PreFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
-         post_redirect_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
+         _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),
@@ -102,16 +107,21 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        input_selector = 0;
        output_selector = 0;
        group_menu = 0;
-       _marked_for_display = false;
+       if (!_route->is_hidden()) {
+               _marked_for_display = true;
+       }
        route_ops_menu = 0;
        ignore_comment_edit = false;
        ignore_toggle = false;
        ignore_speed_adjustment = false;
        comment_window = 0;
        comment_area = 0;
+       _width_owner = 0;
 
-       width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width")))));
-       hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
+       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);
 
        input_label.set_text (_("Input"));
        input_button.add (input_label);
@@ -153,17 +163,10 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        /* XXX what is this meant to do? */
        //meter_point_button.signal_button_release_event().connect (mem_fun (gpm, &GainMeter::meter_release), false);
 
-       solo_button->set_name ("MixerSoloButton");
-       mute_button->set_name ("MixerMuteButton");
-
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-       width_button.unset_flags (Gtk::CAN_FOCUS);
-       hide_button.unset_flags (Gtk::CAN_FOCUS);
-       input_button.unset_flags (Gtk::CAN_FOCUS);
-       output_button.unset_flags (Gtk::CAN_FOCUS);
-       solo_button->unset_flags (Gtk::CAN_FOCUS);
-       mute_button->unset_flags (Gtk::CAN_FOCUS);
+       mute_button->set_name ("MixerMuteButton");
+       solo_button->set_name ("MixerSoloButton");
 
        button_table.set_homogeneous (true);
        button_table.set_spacings (0);
@@ -179,14 +182,9 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        bottom_button_table.set_col_spacings (0);
        bottom_button_table.set_homogeneous (true);
        bottom_button_table.attach (group_button, 0, 1, 0, 1);
-
+       
        if (is_audio_track()) {
-               
-               rec_enable_button->set_name ("MixerRecordEnableButton");
-               rec_enable_button->unset_flags (Gtk::CAN_FOCUS);
-               rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
-
-               AudioTrack* at = audio_track();
+               boost::shared_ptr<AudioTrack> at = audio_track();
 
                at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
 
@@ -204,9 +202,16 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
                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);
@@ -233,15 +238,17 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        global_vpacker.set_border_width (0);
        global_vpacker.set_spacing (0);
 
-       Gtk::VBox *whvbox = manage (new Gtk::VBox);
+       VBox *whvbox = manage (new VBox);
 
        width_button.set_name ("MixerWidthButton");
        hide_button.set_name ("MixerHideButton");
+       top_event_box.set_name ("MixerTopEventBox");
 
        width_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::width_clicked));
        hide_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::hide_clicked));
 
        width_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);
@@ -251,21 +258,22 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 
        global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (pre_redirect_box, true, true);
+       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 (bottom_button_table,Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (post_redirect_box, true, true);
-       global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (post_processor_box, true, true);
+       if (!is_midi_track()) {
+               global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+       }
        global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
 
-       if (route()->master() || route()->control()) {
+       if (route()->is_master() || route()->is_control()) {
                
                if (scrollbar_height == 0) {
                        HScrollbar scrollbar;
-                       Gtk::Requisition requisition;
-                       scrollbar.size_request (requisition);
+                       Gtk::Requisition requisition(scrollbar.size_request ());
                        scrollbar_height = requisition.height;
                }
 
@@ -303,7 +311,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
                get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed));
        }
 
-       _route->name_changed.connect (mem_fun(*this, &RouteUI::name_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));
 
@@ -325,15 +333,18 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
           in update_diskstream_display().
        */
 
-       set_name ("AudioTrackStripBase");
+       if (is_midi_track())
+               set_name ("MidiTrackStripBase");
+       else
+               set_name ("AudioTrackStripBase");
 
        /* now force an update of all the various elements */
 
-       pre_redirect_box.update();
-       post_redirect_box.update();
+       pre_processor_box.update();
+       post_processor_box.update();
        mute_changed (0);
        solo_changed (0);
-       name_changed (0);
+       name_changed ();
        comment_changed (0);
        mix_group_changed (0);
 
@@ -350,6 +361,45 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        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();
+       global_frame.show();
+       global_vpacker.show();
+       button_table.show();
+       middle_button_table.show();
+       bottom_button_table.show();
+       gain_unit_button.show();
+       gain_unit_label.show();
+       meter_point_button.show();
+       meter_point_label.show();
+       diskstream_button.show();
+       diskstream_label.show();
+       input_button.show();
+       input_label.show();
+       output_button.show();
+       output_label.show();
+       name_label.show();
+       name_button.show();
+       comment_button.show();
+       group_button.show();
+       group_label.show();
+       speed_spinner.show();
+       speed_label.show();
+       speed_frame.show();
+
+       show();
 }
 
 MixerStrip::~MixerStrip ()
@@ -369,110 +419,102 @@ void
 MixerStrip::set_stuff_from_route ()
 {
        XMLProperty *prop;
-       
+
        ensure_xml_node ();
 
-       if ((prop = xml_node->property ("strip_width")) != 0) {
-               if (prop->value() == "wide") {
-                       set_width (Wide);
-               } else if (prop->value() == "narrow") {
-                       set_width (Narrow);
-               }
-               else {
-                       error << string_compose(_("unknown strip width \"%1\" in XML GUI information"), prop->value()) << endmsg;
-                       set_width (Wide);
-               }
-       }
-       else {
-               set_width (Wide);
+       /* 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);
        }
 
-       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 {
                        _marked_for_display = true;
                }
-       }
-       else {
+       } else {
                /* backwards compatibility */
                _marked_for_display = true;
        }
 }
 
 void
-MixerStrip::set_width (Width w)
+MixerStrip::set_width (Width w, void* owner)
 {
        /* always set the gpm width again, things may be hidden */
+
        gpm.set_width (w);
        panners.set_width (w);
-       pre_redirect_box.set_width (w);
-       post_redirect_box.set_width (w);
-       
-       if (_width == w) {
-               return;
-       }
+       pre_processor_box.set_width (w);
+       post_processor_box.set_width (w);
+
+       boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->alist();
+
+       _width_owner = owner;
 
        ensure_xml_node ();
        
        _width = w;
 
+       if (_width_owner == this) {
+               xml_node->add_property ("strip-width", enum_2_string (_width));
+       }
+
        switch (w) {
        case Wide:
                set_size_request (-1, -1);
-               xml_node->add_property ("strip_width", "wide");
-
-               if (rec_enable_button) {
-                       rec_enable_button->set_label (_("record"));
+               
+               if (rec_enable_button)  {
+                       ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("record"));
                }
-               mute_button->set_label  (_("mute"));
-               solo_button->set_label (_("solo"));
+               ((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);
-                      comment_button.set_label (_("comments"));
+                      ((Gtk::Label*)comment_button.get_child())->set_text (_("comments"));
                } else {
                       comment_button.modify_bg (STATE_NORMAL, color());
-                      comment_button.set_label (_("*comments*"));
+                      ((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*"));
                }
 
-               gpm.gain_automation_style_button.set_label (gpm.astyle_string(_route->gain_automation_curve().automation_style()));
-               gpm.gain_automation_state_button.set_label (gpm.astate_string(_route->gain_automation_curve().automation_state()));
-               panners.pan_automation_style_button.set_label (panners.astyle_string(_route->panner().automation_style()));
-               panners.pan_automation_state_button.set_label (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);
                break;
 
        case Narrow:
-               set_size_request (50, -1);
-               xml_node->add_property ("strip_width", "narrow");
-
                if (rec_enable_button) {
-                       rec_enable_button->set_label (_("Rec"));
+                       ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Rec"));
                }
-               mute_button->set_label (_("M"));
-               solo_button->set_label (_("S"));
+               ((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);
-                      comment_button.set_label (_("Cmt"));
+                      ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
                } else {
                       comment_button.modify_bg (STATE_NORMAL, color());
-                      comment_button.set_label (_("*Cmt*"));
+                      ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
                }
 
-               gpm.gain_automation_style_button.set_label (gpm.short_astyle_string(_route->gain_automation_curve().automation_style()));
-               gpm.gain_automation_state_button.set_label (gpm.short_astate_string(_route->gain_automation_curve().automation_state()));
-               panners.pan_automation_style_button.set_label (panners.short_astyle_string(_route->panner().automation_style()));
-               panners.pan_automation_state_button.set_label (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()));
+               ((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 (0);
+       name_changed ();
 
 }
 
@@ -484,9 +526,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");
        }
 }
 
@@ -505,6 +547,7 @@ MixerStrip::output_press (GdkEventButton *ev)
        switch (ev->button) {
 
        case 1:
+       {
                output_menu.set_name ("ArdourContextMenu");
                citems.clear();
                
@@ -512,11 +555,16 @@ MixerStrip::output_press (GdkEventButton *ev)
                citems.push_back (SeparatorElem());
                citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
                citems.push_back (SeparatorElem());
-               
-               _session.foreach_connection (this, &MixerStrip::add_connection_to_output_menu);
+
+               std::vector<boost::shared_ptr<Bundle> > current = _route->bundles_connected_to_outputs ();
+
+               _session.foreach_bundle (
+                       bind (mem_fun (*this, &MixerStrip::add_bundle_to_output_menu), current)
+                       );
 
                output_menu.popup (1, ev->time);
                break;
+       }
                
        default:
                break;
@@ -534,7 +582,7 @@ MixerStrip::edit_output_configuration ()
        if (output_selector->is_visible()) {
                output_selector->get_toplevel()->get_window()->raise();
        } else {
-               output_selector->show_all ();
+               output_selector->present ();
        }
 }
 
@@ -548,7 +596,7 @@ MixerStrip::edit_input_configuration ()
        if (input_selector->is_visible()) {
                input_selector->get_toplevel()->get_window()->raise();
        } else {
-               input_selector->show_all ();
+               input_selector->present ();
        }
 }
 
@@ -566,20 +614,25 @@ MixerStrip::input_press (GdkEventButton *ev)
                msg.run ();
                return true;
        }
-       
+
        switch (ev->button) {
 
        case 1:
+       {
                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());
-               
-               _session.foreach_connection (this, &MixerStrip::add_connection_to_input_menu);
+
+               std::vector<boost::shared_ptr<Bundle> > current = _route->bundles_connected_to_inputs ();
+
+               _session.foreach_bundle (
+                       bind (mem_fun (*this, &MixerStrip::add_bundle_to_input_menu), current)
+                       );
 
                input_menu.popup (1, ev->time);
                break;
-               
+       }
        default:
                break;
        }
@@ -587,55 +640,55 @@ MixerStrip::input_press (GdkEventButton *ev)
 }
 
 void
-MixerStrip::connection_input_chosen (ARDOUR::Connection *c)
+MixerStrip::bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
 {
        if (!ignore_toggle) {
 
                try { 
-                       _route->use_input_connection (*c, this);
+                       _route->connect_input_ports_to_bundle (c, this);
                }
 
                catch (AudioEngine::PortRegistrationFailure& err) {
-                       error << _("could not register new ports required for that connection")
+                       error << _("could not register new ports required for that bundle")
                              << endmsg;
                }
        }
 }
 
 void
-MixerStrip::connection_output_chosen (ARDOUR::Connection *c)
+MixerStrip::bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
 {
        if (!ignore_toggle) {
 
                try { 
-                       _route->use_output_connection (*c, this);
+                       _route->connect_output_ports_to_bundle (c, this);
                }
 
                catch (AudioEngine::PortRegistrationFailure& err) {
-                       error << _("could not register new ports required for that connection")
+                       error << _("could not register new ports required for that bundle")
                              << endmsg;
                }
        }
 }
 
 void
-MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c)
+MixerStrip::add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, std::vector<boost::shared_ptr<Bundle> > const & current)
 {
        using namespace Menu_Helpers;
 
-       if (dynamic_cast<InputConnection *> (c) == 0) {
-               return;
-       }
+       /* the input menu needs to contain only output bundles (that we
+          can connect inputs to */
+       if (b->ports_are_outputs() == false) {
+               return;
+       }
 
        MenuList& citems = input_menu.items();
        
-       if (c->nports() == _route->n_inputs().get_total()) {
+       if (b->nchannels() == _route->n_inputs()) {
 
-               citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c)));
-               
-               ARDOUR::Connection *current = _route->input_connection();
-               
-               if (current == c) {
+               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;
@@ -644,22 +697,22 @@ MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c)
 }
 
 void
-MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c)
+MixerStrip::add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, std::vector<boost::shared_ptr<Bundle> > const & current)
 {
        using namespace Menu_Helpers;
 
-       if (dynamic_cast<OutputConnection *> (c) == 0) {
-               return;
-       }
+       /* the output menu needs to contain only input bundles (that we
+          can connect outputs to */
+       if (b->ports_are_inputs() == false) {
+               return;
+       }
 
-       if (c->nports() == _route->n_outputs().get_total()) {
+       if (b->nchannels() == _route->n_outputs()) {
 
                MenuList& citems = output_menu.items();
-               citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c)));
-               
-               ARDOUR::Connection *current = _route->output_connection();
+               citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), b)));
                
-               if (current == c) {
+               if (std::find (current.begin(), current.end(), b) != current.end()) {
                        ignore_toggle = true;
                        dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
                        ignore_toggle = false;
@@ -670,11 +723,7 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c)
 void
 MixerStrip::update_diskstream_display ()
 {
-       if (is_audio_track()) {
-
-               map_frozen ();
-
-               update_input_display ();
+       if (is_track()) {
 
                if (input_selector) {
                        input_selector->hide_all ();
@@ -684,9 +733,6 @@ MixerStrip::update_diskstream_display ()
 
        } else {
 
-               map_frozen ();
-
-               update_input_display ();
                show_passthru_color ();
        }
 }
@@ -695,15 +741,17 @@ void
 MixerStrip::connect_to_pan ()
 {
        ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::connect_to_pan));
-       
+
        panstate_connection.disconnect ();
        panstyle_connection.disconnect ();
 
-       if (!_route->panner().empty()) {
-               StreamPanner* sp = _route->panner().front();
+               boost::shared_ptr<ARDOUR::AutomationControl> pan_control
+                       = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
+                               _route->panner().data().control(Evoral::Parameter( PanAutomation ) ));
 
-               panstate_connection = sp->automation().automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
-               panstyle_connection = sp->automation().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);
@@ -712,10 +760,11 @@ MixerStrip::connect_to_pan ()
 void
 MixerStrip::update_input_display ()
 {
-       ARDOUR::Connection *c;
+       std::vector<boost::shared_ptr<ARDOUR::Bundle> > c = _route->bundles_connected_to_inputs ();
 
-       if ((c = _route->input_connection()) != 0) {
-               input_label.set_text (c->name());
+       /* XXX: how do we represent >1 connected bundle? */
+       if (c.empty() == false) {
+               input_label.set_text (c[0]->name());
        } else {
                switch (_width) {
                case Wide:
@@ -732,10 +781,11 @@ MixerStrip::update_input_display ()
 void
 MixerStrip::update_output_display ()
 {
-       ARDOUR::Connection *c;
+       std::vector<boost::shared_ptr<ARDOUR::Bundle> > c = _route->bundles_connected_to_outputs ();
 
-       if ((c = _route->output_connection()) != 0) {
-               output_label.set_text (c->name());
+       /* XXX: how do we represent >1 connected bundle? */
+       if (c.empty() == false) {
+               output_label.set_text (c[0]->name());
        } else {
                switch (_width) {
                case Wide:
@@ -766,17 +816,20 @@ void
 MixerStrip::input_changed (IOChange change, void *src)
 {
        Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_input_display));
+       set_width(_width, this);
 }
 
 void
 MixerStrip::output_changed (IOChange change, void *src)
 {
        Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display));
+       set_width(_width, this);
 }
 
 
 void 
-MixerStrip::comment_editor_done_editing() {
+MixerStrip::comment_editor_done_editing() 
+{
        string str =  comment_area->get_buffer()->get_text();
        if (_route->comment() != str) {
                _route->set_comment (str, this);
@@ -786,20 +839,20 @@ MixerStrip::comment_editor_done_editing() {
                case Wide:
                        if (! str.empty()) {
                                comment_button.modify_bg (STATE_NORMAL, color());
-                               comment_button.set_label (_("*Comments*"));
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
                        } else {
                                comment_button.unset_bg (STATE_NORMAL);
-                               comment_button.set_label (_("Comments"));
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
                        }
                        break;
                   
                case Narrow:
                        if (! str.empty()) {
                                comment_button.modify_bg (STATE_NORMAL, color());
-                               comment_button.set_label (_("*Cmt*"));
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
                        } else {
                                comment_button.unset_bg (STATE_NORMAL);
-                               comment_button.set_label (_("Cmt"));
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
                        } 
                        break;
                }
@@ -962,6 +1015,7 @@ void
 MixerStrip::show_route_color ()
 {
        name_button.modify_bg (STATE_NORMAL, color());
+       top_event_box.modify_bg (STATE_NORMAL, color());
        route_active_changed ();
 }
 
@@ -975,26 +1029,35 @@ void
 MixerStrip::build_route_ops_menu ()
 {
        using namespace Menu_Helpers;
-
        route_ops_menu = manage (new Menu);
        route_ops_menu->set_name ("ArdourContextMenu");
 
        MenuList& items = route_ops_menu->items();
-       
+
        items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteUI::route_rename)));
        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());
        route_active_menu_item->set_active (_route->active());
+
+       items.push_back (SeparatorElem());
+
+       items.push_back (MenuElem (_("Adjust latency"), mem_fun (*this, &RouteUI::adjust_latency)));
+
        items.push_back (SeparatorElem());
        items.push_back (CheckMenuElem (_("Invert Polarity"), mem_fun (*this, &RouteUI::toggle_polarity)));
        polarity_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
        polarity_menu_item->set_active (_route->phase_invert());
+       items.push_back (CheckMenuElem (_("Protect against denormals"), mem_fun (*this, &RouteUI::toggle_denormal_protection)));
+       denormal_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
+       denormal_menu_item->set_active (_route->denormal_protection());
 
        build_remote_control_menu ();
        
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+       if (!Profile->get_sae()) {
+              items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+        }
 
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
@@ -1005,6 +1068,11 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
        if (ev->button == 1) {
                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());
+
                route_ops_menu->popup (1, ev->time);
        }
        return FALSE;
@@ -1072,11 +1140,11 @@ MixerStrip::set_selected (bool yn)
 }
 
 void
-MixerStrip::name_changed (void *src)
+MixerStrip::name_changed ()
 {
        switch (_width) {
        case Wide:
-               RouteUI::name_changed (src);
+               RouteUI::name_changed ();
                break;
        case Narrow:
                name_label.set_text (PBD::short_version (_route->name(), 5));
@@ -1092,10 +1160,10 @@ MixerStrip::width_clicked ()
 {
        switch (_width) {
        case Wide:
-               set_width (Narrow);
+               set_width (Narrow, this);
                break;
        case Narrow:
-               set_width (Wide);
+               set_width (Wide, this);
                break;
        }
 }
@@ -1127,29 +1195,37 @@ MixerStrip::map_frozen ()
 {
        ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen));
 
-       AudioTrack* at = audio_track();
+       boost::shared_ptr<AudioTrack> at = audio_track();
 
        if (at) {
                switch (at->freeze_state()) {
                case AudioTrack::Frozen:
-                       pre_redirect_box.set_sensitive (false);
-                       post_redirect_box.set_sensitive (false);
+                       pre_processor_box.set_sensitive (false);
+                       post_processor_box.set_sensitive (false);
                        speed_spinner.set_sensitive (false);
                        break;
                default:
-                       pre_redirect_box.set_sensitive (true);
-                       post_redirect_box.set_sensitive (true);
+                       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;
                }
        }
-       _route->foreach_redirect (this, &MixerStrip::hide_redirect_editor);
+       
+       hide_redirect_editors ();
 }
 
 void
-MixerStrip::hide_redirect_editor (boost::shared_ptr<Redirect> redirect)
+MixerStrip::hide_redirect_editors ()
 {
-       void* gui = redirect->get_gui ();
+       _route->foreach_processor (this, &MixerStrip::hide_processor_editor);
+}
+
+void
+MixerStrip::hide_processor_editor (boost::shared_ptr<Processor> processor)
+{
+       void* gui = processor->get_gui ();
        
        if (gui) {
                static_cast<Gtk::Widget*>(gui)->hide ();
@@ -1169,24 +1245,27 @@ MixerStrip::route_active_changed ()
                        set_name ("MidiTrackStripBaseInactive");
                        gpm.set_meter_strip_name ("MidiTrackStripBaseInactive");
                }
+               gpm.set_fader_name ("MidiTrackFader");
        } else if (is_audio_track()) {
                if (_route->active()) {
                        set_name ("AudioTrackStripBase");
-                       gpm.set_meter_strip_name ("AudioTrackStripBase");
+                       gpm.set_meter_strip_name ("AudioTrackMetrics");
                } else {
                        set_name ("AudioTrackStripBaseInactive");
-                       gpm.set_meter_strip_name ("AudioTrackStripBaseInactive");
+                       gpm.set_meter_strip_name ("AudioTrackMetricsInactive");
                }
                gpm.set_fader_name ("AudioTrackFader");
        } else {
                if (_route->active()) {
                        set_name ("AudioBusStripBase");
-                       gpm.set_meter_strip_name ("AudioBusStripBase");
+                       gpm.set_meter_strip_name ("AudioBusMetrics");
                } else {
                        set_name ("AudioBusStripBaseInactive");
-                       gpm.set_meter_strip_name ("AudioBusStripBaseInactive");
+                       gpm.set_meter_strip_name ("AudioBusMetricsInactive");
                }
                gpm.set_fader_name ("AudioBusFader");
+               
+               /* (no MIDI busses yet) */
        }
 }
 
@@ -1212,20 +1291,23 @@ MixerStrip::meter_changed (void *src)
 
        ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src));
 
-               switch (_route->meter_point()) {
+       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;
-               }
+       }
 
-               gpm.setup_meters ();
+       gpm.setup_meters ();
+               // reset peak when meter point changes
+               gpm.reset_peak_display();
+               set_width(_width, this);
 }