Fix visibility of automation tracks on reloading sessions.
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 656105e725de2b1254c5c0f8568e1313f86238de..6c006d7e249e3b0e752ffb71daccf551d4a62a77 100644 (file)
 #include <ardour/panner.h>
 #include <ardour/send.h>
 #include <ardour/processor.h>
+#include <ardour/profile.h>
 #include <ardour/ladspa_plugin.h>
-#include <ardour/bundle.h>
-#include <ardour/session_bundle.h>
+#include <ardour/auto_bundle.h>
+#include <ardour/user_bundle.h>
 
 #include "ardour_ui.h"
 #include "ardour_dialog.h"
@@ -81,27 +82,52 @@ speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg)
 }
 #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),
-         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)
+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(), in_mixer)
+       , post_processor_box (PostFader, sess, mx.plugin_selector(), mx.selection(), 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"))
+       , speed_adjustment (1.0, 0.001, 4.0, 0.001, 0.1)
+       , speed_spinner (&speed_adjustment, "MixerStripSpeedBase", true)
+                        
+{
+       init ();
+}
 
+MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt, 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(), in_mixer)
+       , post_processor_box (PostFader, sess, mx.plugin_selector(), mx.selection(), 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"))
+       , speed_adjustment (1.0, 0.001, 4.0, 0.001, 0.1)
+       , speed_spinner (&speed_adjustment, "MixerStripSpeedBase", true)
+                        
 {
-       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;
@@ -113,39 +139,37 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        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 (*(manage (new Gtk::Image (::get_icon("strip_width")))));
-       hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
+       width_button.add (*img);
+
+       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, _("Click to choose inputs"), "");
        input_button.add (input_label);
        input_button.set_name ("MixerIOButton");
        input_label.set_name ("MixerIOButtonLabel");
 
        output_label.set_text (_("Output"));
+       ARDOUR_UI::instance()->set_tip (&output_button, _("Click to choose outputs"), "");
        output_button.add (output_label);
        output_button.set_name ("MixerIOButton");
        output_label.set_name ("MixerIOButtonLabel");
 
-       _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".
        */
@@ -177,62 +201,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()) {
-               
-               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");
-
-               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 */
-
-               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");
@@ -243,37 +228,24 @@ 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())
+       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()->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");
@@ -290,22 +262,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);
@@ -315,11 +271,22 @@ 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));
+
        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().
@@ -330,6 +297,131 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        else
                set_name ("AudioTrackStripBase");
 
+       add_events (Gdk::BUTTON_RELEASE_MASK);
+}
+
+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);
+       }
+
+#ifdef VARISPEED_IN_MIXER_STRIP
+       if (speed_frame->get_parent()) {
+               button_table.remove (*speed_frame);
+       }
+#endif
+
+       RouteUI::set_route (rt);
+
+       delete input_selector;
+       input_selector = 0;
+
+       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);
+
+       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)));
+
+#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();
+       }
+
+       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->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)));
+
+       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 (_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();
@@ -353,19 +445,47 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        update_output_display ();
 
        add_events (Gdk::BUTTON_RELEASE_MASK);
-}
 
-MixerStrip::~MixerStrip ()
-{
-       GoingAway(); /* EMIT_SIGNAL */
+       pre_processor_box.show();
 
-       if (input_selector) {
-               delete input_selector;
+       if (!route()->is_master() && !route()->is_control()) {
+               /* we don't allow master or control routes to be hidden */
+               hide_button.show();
        }
 
-       if (output_selector) {
-               delete output_selector;
-       }
+       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();
+       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 ();
 }
 
 void
@@ -377,11 +497,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 {
@@ -403,38 +523,33 @@ 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;
 
-       if (_width == w) {
-               return;
-       }
-
        ensure_xml_node ();
        
        _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"));
                }
                ((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"));
+                      ((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*"));
+                      ((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()));
@@ -442,6 +557,7 @@ MixerStrip::set_width (Width w, void* owner)
                ((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:
@@ -467,12 +583,13 @@ MixerStrip::set_width (Width w, void* owner)
                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
@@ -483,9 +600,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");
        }
 }
 
@@ -504,6 +621,7 @@ MixerStrip::output_press (GdkEventButton *ev)
        switch (ev->button) {
 
        case 1:
+       {
                output_menu.set_name ("ArdourContextMenu");
                citems.clear();
                
@@ -511,11 +629,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_bundle (this, &MixerStrip::add_bundle_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;
@@ -533,7 +656,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 ();
        }
 }
 
@@ -547,7 +670,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 ();
        }
 }
 
@@ -569,16 +692,21 @@ MixerStrip::input_press (GdkEventButton *ev)
        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_bundle (this, &MixerStrip::add_bundle_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;
        }
@@ -586,12 +714,12 @@ MixerStrip::input_press (GdkEventButton *ev)
 }
 
 void
-MixerStrip::bundle_input_chosen (ARDOUR::Bundle *c)
+MixerStrip::bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
 {
        if (!ignore_toggle) {
 
                try { 
-                       _route->use_input_bundle (*c, this);
+                       _route->connect_input_ports_to_bundle (c, this);
                }
 
                catch (AudioEngine::PortRegistrationFailure& err) {
@@ -602,12 +730,12 @@ MixerStrip::bundle_input_chosen (ARDOUR::Bundle *c)
 }
 
 void
-MixerStrip::bundle_output_chosen (ARDOUR::Bundle *c)
+MixerStrip::bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
 {
        if (!ignore_toggle) {
 
                try { 
-                       _route->use_output_bundle (*c, this);
+                       _route->connect_output_ports_to_bundle (c, this);
                }
 
                catch (AudioEngine::PortRegistrationFailure& err) {
@@ -618,23 +746,23 @@ MixerStrip::bundle_output_chosen (ARDOUR::Bundle *c)
 }
 
 void
-MixerStrip::add_bundle_to_input_menu (ARDOUR::Bundle* 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<InputBundle *> (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->nchannels() == _route->n_inputs().n_total()) {
+       if (b->nchannels() == _route->n_inputs()) {
 
-               citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), c)));
-               
-               ARDOUR::Bundle *current = _route->input_bundle();
-               
-               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;
@@ -643,22 +771,22 @@ MixerStrip::add_bundle_to_input_menu (ARDOUR::Bundle* c)
 }
 
 void
-MixerStrip::add_bundle_to_output_menu (ARDOUR::Bundle* 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<OutputBundle *> (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->nchannels() == _route->n_outputs().n_total()) {
+       if (b->nchannels() == _route->n_outputs()) {
 
                MenuList& citems = output_menu.items();
-               citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), c)));
-               
-               ARDOUR::Bundle *current = _route->output_bundle();
+               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;
@@ -669,11 +797,7 @@ MixerStrip::add_bundle_to_output_menu (ARDOUR::Bundle* 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 ();
@@ -683,9 +807,6 @@ MixerStrip::update_diskstream_display ()
 
        } else {
 
-               map_frozen ();
-
-               update_input_display ();
                show_passthru_color ();
        }
 }
@@ -698,11 +819,13 @@ 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->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);
@@ -711,10 +834,11 @@ MixerStrip::connect_to_pan ()
 void
 MixerStrip::update_input_display ()
 {
-       ARDOUR::Bundle *c;
+       std::vector<boost::shared_ptr<ARDOUR::Bundle> > c = _route->bundles_connected_to_inputs ();
 
-       if ((c = _route->input_bundle()) != 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:
@@ -731,10 +855,11 @@ MixerStrip::update_input_display ()
 void
 MixerStrip::update_output_display ()
 {
-       ARDOUR::Bundle *c;
+       std::vector<boost::shared_ptr<ARDOUR::Bundle> > c = _route->bundles_connected_to_outputs ();
 
-       if ((c = _route->output_bundle()) != 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:
@@ -745,6 +870,7 @@ MixerStrip::update_output_display ()
                        break;
                }
        }
+
        gpm.setup_meters ();
        panners.setup_pan ();
 }
@@ -765,12 +891,14 @@ 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);
 }
 
 
@@ -976,7 +1104,7 @@ 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();
@@ -999,10 +1127,11 @@ 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());
-       items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+       if (!Profile->get_sae()) {
+               build_remote_control_menu ();
+               items.push_back (SeparatorElem());
+               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)));
@@ -1011,7 +1140,7 @@ 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();
@@ -1153,15 +1282,28 @@ MixerStrip::map_frozen ()
                        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_processor (this, &MixerStrip::hide_processor_editor);
+       
+       hide_redirect_editors ();
 }
 
 void
-MixerStrip::hide_processor_editor (boost::shared_ptr<Processor> processor)
+MixerStrip::hide_redirect_editors ()
 {
+       _route->foreach_processor (mem_fun (*this, &MixerStrip::hide_processor_editor));
+}
+
+void
+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) {
@@ -1186,19 +1328,19 @@ MixerStrip::route_active_changed ()
        } 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");
                
@@ -1229,19 +1371,22 @@ 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);
 }