Another not-quite-there-but-better commit.
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 64e8acc39247730b1b9ffc9b2e883afdc1c999a8..656105e725de2b1254c5c0f8568e1313f86238de 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2002 Paul Davis
+    Copyright (C) 2000-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
 */
 
 #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/ladspa_plugin.h>
-#include <ardour/connection.h>
-#include <ardour/session_connection.h>
+#include <ardour/bundle.h>
+#include <ardour/session_bundle.h>
 
 #include "ardour_ui.h"
 #include "ardour_dialog.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
-#include "plugin_selector.h"
 #include "public_editor.h"
-#include "plugin_ui.h"
 #include "send_ui.h"
 #include "io_selector.h"
 #include "utils.h"
@@ -65,6 +63,9 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace std;
+
+int MixerStrip::scrollbar_height = 0;
 
 #ifdef VARISPEED_IN_MIXER_STRIP
 static void 
@@ -80,12 +81,12 @@ speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg)
 }
 #endif 
 
-MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
+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_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),
+         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),
@@ -111,9 +112,10 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        ignore_speed_adjustment = false;
        comment_window = 0;
        comment_area = 0;
+       _width_owner = 0;
 
-       width_button.add (*(manage (new Gtk::Image (get_xpm("lr.xpm")))));
-       hide_button.add (*(manage (new Gtk::Image (get_xpm("small_x.xpm")))));
+       width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width")))));
+       hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
 
        input_label.set_text (_("Input"));
        input_button.add (input_label);
@@ -125,50 +127,40 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        output_button.set_name ("MixerIOButton");
        output_label.set_name ("MixerIOButtonLabel");
 
-       _route.meter_change.connect (mem_fun(*this, &MixerStrip::meter_changed));
-               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;
-               }
+       _route->meter_change.connect (mem_fun(*this, &MixerStrip::meter_changed));
+       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;
                
-               /* TRANSLATORS: this string should be longest of the strings
-                  used to describe meter points. In english, its "input".
-               */
+       case MeterPreFader:
+               meter_point_label.set_text (_("pre"));
+               break;
                
-               set_size_request_to_display_given_text (meter_point_button, _("tupni"), 5, 5);
-
-
-               bottom_button_table.attach (meter_point_button, 1, 2, 0, 1);
-
-
+       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".
+       */
+       set_size_request_to_display_given_text (meter_point_button, _("tupni"), 5, 5);
+    
+       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);
 
-       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);
@@ -184,14 +176,15 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        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->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");
-               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 = dynamic_cast<AudioTrack*>(&_route);
+               boost::shared_ptr<AudioTrack> at = audio_track();
 
                at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
 
@@ -217,10 +210,10 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
        Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
 
        name_label.set_name ("MixerNameButtonLabel");
-       if (_route.phase_invert()) {
+       if (_route->phase_invert()) {
                name_label.set_text (X_("Ø ") + name_label.get_text());
        } else {
-               name_label.set_text (_route.name());
+               name_label.set_text (_route->name());
        }
 
        group_button.add (group_label);
@@ -229,24 +222,26 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
 
        comment_button.set_name ("MixerCommentButton");
 
-       ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route.comment()=="" ?
+       ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment()==""        ?
                                                        _("Click to Add/Edit Comments"):
-                                                       _route.comment());
+                                                       _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);
 
-       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);
@@ -256,15 +251,29 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
 
        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()->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");
@@ -281,22 +290,22 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
 
        _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));
+       _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()->diskstream_changed.connect (mem_fun(*this, &MixerStrip::diskstream_changed));
-               get_diskstream()->speed_changed.connect (mem_fun(*this, &MixerStrip::speed_changed));
+               audio_track()->DiskstreamChanged.connect (mem_fun(*this, &MixerStrip::diskstream_changed));
+               get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed));
        }
 
-       _route.name_changed.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));
+       _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);
@@ -316,15 +325,18 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
           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);
 
@@ -360,22 +372,13 @@ void
 MixerStrip::set_stuff_from_route ()
 {
        XMLProperty *prop;
-       
+
        ensure_xml_node ();
 
+       /* if width is not set, it will be set by the MixerUI or editor */
+
        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);
+               set_width (Width (string_2_enum (prop->value(), _width)), this);
        }
 
        if ((prop = xml_node->property ("shown_mixer")) != 0) {
@@ -384,22 +387,26 @@ MixerStrip::set_stuff_from_route ()
                } 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);
-       
+       pre_processor_box.set_width (w);
+       post_processor_box.set_width (w);
+
+       boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->list();
+
+       _width_owner = owner;
+
        if (_width == w) {
                return;
        }
@@ -408,58 +415,63 @@ MixerStrip::set_width (Width w)
        
        _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.set_label (_("comments"));
+               if (_route->comment() == "") {
+                      comment_button.unset_bg (STATE_NORMAL);
+                      ((Gtk::Label*)comment_button.get_child())->set_text (_("comments"));
                } else {
-                      comment_button.set_label (_("*comments*"));
+                      comment_button.modify_bg (STATE_NORMAL, color());
+                      ((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.set_label (_("Cmt"));
+               if (_route->comment() == "") {
+                      comment_button.unset_bg (STATE_NORMAL);
+                      ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
                } else {
-                      comment_button.set_label (_("*Cmt*"));
+                      comment_button.modify_bg (STATE_NORMAL, color());
+                      ((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 ();
 
 }
 
@@ -500,8 +512,8 @@ MixerStrip::output_press (GdkEventButton *ev)
                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);
-               
+               _session.foreach_bundle (this, &MixerStrip::add_bundle_to_output_menu);
+
                output_menu.popup (1, ev->time);
                break;
                
@@ -553,22 +565,17 @@ MixerStrip::input_press (GdkEventButton *ev)
                msg.run ();
                return true;
        }
-       
+
        switch (ev->button) {
 
        case 1:
-
-#if ADVANCED_ROUTE_DISKSTREAM_CONNECTIVITY
-               if (is_audio_track()) {
-                       citems.push_back (MenuElem (_("Track"), mem_fun(*this, &MixerStrip::select_stream_input)));
-               }
-#endif
                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);
+               _session.foreach_bundle (this, &MixerStrip::add_bundle_to_input_menu);
+
                input_menu.popup (1, ev->time);
                break;
                
@@ -579,53 +586,53 @@ MixerStrip::input_press (GdkEventButton *ev)
 }
 
 void
-MixerStrip::connection_input_chosen (ARDOUR::Connection *c)
+MixerStrip::bundle_input_chosen (ARDOUR::Bundle *c)
 {
        if (!ignore_toggle) {
 
                try { 
-                       _route.use_input_connection (*c, this);
+                       _route->use_input_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 (ARDOUR::Bundle *c)
 {
        if (!ignore_toggle) {
 
                try { 
-                       _route.use_output_connection (*c, this);
+                       _route->use_output_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 (ARDOUR::Bundle* c)
 {
        using namespace Menu_Helpers;
 
-       if (dynamic_cast<InputConnection *> (c) == 0) {
+       if (dynamic_cast<InputBundle *> (c) == 0) {
                return;
        }
 
        MenuList& citems = input_menu.items();
        
-       if (c->nports() == _route.n_inputs()) {
+       if (c->nchannels() == _route->n_inputs().n_total()) {
 
-               citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c)));
+               citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), c)));
                
-               ARDOUR::Connection *current = _route.input_connection();
+               ARDOUR::Bundle *current = _route->input_bundle();
                
                if (current == c) {
                        ignore_toggle = true;
@@ -636,20 +643,20 @@ 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 (ARDOUR::Bundle* c)
 {
        using namespace Menu_Helpers;
 
-       if (dynamic_cast<OutputConnection *> (c) == 0) {
+       if (dynamic_cast<OutputBundle *> (c) == 0) {
                return;
        }
 
-       if (c->nports() == _route.n_outputs()) {
+       if (c->nchannels() == _route->n_outputs().n_total()) {
 
                MenuList& citems = output_menu.items();
-               citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c)));
+               citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), c)));
                
-               ARDOUR::Connection *current = _route.output_connection();
+               ARDOUR::Bundle *current = _route->output_bundle();
                
                if (current == c) {
                        ignore_toggle = true;
@@ -659,43 +666,6 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c)
        }
 }
 
-void
-MixerStrip::select_stream_input ()
-{
-       using namespace Menu_Helpers;
-
-       Menu *stream_menu = manage (new Menu);
-       MenuList& items = stream_menu->items();
-       stream_menu->set_name ("ArdourContextMenu");
-       
-       Session::DiskstreamList streams = _session.disk_streams();
-
-       for (Session::DiskstreamList::iterator i = streams.begin(); i != streams.end(); ++i) {
-               AudioDiskstream* ads = dynamic_cast<AudioDiskstream*>(*i);
-
-               if (ads && !(*i)->hidden()) {
-
-                       items.push_back (CheckMenuElem (ads->name(), bind (mem_fun(*this, &MixerStrip::stream_input_chosen), ads)));
-                       
-                       if (get_diskstream() == ads) {
-                               ignore_toggle = true;
-                               static_cast<CheckMenuItem *> (&items.back())->set_active (true);
-                               ignore_toggle = false;
-                       } 
-               }
-       }
-       
-       stream_menu->popup (1, 0);
-}
-
-void
-MixerStrip::stream_input_chosen (AudioDiskstream *stream)
-{
-       if (is_audio_track()) {
-               audio_track()->set_diskstream (*stream, this);
-       }
-}
-
 void
 MixerStrip::update_diskstream_display ()
 {
@@ -724,15 +694,15 @@ 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();
+       if (!_route->panner().empty()) {
+               StreamPanner* sp = _route->panner().front();
 
-               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));
+               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));
        }
 
        panners.pan_changed (this);
@@ -741,9 +711,9 @@ MixerStrip::connect_to_pan ()
 void
 MixerStrip::update_input_display ()
 {
-       ARDOUR::Connection *c;
+       ARDOUR::Bundle *c;
 
-       if ((c = _route.input_connection()) != 0) {
+       if ((c = _route->input_bundle()) != 0) {
                input_label.set_text (c->name());
        } else {
                switch (_width) {
@@ -761,9 +731,9 @@ MixerStrip::update_input_display ()
 void
 MixerStrip::update_output_display ()
 {
-       ARDOUR::Connection *c;
+       ARDOUR::Bundle *c;
 
-       if ((c = _route.output_connection()) != 0) {
+       if ((c = _route->output_bundle()) != 0) {
                output_label.set_text (c->name());
        } else {
                switch (_width) {
@@ -786,7 +756,7 @@ MixerStrip::fast_update ()
 }
 
 void
-MixerStrip::diskstream_changed (void *src)
+MixerStrip::diskstream_changed ()
 {
        Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_diskstream_display));
 }      
@@ -803,6 +773,43 @@ MixerStrip::output_changed (IOChange change, void *src)
        Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display));
 }
 
+
+void 
+MixerStrip::comment_editor_done_editing() 
+{
+       string str =  comment_area->get_buffer()->get_text();
+       if (_route->comment() != str) {
+               _route->set_comment (str, this);
+
+               switch (_width) {
+                  
+               case Wide:
+                       if (! str.empty()) {
+                               comment_button.modify_bg (STATE_NORMAL, color());
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
+                       } else {
+                               comment_button.unset_bg (STATE_NORMAL);
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
+                       }
+                       break;
+                  
+               case Narrow:
+                       if (! str.empty()) {
+                               comment_button.modify_bg (STATE_NORMAL, color());
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
+                       } else {
+                               comment_button.unset_bg (STATE_NORMAL);
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
+                       } 
+                       break;
+               }
+                
+               ARDOUR_UI::instance()->tooltips().set_tip (comment_button, 
+                               str.empty() ? _("Click to Add/Edit Comments") : str);
+       }
+
+}
+
 void
 MixerStrip::comment_button_clicked ()
 {
@@ -810,38 +817,13 @@ MixerStrip::comment_button_clicked ()
                setup_comment_editor ();
        }
 
-        int x, y, cw_width, cw_height;
+    int x, y, cw_width, cw_height;
 
        if (comment_window->is_visible()) {
-              string str =  comment_area->get_buffer()->get_text();
-              if (_route.comment() != str) {
-                _route.set_comment (str, this);
+               comment_window->hide ();
+               return;
+       }
 
-                switch (_width) {
-                  
-                case Wide:
-                  if (! str.empty()) {
-                    comment_button.set_label (_("*Comments*"));
-                  } else {
-                    comment_button.set_label (_("Comments"));
-                     }
-                  break;
-                  
-                case Narrow:
-                  if (! str.empty()) {
-                    comment_button.set_label (_("*Cmt*"));
-                  } else {
-                    comment_button.set_label (_("Cmt"));
-                  } 
-                  break;
-                }
-                
-                ARDOUR_UI::instance()->tooltips().set_tip (comment_button, 
-                                                           str.empty() ? _("Click to Add/Edit Comments") : str);
-              }
-              comment_window->hide ();
-              return;
-       } 
        comment_window->get_size (cw_width, cw_height);
        comment_window->get_position(x, y);
        comment_window->move(x, y - (cw_height / 2) - 45);
@@ -852,26 +834,26 @@ MixerStrip::comment_button_clicked ()
 
        comment_window->show();
        comment_window->present();
-
 }
 
 void
 MixerStrip::setup_comment_editor ()
 {
        string title;
-       title = _route.name();
+       title = _route->name();
        title += _(": comment editor");
 
        comment_window = new ArdourDialog (title, false);
        comment_window->set_position (Gtk::WIN_POS_MOUSE);
        comment_window->set_skip_taskbar_hint (true);
+       comment_window->signal_hide().connect (mem_fun(*this, &MixerStrip::comment_editor_done_editing));
 
        comment_area = manage (new TextView());
        comment_area->set_name ("MixerTrackCommentArea");
        comment_area->set_size_request (110, 178);
        comment_area->set_wrap_mode (WRAP_WORD);
        comment_area->set_editable (true);
-       comment_area->get_buffer()->set_text (_route.comment());
+       comment_area->get_buffer()->set_text (_route->comment());
        comment_area->show ();
 
        comment_window->get_vbox()->pack_start (*comment_area);
@@ -886,7 +868,7 @@ MixerStrip::comment_changed (void *src)
        if (src != this) {
                ignore_comment_edit = true;
                if (comment_area) {
-                       comment_area->get_buffer()->set_text (_route.comment());
+                       comment_area->get_buffer()->set_text (_route->comment());
                }
                ignore_comment_edit = false;
        }
@@ -895,7 +877,7 @@ MixerStrip::comment_changed (void *src)
 void
 MixerStrip::set_mix_group (RouteGroup *rg)
 {
-       _route.set_mix_group (rg, this);
+       _route->set_mix_group (rg, this);
 }
 
 void
@@ -907,7 +889,7 @@ MixerStrip::add_mix_group_to_menu (RouteGroup *rg, RadioMenuItem::Group* group)
 
        items.push_back (RadioMenuElem (*group, rg->name(), bind (mem_fun(*this, &MixerStrip::set_mix_group), rg)));
 
-       if (_route.mix_group() == rg) {
+       if (_route->mix_group() == rg) {
                static_cast<RadioMenuItem*>(&items.back())->set_active ();
        }
 }
@@ -947,7 +929,7 @@ MixerStrip::mix_group_changed (void *ignored)
 {
        ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::mix_group_changed), ignored));
        
-       RouteGroup *rg = _route.mix_group();
+       RouteGroup *rg = _route->mix_group();
        
        if (rg) {
                group_label.set_text (rg->name());
@@ -980,6 +962,7 @@ void
 MixerStrip::show_route_color ()
 {
        name_button.modify_bg (STATE_NORMAL, color());
+       top_event_box.modify_bg (STATE_NORMAL, color());
        route_active_changed ();
 }
 
@@ -993,21 +976,28 @@ 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());
+       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());
+       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 ();
        
@@ -1023,6 +1013,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;
@@ -1090,17 +1085,17 @@ 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));
+               name_label.set_text (PBD::short_version (_route->name(), 5));
                break;
        }
-       if (_route.phase_invert()) {
+       if (_route->phase_invert()) {
                name_label.set_text (X_("Ø ") + name_label.get_text());
        }
 }
@@ -1110,10 +1105,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;
        }
 }
@@ -1121,11 +1116,17 @@ 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);
+    
        if (_embedded) {
                 Hiding(); /* EMIT_SIGNAL */
        } else {
                _mixer.hide_strip (this);
        }
+       
+    // (part 2)
+       hide_button.set_sensitive(true);
 }
 
 void
@@ -1139,29 +1140,29 @@ MixerStrip::map_frozen ()
 {
        ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen));
 
-       AudioTrack* at = dynamic_cast<AudioTrack*>(&_route);
+       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);
                        break;
                }
        }
-       _route.foreach_redirect (this, &MixerStrip::hide_redirect_editor);
+       _route->foreach_processor (this, &MixerStrip::hide_processor_editor);
 }
 
 void
-MixerStrip::hide_redirect_editor (Redirect* redirect)
+MixerStrip::hide_processor_editor (boost::shared_ptr<Processor> processor)
 {
-       void* gui = redirect->get_gui ();
+       void* gui = processor->get_gui ();
        
        if (gui) {
                static_cast<Gtk::Widget*>(gui)->hide ();
@@ -1173,10 +1174,8 @@ MixerStrip::route_active_changed ()
 {
        RouteUI::route_active_changed ();
 
-       // FIXME: MIDI/Audio bus distinction
-       
        if (is_midi_track()) {
-               if (_route.active()) {
+               if (_route->active()) {
                        set_name ("MidiTrackStripBase");
                        gpm.set_meter_strip_name ("MidiTrackStripBase");
                } else {
@@ -1185,7 +1184,7 @@ MixerStrip::route_active_changed ()
                }
                gpm.set_fader_name ("MidiTrackFader");
        } else if (is_audio_track()) {
-               if (_route.active()) {
+               if (_route->active()) {
                        set_name ("AudioTrackStripBase");
                        gpm.set_meter_strip_name ("AudioTrackStripBase");
                } else {
@@ -1194,7 +1193,7 @@ MixerStrip::route_active_changed ()
                }
                gpm.set_fader_name ("AudioTrackFader");
        } else {
-               if (_route.active()) {
+               if (_route->active()) {
                        set_name ("AudioBusStripBase");
                        gpm.set_meter_strip_name ("AudioBusStripBase");
                } else {
@@ -1202,33 +1201,25 @@ MixerStrip::route_active_changed ()
                        gpm.set_meter_strip_name ("AudioBusStripBaseInactive");
                }
                gpm.set_fader_name ("AudioBusFader");
+               
+               /* (no MIDI busses yet) */
        }
 }
 
 RouteGroup*
 MixerStrip::mix_group() const
 {
-       return _route.mix_group();
+       return _route->mix_group();
 }
 
 void
 MixerStrip::engine_stopped ()
 {
-        input_button.set_sensitive (false);
-       if (rec_enable_button) {
-               rec_enable_button->set_sensitive (false);
-       }
-       output_button.set_sensitive (false);
 }
 
 void
 MixerStrip::engine_running ()
 {
-        input_button.set_sensitive (true);
-       if (rec_enable_button) {
-               rec_enable_button->set_sensitive (true);
-       }
-       output_button.set_sensitive (true);
 }
 
 void
@@ -1237,20 +1228,20 @@ 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 ();
 }