test/fix - possible cause of meter-freezing..
[ardour.git] / gtk2_ardour / processor_box.cc
index 4755b828b5902196877ecf3f17415b51d823e814..265f94c53b0659c48c74a1b493b2bd5f5794335e 100644 (file)
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/doi.h>
 
 #include "ardour/amp.h"
-#include "ardour/ardour.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
+#include "ardour/internal_return.h"
 #include "ardour/internal_send.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/meter.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/port_insert.h"
 #include "ardour/profile.h"
@@ -55,6 +51,7 @@
 #include "ardour/route.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
+#include "ardour/types.h"
 
 #include "actions.h"
 #include "ardour_dialog.h"
@@ -66,6 +63,7 @@
 #include "mixer_strip.h"
 #include "plugin_selector.h"
 #include "plugin_ui.h"
+#include "port_insert_ui.h"
 #include "processor_box.h"
 #include "public_editor.h"
 #include "return_ui.h"
 
 #include "i18n.h"
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 class AUPluginUI;
 #endif
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
@@ -89,31 +86,73 @@ using namespace Gtkmm2ext;
 
 ProcessorBox* ProcessorBox::_current_processor_box = 0;
 RefPtr<Action> ProcessorBox::paste_action;
-Glib::RefPtr<Gdk::Pixbuf> SendProcessorEntry::_slider;
+RefPtr<Action> ProcessorBox::cut_action;
+RefPtr<Action> ProcessorBox::rename_action;
+RefPtr<Action> ProcessorBox::edit_action;
+RefPtr<Action> ProcessorBox::edit_generic_action;
+
+ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processor> p, Width w)
+       : _button (ArdourButton::led_default_elements)
+       , _position (PreFader)
+       , _parent (parent)
+       , _processor (p)
+       , _width (w)
+       , _visual_state (Gtk::STATE_NORMAL)
+{
+       _vbox.show ();
+       
+       _button.set_diameter (3);
+       _button.set_distinct_led_click (true);
+       _button.set_led_left (true);
+       _button.signal_led_clicked.connect (sigc::mem_fun (*this, &ProcessorEntry::led_clicked));
+       _button.set_text (name (_width));
 
-ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
-       : _processor (p), _width (w)
-{
-       _hbox.pack_start (_active, false, false);
-       _event_box.add (_name);
-       _hbox.pack_start (_event_box, true, true);
-       _vbox.pack_start (_hbox);
+       if (_processor) {
 
-       _name.set_alignment (0, 0.5);
-       _name.set_text (name ());
-       _name.set_padding (2, 2);
-       
-       _active.set_active (_processor->active ());
-       _active.signal_toggled().connect (mem_fun (*this, &ProcessorEntry::active_toggled));
-       
-       _processor->ActiveChanged.connect (mem_fun (*this, &ProcessorEntry::processor_active_changed));
-       _processor->NameChanged.connect (mem_fun (*this, &ProcessorEntry::processor_name_changed));
+               _vbox.pack_start (_button, true, true);
+
+               _button.set_active (_processor->active());
+               _button.show ();
+
+               _processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context());
+               _processor->PropertyChanged.connect (name_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context());
+
+               set<Evoral::Parameter> p = _processor->what_can_be_automated ();
+               for (set<Evoral::Parameter>::iterator i = p.begin(); i != p.end(); ++i) {
+                       
+                       Control* c = new Control (_processor->automation_control (*i), _processor->describe_parameter (*i));
+                       
+                       _controls.push_back (c);
+
+                       if (boost::dynamic_pointer_cast<Amp> (_processor) == 0) {
+                               /* Add non-Amp controls to the processor box */
+                               _vbox.pack_start (c->box);
+                       }
+
+                       if (boost::dynamic_pointer_cast<Send> (_processor)) {
+                               /* Don't label send faders */
+                               c->hide_label ();
+                       }
+               }
+
+               setup_tooltip ();
+               setup_visuals ();
+       } else {
+               _vbox.set_size_request (-1, _button.size_request().height);
+       }
+}
+
+ProcessorEntry::~ProcessorEntry ()
+{
+       for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               delete *i;
+       }
 }
 
 EventBox&
 ProcessorEntry::action_widget ()
 {
-       return _event_box;
+       return _button;
 }
 
 Gtk::Widget&
@@ -125,9 +164,45 @@ ProcessorEntry::widget ()
 string
 ProcessorEntry::drag_text () const
 {
-       return name ();
+       return name (Wide);
+}
+
+void
+ProcessorEntry::set_position (Position p)
+{
+       _position = p;
+       setup_visuals ();
 }
 
+void
+ProcessorEntry::set_visual_state (Gtkmm2ext::VisualState s, bool yn)
+{
+       if (yn) {
+               _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() | s));
+       } else {
+               _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() & ~s));
+       }
+}
+
+void
+ProcessorEntry::setup_visuals ()
+{
+       switch (_position) {
+       case PreFader:
+               _button.set_name ("processor prefader");
+               break;
+
+       case Fader:
+               _button.set_name ("processor fader");
+               break;
+
+       case PostFader:
+               _button.set_name ("processor postfader");
+               break;
+       }
+}
+
+
 boost::shared_ptr<Processor>
 ProcessorEntry::processor () const
 {
@@ -135,21 +210,19 @@ ProcessorEntry::processor () const
 }
 
 void
-ProcessorEntry::set_width (Width w)
+ProcessorEntry::set_enum_width (Width w)
 {
        _width = w;
 }
 
 void
-ProcessorEntry::active_toggled ()
+ProcessorEntry::led_clicked()
 {
-       if (_active.get_active ()) {
-               if (!_processor->active ()) {
-                       _processor->activate ();
-               }
-       } else {
-               if (_processor->active ()) {
+       if (_processor) {
+               if (_button.get_active ()) {
                        _processor->deactivate ();
+               } else {
+                       _processor->activate ();
                }
        }
 }
@@ -157,39 +230,61 @@ ProcessorEntry::active_toggled ()
 void
 ProcessorEntry::processor_active_changed ()
 {
-       if (_active.get_active () != _processor->active ()) {
-               _active.set_active (_processor->active ());
+       if (_processor) {
+               _button.set_active (_processor->active());
        }
 }
 
 void
-ProcessorEntry::processor_name_changed ()
+ProcessorEntry::processor_property_changed (const PropertyChange& what_changed)
 {
-       _name.set_text (name ());
+       if (what_changed.contains (ARDOUR::Properties::name)) {
+               _button.set_text (name (_width));
+               setup_tooltip ();
+       }
+}
+
+void
+ProcessorEntry::setup_tooltip ()
+{
+       if (_processor) {
+               boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (_processor);
+               if (pi) {
+                       if (pi->plugin()->has_editor()) {
+                               ARDOUR_UI::instance()->set_tip (_button,
+                                               string_compose (_("<b>%1</b>\nDouble-click to show GUI.\nAlt+double-click to show generic GUI."), name (Wide)));
+                       } else {
+                               ARDOUR_UI::instance()->set_tip (_button,
+                                               string_compose (_("<b>%1</b>\nDouble-click to show generic GUI."), name (Wide)));
+                       }
+                       return;
+               }
+       }
+       ARDOUR_UI::instance()->set_tip (_button, string_compose ("<b>%1</b>", name (Wide)));
 }
 
 string
-ProcessorEntry::name () const
+ProcessorEntry::name (Width w) const
 {
        boost::shared_ptr<Send> send;
        string name_display;
-       
-       if (!_processor->active()) {
-               name_display = " (";
+
+       if (!_processor) {
+               return string();
        }
-       
+
        if ((send = boost::dynamic_pointer_cast<Send> (_processor)) != 0 &&
            !boost::dynamic_pointer_cast<InternalSend>(_processor)) {
-               
+
                name_display += '>';
-               
+
                /* grab the send name out of its overall name */
-               
+
                string::size_type lbracket, rbracket;
                lbracket = send->name().find ('[');
                rbracket = send->name().find (']');
-               
-               switch (_width) {
+
+               switch (w) {
                case Wide:
                        name_display += send->name().substr (lbracket+1, lbracket-rbracket-1);
                        break;
@@ -197,10 +292,10 @@ ProcessorEntry::name () const
                        name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4);
                        break;
                }
-               
+
        } else {
-               
-               switch (_width) {
+
+               switch (w) {
                case Wide:
                        name_display += _processor->display_name();
                        break;
@@ -208,76 +303,399 @@ ProcessorEntry::name () const
                        name_display += PBD::short_version (_processor->display_name(), 5);
                        break;
                }
+
+       }
+
+       return name_display;
+}
+
+void
+ProcessorEntry::show_all_controls ()
+{
+       for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               (*i)->set_visible (true);
+       }
+
+       _parent->update_gui_object_state (this);
+}
+
+void
+ProcessorEntry::hide_all_controls ()
+{
+       for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               (*i)->set_visible (false);
+       }
+
+       _parent->update_gui_object_state (this);
+}
+
+void
+ProcessorEntry::add_control_state (XMLNode* node) const
+{
+       for (list<Control*>::const_iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               (*i)->add_state (node);
+       }
+}
+
+void
+ProcessorEntry::set_control_state (XMLNode const * node)
+{
+       for (list<Control*>::const_iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               (*i)->set_state (node);
+       }
+}
+
+string
+ProcessorEntry::state_id () const
+{
+       return string_compose ("processor %1", _processor->id().to_s());
+}
+
+void
+ProcessorEntry::hide_things ()
+{
+       for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               (*i)->hide_things ();
+       }
+}
+
+
+Menu *
+ProcessorEntry::build_controls_menu ()
+{
+       using namespace Menu_Helpers;
+       Menu* menu = manage (new Menu);
+       MenuList& items = menu->items ();
+
+       items.push_back (
+               MenuElem (_("Show All Controls"), sigc::mem_fun (*this, &ProcessorEntry::show_all_controls))
+               );
                
+       items.push_back (
+               MenuElem (_("Hide All Controls"), sigc::mem_fun (*this, &ProcessorEntry::hide_all_controls))
+               );
+
+       if (!_controls.empty ()) {
+               items.push_back (SeparatorElem ());
        }
        
-       if (!_processor->active()) {
-               name_display += ')';
+       for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               items.push_back (CheckMenuElem ((*i)->name ()));
+               CheckMenuItem* c = dynamic_cast<CheckMenuItem*> (&items.back ());
+               c->set_active ((*i)->visible ());
+               c->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ProcessorEntry::toggle_control_visibility), *i));
        }
-       
-       return name_display;
+
+       return menu;
+}
+
+void
+ProcessorEntry::toggle_control_visibility (Control* c)
+{
+       c->set_visible (!c->visible ());
+       _parent->update_gui_object_state (this);
 }
 
-SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
-       : ProcessorEntry (s, w),
-         _send (s),
-         _adjustment (0, 0, 1, 0.01, 0.1),
-         _fader (_slider, &_adjustment, false),
-         _ignore_gain_change (false)
+ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string const & n)
+       : _control (c)
+       , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
+       , _slider (&_adjustment, 0, 13, false)
+       , _slider_persistant_tooltip (&_slider)
+       , _button (ArdourButton::Element (ArdourButton::Text | ArdourButton::Indicator))
+       , _ignore_ui_adjustment (false)
+       , _visible (false)
+       , _name (n)
 {
-       _fader.set_controllable (_send->amp()->gain_control ());
-       _vbox.pack_start (_fader);
+       _slider.set_controllable (c);
+
+       if (c->toggled()) {
+               _button.set_text (_name);
+               _button.set_led_left (true);
+               _button.set_name ("processor control button");
+               box.pack_start (_button);
+               _button.show ();
+
+               _button.signal_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked));
+               _button.signal_led_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked));
+               c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ());
+
+       } else {
+               
+               _slider.set_name ("PluginSlider");
+               _slider.set_text (_name);
+
+               box.pack_start (_slider);
+               _slider.show ();
+
+               double const lo = c->internal_to_interface (c->lower ());
+               double const up = c->internal_to_interface (c->upper ());
+               
+               _adjustment.set_lower (lo);
+               _adjustment.set_upper (up);
+               _adjustment.set_step_increment ((up - lo) / 100);
+               _adjustment.set_page_increment ((up - lo) / 10);
+               _slider.set_default_value (c->internal_to_interface (c->normal ()));
+               
+               _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &Control::slider_adjusted));
+               c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ());
+       }
+
+       ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &Control::control_changed));
+       
+       control_changed ();
+       set_tooltip ();
 
-       _adjustment.signal_value_changed().connect (mem_fun (*this, &SendProcessorEntry::gain_adjusted));
-       _send->amp()->gain_control()->Changed.connect (mem_fun (*this, &SendProcessorEntry::show_gain));
-       show_gain ();
+       /* We're providing our own PersistentTooltip */
+       set_no_tooltip_whatsoever (_slider);
 }
 
 void
-SendProcessorEntry::setup_slider_pix ()
+ProcessorEntry::Control::set_tooltip ()
 {
-       _slider = ::get_icon ("fader_belt_h_thin");
-       assert (_slider);
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+
+       if (!c) {
+               return;
+       }
+       
+       stringstream s;
+       s << _name << ": ";
+       if (c->toggled ()) {
+               s << (c->get_value() > 0.5 ? _("on") : _("off"));
+       } else {
+               s << setprecision(2) << fixed;
+               s << c->internal_to_user (c->get_value ());
+       }
+
+       string sm = Glib::Markup::escape_text (s.str());
+       
+       ARDOUR_UI::instance()->set_tip (_label, sm);
+       _slider_persistant_tooltip.set_tip (sm);
+       ARDOUR_UI::instance()->set_tip (_button, sm);
 }
 
 void
-SendProcessorEntry::show_gain ()
+ProcessorEntry::Control::slider_adjusted ()
 {
-       ENSURE_GUI_THREAD (mem_fun (*this, &SendProcessorEntry::show_gain));
+       if (_ignore_ui_adjustment) {
+               return;
+       }
        
-       float const value = gain_to_slider_position (_send->amp()->gain ());
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
 
-       if (_adjustment.get_value() != value) {
-               _ignore_gain_change = true;
-               _adjustment.set_value (value);
-               _ignore_gain_change = false;
+       if (!c) {
+               return;
        }
+
+       c->set_value (c->interface_to_internal (_adjustment.get_value ()));
+       set_tooltip ();
 }
 
 void
-SendProcessorEntry::gain_adjusted ()
+ProcessorEntry::Control::button_clicked ()
 {
-       if (_ignore_gain_change) {
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+
+       if (!c) {
                return;
        }
 
-       _send->amp()->set_gain (slider_position_to_gain (_adjustment.get_value()), this);
+       bool const n = _button.get_active ();
+
+       c->set_value (n ? 0 : 1);
+       _button.set_active (!n);
 }
 
+void
+ProcessorEntry::Control::control_changed ()
+{
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+       if (!c) {
+               return;
+       }
+
+       _ignore_ui_adjustment = true;
+
+       if (c->toggled ()) {
 
+               _button.set_active (c->get_value() > 0.5);
+               
+       } else {
+
+               _adjustment.set_value (c->internal_to_interface (c->get_value ()));
+               
+               stringstream s;
+               s.precision (1);
+               s.setf (ios::fixed, ios::floatfield);
+               s << c->internal_to_user (c->get_value ());
+       }
+       
+       _ignore_ui_adjustment = false;
+}
 
-ProcessorBox::ProcessorBox (ARDOUR::Session& sess, sigc::slot<PluginSelector*> get_plugin_selector,
-                       RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer)
-       : _session(sess)
-       , _parent_strip (parent)
+void
+ProcessorEntry::Control::add_state (XMLNode* node) const
+{
+       XMLNode* c = new XMLNode (X_("Object"));
+       c->add_property (X_("id"), state_id ());
+       c->add_property (X_("visible"), _visible);
+       node->add_child_nocopy (*c);
+}
+
+void
+ProcessorEntry::Control::set_state (XMLNode const * node)
+{
+       XMLNode* n = GUIObjectState::get_node (node, state_id ());
+       if (n) {
+               XMLProperty* p = n->property (X_("visible"));
+               set_visible (p && string_is_affirmative (p->value ()));
+       } else {
+               set_visible (false);
+       }
+}
+
+void
+ProcessorEntry::Control::set_visible (bool v)
+{
+       if (v) {
+               box.show ();
+       } else {
+               box.hide ();
+       }
+       
+       _visible = v;
+}
+
+/** Called when the Editor might have re-shown things that
+    we want hidden.
+*/
+void
+ProcessorEntry::Control::hide_things ()
+{
+       if (!_visible) {
+               box.hide ();
+       }
+}
+
+void
+ProcessorEntry::Control::hide_label ()
+{
+       _label.hide ();
+}
+
+string
+ProcessorEntry::Control::state_id () const
+{
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+       assert (c);
+
+       return string_compose (X_("control %1"), c->id().to_s ());
+}
+
+BlankProcessorEntry::BlankProcessorEntry (ProcessorBox* b, Width w)
+       : ProcessorEntry (b, boost::shared_ptr<Processor>(), w)
+{
+}
+
+PluginInsertProcessorEntry::PluginInsertProcessorEntry (ProcessorBox* b, boost::shared_ptr<ARDOUR::PluginInsert> p, Width w)
+       : ProcessorEntry (b, p, w)
+       , _plugin_insert (p)
+{
+       p->SplittingChanged.connect (
+               _splitting_connection, invalidator (*this), boost::bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context()
+               );
+
+       _splitting_icon.set_size_request (-1, 12);
+
+       _vbox.pack_start (_splitting_icon);
+       _vbox.reorder_child (_splitting_icon, 0);
+
+       plugin_insert_splitting_changed ();
+}
+
+void
+PluginInsertProcessorEntry::plugin_insert_splitting_changed ()
+{
+       if (_plugin_insert->splitting ()) {
+               _splitting_icon.show ();
+       } else {
+               _splitting_icon.hide ();
+       }
+}
+
+void
+PluginInsertProcessorEntry::hide_things ()
+{
+       ProcessorEntry::hide_things ();
+       plugin_insert_splitting_changed ();
+}
+
+void
+PluginInsertProcessorEntry::setup_visuals ()
+{
+       switch (_position) {
+       case PreFader:
+               _splitting_icon.set_name ("ProcessorPreFader");
+               break;
+
+       case Fader:
+               _splitting_icon.set_name ("ProcessorFader");
+               break;
+
+       case PostFader:
+               _splitting_icon.set_name ("ProcessorPostFader");
+               break;
+       }
+
+       ProcessorEntry::setup_visuals ();
+}
+
+bool
+PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev)
+{
+       cairo_t* cr = gdk_cairo_create (get_window()->gobj());
+
+       cairo_set_line_width (cr, 1);
+
+       double const width = ev->area.width;
+       double const height = ev->area.height;
+
+       Gdk::Color const bg = get_style()->get_bg (STATE_NORMAL);
+       cairo_set_source_rgb (cr, bg.get_red_p (), bg.get_green_p (), bg.get_blue_p ());
+
+       cairo_rectangle (cr, 0, 0, width, height);
+       cairo_fill (cr);
+
+       Gdk::Color const fg = get_style()->get_fg (STATE_NORMAL);
+       cairo_set_source_rgb (cr, fg.get_red_p (), fg.get_green_p (), fg.get_blue_p ());
+
+       cairo_move_to (cr, width * 0.3, height);
+       cairo_line_to (cr, width * 0.3, height * 0.5);
+       cairo_line_to (cr, width * 0.7, height * 0.5);
+       cairo_line_to (cr, width * 0.7, height);
+       cairo_move_to (cr, width * 0.5, height * 0.5);
+       cairo_line_to (cr, width * 0.5, 0);
+       cairo_stroke (cr);
+
+       return true;
+}
+
+ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelector*()> get_plugin_selector,
+                           RouteProcessorSelection& rsel, MixerStrip* parent, bool owner_is_mixer)
+       : _parent_strip (parent)
        , _owner_is_mixer (owner_is_mixer)
+       , ab_direction (true)
        , _get_plugin_selector (get_plugin_selector)
-       , _placement(PreFader)
+       , _placement (-1)
+       , _visible_prefader_processors (0)
        , _rr_selection(rsel)
+       , _redisplay_pending (false)
+
 {
+       set_session (sess);
+
        _width = Wide;
        processor_menu = 0;
-       send_action_menu = 0;
        no_processor_redisplay = false;
 
        processor_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
@@ -285,43 +703,69 @@ ProcessorBox::ProcessorBox (ARDOUR::Session& sess, sigc::slot<PluginSelector*> g
        pack_start (processor_scroller, true, true);
 
        processor_display.set_flags (CAN_FOCUS);
-       processor_display.set_name ("ProcessorSelector");
-       processor_display.set_size_request (48, -1);
+       processor_display.set_name ("ProcessorList");
        processor_display.set_data ("processorbox", this);
+       processor_display.set_size_request (48, -1);
+       processor_display.set_spacing (2);
+
+       processor_display.signal_enter_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::enter_notify), false);
+       processor_display.signal_leave_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::leave_notify), false);
 
-       processor_display.signal_enter_notify_event().connect (mem_fun(*this, &ProcessorBox::enter_notify), false);
-       processor_display.signal_leave_notify_event().connect (mem_fun(*this, &ProcessorBox::leave_notify), false);
+       processor_display.ButtonPress.connect (sigc::mem_fun (*this, &ProcessorBox::processor_button_press_event));
+       processor_display.ButtonRelease.connect (sigc::mem_fun (*this, &ProcessorBox::processor_button_release_event));
 
-       processor_display.signal_key_press_event().connect (mem_fun(*this, &ProcessorBox::processor_key_press_event));
-       processor_display.signal_key_release_event().connect (mem_fun(*this, &ProcessorBox::processor_key_release_event));
+       processor_display.Reordered.connect (sigc::mem_fun (*this, &ProcessorBox::reordered));
+       processor_display.DropFromAnotherBox.connect (sigc::mem_fun (*this, &ProcessorBox::object_drop));
 
-       processor_display.ButtonPress.connect (mem_fun (*this, &ProcessorBox::processor_button_press_event));
-       processor_display.ButtonRelease.connect (mem_fun (*this, &ProcessorBox::processor_button_release_event));
+       processor_scroller.show ();
+       processor_display.show ();
+
+       if (parent) {
+               parent->DeliveryChanged.connect (
+                       _mixer_strip_connections, invalidator (*this), boost::bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context ()
+                       );
+       }
 
-       processor_display.Reordered.connect (mem_fun (*this, &ProcessorBox::reordered));
-       processor_display.DropFromAnotherBox.connect (mem_fun (*this, &ProcessorBox::object_drop));
-       processor_display.SelectionChanged.connect (mem_fun (*this, &ProcessorBox::selection_changed));
+       ARDOUR_UI::instance()->set_tip (processor_display, _("Right-click to add/remove/edit\nplugins,inserts,sends and more"));
 }
 
 ProcessorBox::~ProcessorBox ()
 {
+       /* it may appear as if we should delete processor_menu but that is a
+        * pointer to a widget owned by the UI Manager, and has potentially
+        * be returned to many other ProcessorBoxes. GTK doesn't really make
+        * clear the ownership of this widget, which is a menu and thus is
+        * never packed into any container other than an implict GtkWindow.
+        *
+        * For now, until or if we ever get clarification over the ownership
+        * story just let it continue to exist. At worst, its a small memory leak.
+        */
 }
 
 void
 ProcessorBox::set_route (boost::shared_ptr<Route> r)
 {
-       connections.clear ();
+       if (_route == r) {
+               return;
+       }
+
+       _route_connections.drop_connections();
 
        /* new route: any existing block on processor redisplay must be meaningless */
        no_processor_redisplay = false;
        _route = r;
 
-       connections.push_back (_route->processors_changed.connect (
-                       mem_fun(*this, &ProcessorBox::redisplay_processors)));
-       connections.push_back (_route->GoingAway.connect (
-                       mem_fun (*this, &ProcessorBox::route_going_away)));
-       connections.push_back (_route->NameChanged.connect (
-                       mem_fun(*this, &ProcessorBox::route_name_changed)));
+       _route->processors_changed.connect (
+               _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_processors_changed, this, _1), gui_context()
+               );
+
+       _route->DropReferences.connect (
+               _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_going_away, this), gui_context()
+               );
+
+       _route->PropertyChanged.connect (
+               _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_property_changed, this, _1), gui_context()
+               );
 
        redisplay_processors ();
 }
@@ -331,6 +775,7 @@ ProcessorBox::route_going_away ()
 {
        /* don't keep updating display as processors are deleted */
        no_processor_redisplay = true;
+       _route.reset ();
 }
 
 void
@@ -339,12 +784,29 @@ ProcessorBox::object_drop(DnDVBox<ProcessorEntry>* source, ProcessorEntry* posit
        boost::shared_ptr<Processor> p;
        if (position) {
                p = position->processor ();
+               if (!p) {
+                       /* dropped on the blank entry (which will be before the
+                          fader), so use the first non-blank child as our
+                          `dropped on' processor */
+                       list<ProcessorEntry*> c = processor_display.children ();
+                       list<ProcessorEntry*>::iterator i = c.begin ();
+                       while (dynamic_cast<BlankProcessorEntry*> (*i)) {
+                               assert (i != c.end ());
+                               ++i;
+                       }
+
+                       assert (i != c.end ());
+                       p = (*i)->processor ();
+                       assert (p);
+               }
        }
 
        list<ProcessorEntry*> children = source->selection ();
        list<boost::shared_ptr<Processor> > procs;
        for (list<ProcessorEntry*>::const_iterator i = children.begin(); i != children.end(); ++i) {
-               procs.push_back ((*i)->processor ());
+               if ((*i)->processor ()) {
+                       procs.push_back ((*i)->processor ());
+               }
        }
 
        for (list<boost::shared_ptr<Processor> >::const_iterator i = procs.begin(); i != procs.end(); ++i) {
@@ -362,76 +824,35 @@ ProcessorBox::object_drop(DnDVBox<ProcessorEntry>* source, ProcessorEntry* posit
        if ((context->get_suggested_action() == Gdk::ACTION_MOVE) && source) {
                ProcessorBox* other = reinterpret_cast<ProcessorBox*> (source->get_data ("processorbox"));
                if (other) {
-                       cerr << "source was another processor box, delete the selected items\n";
                        other->delete_dragged_processors (procs);
                }
        }
 }
 
-void
-ProcessorBox::update()
-{
-       redisplay_processors ();
-}
-
 void
 ProcessorBox::set_width (Width w)
 {
        if (_width == w) {
                return;
        }
-       
+
        _width = w;
 
        list<ProcessorEntry*> children = processor_display.children ();
        for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
-               (*i)->set_width (w);
+               (*i)->set_enum_width (w);
        }
 
-       redisplay_processors ();
-}
-
-void
-ProcessorBox::remove_processor_gui (boost::shared_ptr<Processor> processor)
-{
-       boost::shared_ptr<Send> send;
-       boost::shared_ptr<Return> retrn;
-       boost::shared_ptr<PortInsert> port_insert;
-
-       if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
-               PortInsertUI *io_selector = reinterpret_cast<PortInsertUI *> (port_insert->get_gui());
-               port_insert->set_gui (0);
-               delete io_selector;
-       } else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
-               SendUIWindow *sui = reinterpret_cast<SendUIWindow*> (send->get_gui());
-               send->set_gui (0);
-               delete sui;
-       } else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {
-               ReturnUIWindow *rui = reinterpret_cast<ReturnUIWindow*> (retrn->get_gui());
-               retrn->set_gui (0);
-               delete rui;
-       }
-}
-
-void
-ProcessorBox::build_send_action_menu ()
-{
-       using namespace Menu_Helpers;
-
-       send_action_menu = new Menu;
-       send_action_menu->set_name ("ArdourContextMenu");
-       MenuList& items = send_action_menu->items();
-
-       items.push_back (MenuElem (_("New send"), mem_fun(*this, &ProcessorBox::new_send)));
-       items.push_back (MenuElem (_("Show send controls"), mem_fun(*this, &ProcessorBox::show_send_controls)));
+       queue_resize ();
 }
 
 Gtk::Menu*
 ProcessorBox::build_possible_aux_menu ()
 {
-       boost::shared_ptr<RouteList> rl = _session.get_routes_with_internal_returns();
+       boost::shared_ptr<RouteList> rl = _session->get_routes_with_internal_returns();
 
        if (rl->empty()) {
+               /* No aux sends if there are no busses */
                return 0;
        }
 
@@ -441,7 +862,7 @@ ProcessorBox::build_possible_aux_menu ()
 
        for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
                if (!_route->internal_send_for (*r) && *r != _route) {
-                       items.push_back (MenuElem ((*r)->name(), bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr<Route>(*r))));
+                       items.push_back (MenuElem ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr<Route>(*r))));
                }
        }
 
@@ -449,29 +870,24 @@ ProcessorBox::build_possible_aux_menu ()
 }
 
 void
-ProcessorBox::show_send_controls ()
-{
-}
-
-void
-ProcessorBox::new_send ()
-{
-}
-
-void
-ProcessorBox::show_processor_menu (gint arg)
+ProcessorBox::show_processor_menu (int arg)
 {
        if (processor_menu == 0) {
                processor_menu = build_processor_menu ();
+               processor_menu->signal_unmap().connect (sigc::mem_fun (*this, &ProcessorBox::processor_menu_unmapped));
        }
 
-       Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/processormenu/newplugin"));
+       /* Sort out the plugin submenu */
+
+       Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newplugin"));
 
        if (plugin_menu_item) {
                plugin_menu_item->set_submenu (*_get_plugin_selector()->plugin_menu());
        }
 
-       Gtk::MenuItem* aux_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/processormenu/newaux"));
+       /* And the aux submenu */
+
+       Gtk::MenuItem* aux_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newaux"));
 
        if (aux_menu_item) {
                Menu* m = build_possible_aux_menu();
@@ -485,45 +901,79 @@ ProcessorBox::show_processor_menu (gint arg)
                }
        }
 
+       ProcessorEntry* single_selection = 0;
+       if (processor_display.selection().size() == 1) {
+               single_selection = processor_display.selection().front();
+       }
+
+       /* And the controls submenu */
+
+       Gtk::MenuItem* controls_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/controls"));
+
+       if (controls_menu_item) {
+               if (single_selection) {
+                       Menu* m = single_selection->build_controls_menu ();
+                       if (m && !m->items().empty()) {
+                               controls_menu_item->set_submenu (*m);
+                               controls_menu_item->set_sensitive (true);
+                       } else {
+                               gtk_menu_item_set_submenu (controls_menu_item->gobj(), 0);
+                               controls_menu_item->set_sensitive (false);
+                       }
+               }
+       }
+
+       /* Sensitise actions as approprioate */
+
+        cut_action->set_sensitive (can_cut());
        paste_action->set_sensitive (!_rr_selection.processors.empty());
 
+       const bool sensitive = !processor_display.selection().empty();
+       ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive);
+       edit_action->set_sensitive (one_processor_can_be_edited ());
+       edit_generic_action->set_sensitive (one_processor_can_be_edited ());
+
+       boost::shared_ptr<PluginInsert> pi;
+       if (single_selection) {
+               pi = boost::dynamic_pointer_cast<PluginInsert> (single_selection->processor ());
+       }
+
+       /* allow editing with an Ardour-generated UI for plugin inserts with editors */
+       edit_action->set_sensitive (pi && pi->plugin()->has_editor ());
+
+       /* disallow rename for multiple selections, for plugin inserts and for the fader */
+       rename_action->set_sensitive (single_selection && !pi && !boost::dynamic_pointer_cast<Amp> (single_selection->processor ()));
+
        processor_menu->popup (1, arg);
-}
 
-bool
-ProcessorBox::enter_notify (GdkEventCrossing*)
-{
-       _current_processor_box = this;
-       Keyboard::magic_widget_grab_focus ();
-       processor_display.grab_focus ();
+       /* Add a placeholder gap to the processor list to indicate where a processor would be
+          inserted were one chosen from the menu.
+       */
+       int x, y;
+       processor_display.get_pointer (x, y);
+       _placement = processor_display.add_placeholder (y);
 
-       return false;
+       if (_visible_prefader_processors == 0 && _placement > 0) {
+               --_placement;
+       }
 }
 
 bool
-ProcessorBox::leave_notify (GdkEventCrossing* ev)
+ProcessorBox::enter_notify (GdkEventCrossing*)
 {
-       switch (ev->detail) {
-       case GDK_NOTIFY_INFERIOR:
-               break;
-       default:
-               Keyboard::magic_widget_drop_focus ();
-       }
-
+       _current_processor_box = this;
        return false;
 }
 
 bool
-ProcessorBox::processor_key_press_event (GdkEventKey *)
+ProcessorBox::leave_notify (GdkEventCrossing*)
 {
-       /* do real stuff on key release */
        return false;
 }
 
-bool
-ProcessorBox::processor_key_release_event (GdkEventKey *ev)
+void
+ProcessorBox::processor_operation (ProcessorOperation op) 
 {
-       bool ret = false;
        ProcSelection targets;
 
        get_selected_processors (targets);
@@ -533,44 +983,39 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
                int x, y;
                processor_display.get_pointer (x, y);
 
-               pair<ProcessorEntry *, int> const pointer = processor_display.get_child_at_position (x, y);
+               pair<ProcessorEntry *, double> const pointer = processor_display.get_child_at_position (y);
 
-               if (pointer.first) {
+               if (pointer.first && pointer.first->processor()) {
                        targets.push_back (pointer.first->processor ());
                }
        }
 
+       switch (op) {
+       case ProcessorsSelectAll:
+               processor_display.select_all ();
+               break;
 
-       switch (ev->keyval) {
-       case GDK_c:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       copy_processors (targets);
-               }
+       case ProcessorsCopy:
+               copy_processors (targets);
                break;
 
-       case GDK_x:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       cut_processors (targets);
-               }
+       case ProcessorsCut:
+               cut_processors (targets);
                break;
 
-       case GDK_v:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       if (targets.empty()) {
-                               paste_processors ();
-                       } else {
-                               paste_processors (targets.front());
-                       }
+       case ProcessorsPaste:
+               if (targets.empty()) {
+                       paste_processors ();
+               } else {
+                       paste_processors (targets.front());
                }
                break;
 
-       case GDK_Delete:
-       case GDK_BackSpace:
+       case ProcessorsDelete:
                delete_processors (targets);
-               ret = true;
                break;
 
-       case GDK_slash:
+       case ProcessorsToggleActive:
                for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) {
                        if ((*i)->active()) {
                                (*i)->deactivate ();
@@ -578,16 +1023,33 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
                                (*i)->activate ();
                        }
                }
-               ret = true;
+               break;
+
+       case ProcessorsAB:
+               ab_plugins ();
                break;
 
        default:
                break;
        }
+}
 
-       return ret;
+ProcessorWindowProxy* 
+ProcessorBox::find_window_proxy (boost::shared_ptr<Processor> processor) const
+{
+       for (list<ProcessorWindowProxy*>::const_iterator i = _processor_window_info.begin(); i != _processor_window_info.end(); ++i) {
+               boost::shared_ptr<Processor> p = (*i)->processor().lock();
+
+               if (p && p == processor) {
+                       return (*i);
+               }
+       }
+
+       return 0;
 }
 
+
+
 bool
 ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child)
 {
@@ -595,16 +1057,24 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry*
        if (child) {
                processor = child->processor ();
        }
-       
+
        int ret = false;
        bool selected = processor_display.selected (child);
 
        if (processor && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS))) {
 
-               if (_session.engine().connected()) {
+               if (_session->engine().connected()) {
                        /* XXX giving an error message here is hard, because we may be in the midst of a button press */
-                       edit_processor (processor);
+
+                       if (!one_processor_can_be_edited ()) return true;
+
+                       if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+                               generic_edit_processor (processor);
+                       } else {
+                               edit_processor (processor);
+                       }
                }
+
                ret = true;
 
        } else if (processor && ev->button == 1 && selected) {
@@ -628,34 +1098,16 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
        if (child) {
                processor = child->processor ();
        }
-       
-       int ret = false;
 
        if (processor && Keyboard::is_delete_event (ev)) {
 
-               Glib::signal_idle().connect (bind (
-                               mem_fun(*this, &ProcessorBox::idle_delete_processor),
+               Glib::signal_idle().connect (sigc::bind (
+                               sigc::mem_fun(*this, &ProcessorBox::idle_delete_processor),
                                boost::weak_ptr<Processor>(processor)));
-               ret = true;
 
        } else if (Keyboard::is_context_menu_event (ev)) {
 
-               /* figure out if we are above or below the fader/amp processor,
-                  and set the next insert position appropriately.
-               */
-
-               if (processor) {
-                       if (_route->processor_is_prefader (processor)) {
-                               _placement = PreFader;
-                       } else {
-                               _placement = PostFader;
-                       }
-               } else {
-                       _placement = PostFader;
-               }
-
                show_processor_menu (ev->time);
-               ret = true;
 
        } else if (processor && Keyboard::is_button2_event (ev)
 #ifndef GTKOSX
@@ -670,8 +1122,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
                } else {
                        processor->activate ();
                }
-               ret = true;
-
        }
 
        return false;
@@ -680,21 +1130,11 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
 Menu *
 ProcessorBox::build_processor_menu ()
 {
-       processor_menu = dynamic_cast<Gtk::Menu*>(ActionManager::get_widget("/processormenu") );
+       processor_menu = dynamic_cast<Gtk::Menu*>(ActionManager::get_widget("/ProcessorMenu") );
        processor_menu->set_name ("ArdourContextMenu");
-
-       show_all_children();
-
        return processor_menu;
 }
 
-void
-ProcessorBox::selection_changed ()
-{
-       bool sensitive = (processor_display.selection().empty()) ? false : true;
-       ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive);
-}
-
 void
 ProcessorBox::select_all_processors ()
 {
@@ -713,21 +1153,19 @@ ProcessorBox::choose_plugin ()
        _get_plugin_selector()->set_interested_object (*this);
 }
 
-void
+/** @return true if an error occurred, otherwise false */
+bool
 ProcessorBox::use_plugins (const SelectedPlugins& plugins)
 {
        for (SelectedPlugins::const_iterator p = plugins.begin(); p != plugins.end(); ++p) {
 
-               boost::shared_ptr<Processor> processor (new PluginInsert (_session, *p));
+               boost::shared_ptr<Processor> processor (new PluginInsert (*_session, *p));
 
                Route::ProcessorStreams err_streams;
 
-               if (Config->get_new_plugins_active()) {
-                       processor->activate ();
-               }
-
-               if (_route->add_processor (processor, _placement, &err_streams)) {
+               if (_route->add_processor_by_index (processor, _placement, &err_streams, Config->get_new_plugins_active ())) {
                        weird_plugin_dialog (**p, err_streams);
+                       return true;
                        // XXX SHAREDPTR delete plugin here .. do we even need to care?
                } else {
 
@@ -736,15 +1174,17 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
                        }
                }
        }
+
+       return false;
 }
 
 void
 ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 {
-       ArdourDialog dialog (_("ardour: weird plugin dialog"));
+       ArdourDialog dialog (_("Plugin Incompatibility"));
        Label label;
 
-       string text = string_compose(_("You attempted to add the plugin \"%1\" at index %2.\n"),
+       string text = string_compose(_("You attempted to add the plugin \"%1\" in slot %2.\n"),
                        p.name(), streams.index);
 
        bool has_midi  = streams.count.n_midi() > 0 || p.get_info()->n_inputs.n_midi() > 0;
@@ -752,28 +1192,31 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 
        text += _("\nThis plugin has:\n");
        if (has_midi) {
-               text += string_compose("\t%1 ", p.get_info()->n_inputs.n_midi()) + _("MIDI input(s)\n");
+               uint32_t const n = p.get_info()->n_inputs.n_midi ();
+               text += string_compose (ngettext ("\t%1 MIDI input\n", "\t%1 MIDI inputs\n", n), n);
        }
        if (has_audio) {
-               text += string_compose("\t%1 ", p.get_info()->n_inputs.n_audio()) + _("audio input(s)\n");
+               uint32_t const n = p.get_info()->n_inputs.n_audio ();
+               text += string_compose (ngettext ("\t%1 audio input\n", "\t%1 audio inputs\n", n), n);
        }
 
-       text += _("\nBut at the insertion point, there are:\n");
+       text += _("\nbut at the insertion point, there are:\n");
        if (has_midi) {
-               text += string_compose("\t%1 ", streams.count.n_midi()) + _("MIDI channel(s)\n");
+               uint32_t const n = streams.count.n_midi ();
+               text += string_compose (ngettext ("\t%1 MIDI channel\n", "\t%1 MIDI channels\n", n), n);
        }
        if (has_audio) {
-               text += string_compose("\t%1 ", streams.count.n_audio()) + _("audio channel(s)\n");
+               uint32_t const n = streams.count.n_audio ();
+               text += string_compose (ngettext ("\t%1 audio channel\n", "\t%1 audio channels\n", n), n);
        }
 
-       text += _("\nArdour is unable to insert this plugin here.\n");
+       text += string_compose (_("\n%1 is unable to insert this plugin here.\n"), PROGRAM_NAME);
        label.set_text(text);
 
        dialog.get_vbox()->pack_start (label);
        dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
 
        dialog.set_name (X_("PluginIODialog"));
-       dialog.set_position (Gtk::WIN_POS_MOUSE);
        dialog.set_modal (true);
        dialog.show_all ();
 
@@ -783,22 +1226,24 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 void
 ProcessorBox::choose_insert ()
 {
-       boost::shared_ptr<Processor> processor (new PortInsert (_session, _route->mute_master()));
-       _route->add_processor (processor, _placement);
+       boost::shared_ptr<Processor> processor (new PortInsert (*_session, _route->pannable(), _route->mute_master()));
+       _route->add_processor_by_index (processor, _placement);
 }
 
+/* Caller must not hold process lock */
 void
 ProcessorBox::choose_send ()
 {
-       boost::shared_ptr<Send> send (new Send (_session, _route->mute_master()));
+       boost::shared_ptr<Send> send (new Send (*_session, _route->pannable(), _route->mute_master()));
 
        /* make an educated guess at the initial number of outputs for the send */
-       ChanCount outs = (_session.master_out())
-                       ? _session.master_out()->n_outputs()
+       ChanCount outs = (_session->master_out())
+                       ? _session->master_out()->n_outputs()
                        : _route->n_outputs();
 
        /* XXX need processor lock on route */
        try {
+               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock());
                send->output()->ensure_io (outs, false, this);
        } catch (AudioEngine::PortRegistrationFailure& err) {
                error << string_compose (_("Cannot set up new send: %1"), err.what()) << endmsg;
@@ -813,15 +1258,15 @@ ProcessorBox::choose_send ()
         */
 
        IOSelectorWindow *ios = new IOSelectorWindow (_session, send->output(), true);
-       ios->show_all ();
+       ios->show ();
 
        /* keep a reference to the send so it doesn't get deleted while
           the IOSelectorWindow is doing its stuff
        */
        _processor_being_created = send;
 
-       ios->selector().Finished.connect (bind (
-                       mem_fun(*this, &ProcessorBox::send_io_finished),
+       ios->selector().Finished.connect (sigc::bind (
+                       sigc::mem_fun(*this, &ProcessorBox::send_io_finished),
                        boost::weak_ptr<Processor>(send), ios));
 
 }
@@ -844,7 +1289,7 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr<Processor>
                break;
 
        case IOSelector::Accepted:
-               _route->add_processor (processor, _placement);
+               _route->add_processor_by_index (processor, _placement);
                if (Profile->get_sae()) {
                        processor->activate ();
                }
@@ -854,35 +1299,6 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr<Processor>
        delete_when_idle (ios);
 }
 
-void
-ProcessorBox::choose_return ()
-{
-       boost::shared_ptr<Return> retrn (new Return (_session));
-
-       /* assume user just wants a single audio input (sidechain) by default */
-       ChanCount ins(DataType::AUDIO, 1);
-
-       /* XXX need processor lock on route */
-       try {
-               retrn->input()->ensure_io (ins, false, this);
-       } catch (AudioEngine::PortRegistrationFailure& err) {
-               error << string_compose (_("Cannot set up new return: %1"), err.what()) << endmsg;
-               return;
-       }
-
-       /* let the user adjust the IO setup before creation */
-       IOSelectorWindow *ios = new IOSelectorWindow (_session, retrn->input(), true);
-       ios->show_all ();
-
-       /* keep a reference to the return so it doesn't get deleted while
-          the IOSelectorWindow is doing its stuff */
-       _processor_being_created = retrn;
-
-       ios->selector().Finished.connect (bind (
-                       mem_fun(*this, &ProcessorBox::return_io_finished),
-                       boost::weak_ptr<Processor>(retrn), ios));
-}
-
 void
 ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptr<Processor> weak_processor, IOSelectorWindow* ios)
 {
@@ -901,7 +1317,7 @@ ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptr<Processo
                break;
 
        case IOSelector::Accepted:
-               _route->add_processor (processor, _placement);
+               _route->add_processor_by_index (processor, _placement);
                if (Profile->get_sae()) {
                        processor->activate ();
                }
@@ -924,16 +1340,25 @@ ProcessorBox::choose_aux (boost::weak_ptr<Route> wr)
                return;
        }
 
-       boost::shared_ptr<RouteList> rlist (new RouteList);
-       rlist->push_back (_route);
+       _session->add_internal_send (target, _placement, _route);
+}
 
-       _session.add_internal_sends (target, PreFader, rlist);
+void
+ProcessorBox::route_processors_changed (RouteProcessorChange c)
+{
+       if (c.type == RouteProcessorChange::MeterPointChange && c.meter_visibly_changed == false) {
+               /* the meter has moved, but it was and still is invisible to the user, so nothing to do */
+               return;
+       }
+
+       redisplay_processors ();
 }
 
 void
 ProcessorBox::redisplay_processors ()
 {
-       ENSURE_GUI_THREAD (mem_fun(*this, &ProcessorBox::redisplay_processors));
+       ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors);
+       bool     fader_seen;
 
        if (no_processor_redisplay) {
                return;
@@ -941,47 +1366,182 @@ ProcessorBox::redisplay_processors ()
 
        processor_display.clear ();
 
-       _route->foreach_processor (mem_fun (*this, &ProcessorBox::add_processor_to_display));
+       _visible_prefader_processors = 0;
+       fader_seen = false;
+
+       _route->foreach_processor (sigc::bind (sigc::mem_fun (*this, &ProcessorBox::help_count_visible_prefader_processors), 
+                                              &_visible_prefader_processors, &fader_seen));
 
-       build_processor_tooltip (processor_eventbox, _("Inserts, sends & plugins:"));
+       if (_visible_prefader_processors == 0) { // fader only
+               BlankProcessorEntry* bpe = new BlankProcessorEntry (this, _width);
+               processor_display.add_child (bpe);
+       }
+
+       _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display));
+
+       for (list<ProcessorWindowProxy*>::iterator i = _processor_window_info.begin(); i != _processor_window_info.end(); ++i) {
+               (*i)->marked = false;
+       }
+
+       _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::maybe_add_processor_to_ui_list));
+
+       /* trim dead wood from the processor window proxy list */
+
+       list<ProcessorWindowProxy*>::iterator i = _processor_window_info.begin();
+       while (i != _processor_window_info.end()) {
+               list<ProcessorWindowProxy*>::iterator j = i;
+               ++j;
+
+               if (!(*i)->marked) {
+                       WM::Manager::instance().remove (*i);
+                       delete *i;
+                       _processor_window_info.erase (i);
+               }
+
+               i = j;
+       }
+
+       setup_entry_positions ();
 }
 
+/** Add a ProcessorWindowProxy for a processor to our list, if that processor does
+ *  not already have one.
+ */
 void
-ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
+ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
 {
-       boost::shared_ptr<Processor> processor (p.lock ());
-
-       if (!processor || !processor->display_to_user()) {
+       boost::shared_ptr<Processor> p = w.lock ();
+       if (!p) {
                return;
        }
 
-       boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
-       if (send) {
-               processor_display.add_child (new SendProcessorEntry (send, _width));
+       list<ProcessorWindowProxy*>::iterator i = _processor_window_info.begin ();
+       while (i != _processor_window_info.end()) {
+
+               boost::shared_ptr<Processor> t = (*i)->processor().lock ();
+
+               if (p == t) {
+                       /* this processor is already on the list; done */
+                       (*i)->marked = true;
+                       return;
+               }
+
+               ++i;
+       }
+
+       /* not on the list; add it */
+
+       string loc;
+       if (_parent_strip) {
+               if (_parent_strip->mixer_owned()) {
+                       loc = X_("M");
+               } else {
+                       loc = X_("R");
+               }
        } else {
-               processor_display.add_child (new ProcessorEntry (processor, _width));
+               loc = X_("P");
        }
+
+       ProcessorWindowProxy* wp = new ProcessorWindowProxy (
+               string_compose ("%1-%2-%3", loc, _route->id(), p->id()),
+               this,
+               w);
+
+       const XMLNode* ui_xml = _session->extra_xml (X_("UI"));
+
+       if (ui_xml) {
+               wp->set_state (*ui_xml);
+       }
+       
+       wp->marked = true;
+
+        /* if the processor already has an existing UI,
+           note that so that we don't recreate it
+        */
+
+        void* existing_ui = p->get_ui ();
+
+        if (existing_ui) {
+                wp->use_window (*(reinterpret_cast<Gtk::Window*>(existing_ui)));
+        }
+
+       _processor_window_info.push_back (wp);
+       WM::Manager::instance().register_window (wp);
 }
 
+void
+ProcessorBox::help_count_visible_prefader_processors (boost::weak_ptr<Processor> p, uint32_t* cnt, bool* amp_seen)
+{
+       boost::shared_ptr<Processor> processor (p.lock ());
+
+       if (processor && processor->display_to_user()) {
+
+               if (boost::dynamic_pointer_cast<Amp>(processor)) {
+                       *amp_seen = true;
+               } else {
+                       if (!*amp_seen) {
+                               (*cnt)++;
+                       }
+               }
+       }
+}
 
 void
-ProcessorBox::build_processor_tooltip (EventBox& box, string start)
+ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
 {
-       string tip(start);
+       boost::shared_ptr<Processor> processor (p.lock ());
 
-       list<ProcessorEntry*> children = processor_display.children ();
-       for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
-               tip += '\n';
-               tip += (*i)->processor()->name();
+       if (!processor || !processor->display_to_user()) {
+               return;
+       }
+
+       boost::shared_ptr<PluginInsert> plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor);
+       ProcessorEntry* e = 0;
+       if (plugin_insert) {
+               e = new PluginInsertProcessorEntry (this, plugin_insert, _width);
+       } else {
+               e = new ProcessorEntry (this, processor, _width);
+       }
+
+       /* Set up this entry's state from the GUIObjectState */
+       XMLNode* proc = entry_gui_object_state (e);
+       if (proc) {
+               e->set_control_state (proc);
        }
        
-       ARDOUR_UI::instance()->tooltips().set_tip (box, tip);
+       if (boost::dynamic_pointer_cast<Send> (processor)) {
+               /* Always show send controls */
+               e->show_all_controls ();
+       }
+
+       processor_display.add_child (e);
 }
 
 void
 ProcessorBox::reordered ()
 {
        compute_processor_sort_keys ();
+       setup_entry_positions ();
+}
+
+void
+ProcessorBox::setup_entry_positions ()
+{
+       list<ProcessorEntry*> children = processor_display.children ();
+       bool pre_fader = true;
+
+       for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
+               if (boost::dynamic_pointer_cast<Amp>((*i)->processor())) {
+                       pre_fader = false;
+                       (*i)->set_position (ProcessorEntry::Fader);
+               } else {
+                       if (pre_fader) {
+                               (*i)->set_position (ProcessorEntry::PreFader);
+                       } else {
+                               (*i)->set_position (ProcessorEntry::PostFader);
+                       }
+               }
+       }
 }
 
 void
@@ -990,36 +1550,48 @@ ProcessorBox::compute_processor_sort_keys ()
        list<ProcessorEntry*> children = processor_display.children ();
        Route::ProcessorList our_processors;
 
-       for (list<ProcessorEntry*>::iterator iter = children.begin(); iter != children.end(); ++iter) {
-               our_processors.push_back ((*iter)->processor ());
+       for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
+               if ((*i)->processor()) {
+                       our_processors.push_back ((*i)->processor ());
+               }
        }
 
        if (_route->reorder_processors (our_processors)) {
+               /* Reorder failed, so report this to the user.  As far as I can see this must be done
+                  in an idle handler: it seems that the redisplay_processors() that happens below destroys
+                  widgets that were involved in the drag-and-drop on the processor list, which causes problems
+                  when the drag is torn down after this handler function is finished.
+               */
+               Glib::signal_idle().connect_once (sigc::mem_fun (*this, &ProcessorBox::report_failed_reorder));
+       }
+}
 
-               /* reorder failed, so redisplay */
+void
+ProcessorBox::report_failed_reorder ()
+{
+       /* reorder failed, so redisplay */
 
-               redisplay_processors ();
+       redisplay_processors ();
 
-               /* now tell them about the problem */
+       /* now tell them about the problem */
 
-               ArdourDialog dialog (_("ardour: weird plugin dialog"));
-               Label label;
+       ArdourDialog dialog (_("Plugin Incompatibility"));
+       Label label;
 
-               label.set_text (_("\
-You cannot reorder this set of processors\n\
+       label.set_text (_("\
+You cannot reorder these plugins/sends/inserts\n\
 in that way because the inputs and\n\
-outputs do not work correctly."));
+outputs will not work correctly."));
 
-               dialog.get_vbox()->pack_start (label);
-               dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
+       dialog.get_vbox()->set_border_width (12);
+       dialog.get_vbox()->pack_start (label);
+       dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
 
-               dialog.set_name (X_("PluginIODialog"));
-               dialog.set_position (Gtk::WIN_POS_MOUSE);
-               dialog.set_modal (true);
-               dialog.show_all ();
+       dialog.set_name (X_("PluginIODialog"));
+       dialog.set_modal (true);
+       dialog.show_all ();
 
-               dialog.run ();
-       }
+       dialog.run ();
 }
 
 void
@@ -1038,12 +1610,25 @@ ProcessorBox::rename_processors ()
        }
 }
 
-void
-ProcessorBox::cut_processors ()
+bool
+ProcessorBox::can_cut () const
 {
-       ProcSelection to_be_removed;
+        vector<boost::shared_ptr<Processor> > sel;
+
+        get_selected_processors (sel);
+
+        /* cut_processors () does not cut inserts */
+
+        for (vector<boost::shared_ptr<Processor> >::const_iterator i = sel.begin (); i != sel.end (); ++i) {
+
+               if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0 ||
+                   (boost::dynamic_pointer_cast<Send>((*i)) != 0) ||
+                   (boost::dynamic_pointer_cast<Return>((*i)) != 0)) {
+                        return true;
+                }
+        }
 
-       get_selected_processors (to_be_removed);
+        return false;
 }
 
 void
@@ -1063,10 +1648,10 @@ ProcessorBox::cut_processors (const ProcSelection& to_be_removed)
                    (boost::dynamic_pointer_cast<Send>((*i)) != 0) ||
                    (boost::dynamic_pointer_cast<Return>((*i)) != 0)) {
 
-                       void* gui = (*i)->get_gui ();
+                       Window* w = get_processor_ui (*i);
 
-                       if (gui) {
-                               static_cast<Gtk::Widget*>(gui)->hide ();
+                       if (w) {
+                               w->hide ();
                        }
 
                        XMLNode& child ((*i)->get_state());
@@ -1087,14 +1672,6 @@ ProcessorBox::cut_processors (const ProcSelection& to_be_removed)
        redisplay_processors ();
 }
 
-void
-ProcessorBox::copy_processors ()
-{
-       ProcSelection to_be_copied;
-       get_selected_processors (to_be_copied);
-       copy_processors (to_be_copied);
-}
-
 void
 ProcessorBox::copy_processors (const ProcSelection& to_be_copied)
 {
@@ -1116,14 +1693,6 @@ ProcessorBox::copy_processors (const ProcSelection& to_be_copied)
        _rr_selection.set (node);
 }
 
-void
-ProcessorBox::delete_processors ()
-{
-       ProcSelection to_be_deleted;
-       get_selected_processors (to_be_deleted);
-       delete_processors (to_be_deleted);
-}
-
 void
 ProcessorBox::delete_processors (const ProcSelection& targets)
 {
@@ -1135,10 +1704,10 @@ ProcessorBox::delete_processors (const ProcSelection& targets)
 
        for (ProcSelection::const_iterator i = targets.begin(); i != targets.end(); ++i) {
 
-               void* gui = (*i)->get_gui ();
+               Window* w = get_processor_ui (*i);
 
-               if (gui) {
-                       static_cast<Gtk::Widget*>(gui)->hide ();
+               if (w) {
+                       w->hide ();
                }
 
                _route->remove_processor(*i);
@@ -1156,10 +1725,10 @@ ProcessorBox::delete_dragged_processors (const list<boost::shared_ptr<Processor>
        no_processor_redisplay = true;
        for (x = procs.begin(); x != procs.end(); ++x) {
 
-               void* gui = (*x)->get_gui ();
+               Window* w = get_processor_ui (*x);
 
-               if (gui) {
-                       static_cast<Gtk::Widget*>(gui)->hide ();
+               if (w) {
+                       w->hide ();
                }
 
                _route->remove_processor(*x);
@@ -1205,11 +1774,27 @@ ProcessorBox::rename_processor (boost::shared_ptr<Processor> processor)
        case Gtk::RESPONSE_ACCEPT:
                name_prompter.get_result (result);
                if (result.length()) {
-                       if (_session.route_by_name (result)) {
-                               ARDOUR_UI::instance()->popup_error (_("A track already exists with that name."));
-                               return;
-                       }
-                       processor->set_name (result);
+
+                       int tries = 0;
+                       string test = result;
+
+                       while (tries < 100) {
+                               if (_session->io_name_is_legal (test)) {
+                                       result = test;
+                                       break;
+                               }
+                               tries++;
+
+                               test = string_compose ("%1-%2", result, tries);
+                       }
+
+                       if (tries < 100) {
+                               processor->set_name (result);
+                       } else {
+                               /* unlikely! */
+                               ARDOUR_UI::instance()->popup_error
+                                       (string_compose (_("At least 100 IO objects exist with a name like %1 - name not changed"), result));
+                       }
                }
                break;
        }
@@ -1251,6 +1836,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
                XMLProperty const * type = (*niter)->property ("type");
+               XMLProperty const * role = (*niter)->property ("role");
                assert (type);
 
                boost::shared_ptr<Processor> p;
@@ -1258,34 +1844,90 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                        if (type->value() == "meter" ||
                            type->value() == "main-outs" ||
                            type->value() == "amp" ||
-                           type->value() == "intsend" || type->value() == "intreturn") {
-                               /* do not paste meter, main outs, amp or internal send/returns */
+                           type->value() == "intreturn") {
+                               /* do not paste meter, main outs, amp or internal returns */
                                continue;
 
+                       } else if (type->value() == "intsend") {
+                               
+                               /* aux sends are OK, but those used for
+                                * other purposes, are not.
+                                */
+                               
+                               assert (role);
+
+                               if (role->value() != "Aux") {
+                                       continue;
+                               }
+
+                               XMLNode n (**niter);
+                                InternalSend* s = new InternalSend (*_session, _route->pannable(), _route->mute_master(),
+                                                                   boost::shared_ptr<Route>(), Delivery::Aux); 
+
+                               IOProcessor::prepare_for_reset (n, s->name());
+
+                                if (s->set_state (n, Stateful::loading_state_version)) {
+                                        delete s;
+                                        return;
+                                }
+
+                               p.reset (s);
+
                        } else if (type->value() == "send") {
 
                                XMLNode n (**niter);
-                               Send::make_unique (n, _session);
-                               p.reset (new Send (_session, _route->mute_master(), n));
+                                Send* s = new Send (*_session, _route->pannable(), _route->mute_master());
+
+                               IOProcessor::prepare_for_reset (n, s->name());
+                               
+                                if (s->set_state (n, Stateful::loading_state_version)) {
+                                        delete s;
+                                        return;
+                                }
+
+                               p.reset (s);
 
                        } else if (type->value() == "return") {
 
                                XMLNode n (**niter);
-                               Return::make_unique (n, _session);
-                               p.reset (new Return (_session, **niter));
+                                Return* r = new Return (*_session);
+
+                               IOProcessor::prepare_for_reset (n, r->name());
+
+                                if (r->set_state (n, Stateful::loading_state_version)) {
+                                        delete r;
+                                        return;
+                                }
+
+                               p.reset (r);
+
+                       } else if (type->value() == "port") {
+
+                               XMLNode n (**niter);
+                               PortInsert* pi = new PortInsert (*_session, _route->pannable (), _route->mute_master ());
+                               
+                               IOProcessor::prepare_for_reset (n, pi->name());
+                               
+                               if (pi->set_state (n, Stateful::loading_state_version)) {
+                                       return;
+                               }
+                               
+                               p.reset (pi);
 
                        } else {
                                /* XXX its a bit limiting to assume that everything else
                                   is a plugin.
                                */
-                               p.reset (new PluginInsert (_session, **niter));
+
+                               p.reset (new PluginInsert (*_session));
+                                p->set_state (**niter, Stateful::current_state_version);
                        }
 
                        copies.push_back (p);
                }
 
                catch (...) {
-                       cerr << "plugin insert constructor failed\n";
+                       error << _("plugin insert constructor failed") << endmsg;
                }
        }
 
@@ -1305,22 +1947,10 @@ could not match the configuration of this track.");
 }
 
 void
-ProcessorBox::activate_processor (boost::shared_ptr<Processor> r)
-{
-       r->activate ();
-}
-
-void
-ProcessorBox::deactivate_processor (boost::shared_ptr<Processor> r)
-{
-       r->deactivate ();
-}
-
-void
-ProcessorBox::get_selected_processors (ProcSelection& processors)
+ProcessorBox::get_selected_processors (ProcSelection& processors) const
 {
-       list<ProcessorEntry*> selection = processor_display.selection ();
-       for (list<ProcessorEntry*>::iterator i = selection.begin(); i != selection.end(); ++i) {
+       const list<ProcessorEntry*> selection = processor_display.selection ();
+       for (list<ProcessorEntry*>::const_iterator i = selection.begin(); i != selection.end(); ++i) {
                processors.push_back ((*i)->processor ());
        }
 }
@@ -1335,9 +1965,9 @@ ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(boost::share
 }
 
 void
-ProcessorBox::all_processors_active (bool state)
+ProcessorBox::all_visible_processors_active (bool state)
 {
-       _route->all_processors_active (_placement, state);
+       _route->all_visible_processors_active (state);
 }
 
 void
@@ -1360,7 +1990,7 @@ ProcessorBox::clear_processors ()
        choices.push_back (_("Cancel"));
        choices.push_back (_("Yes, remove them all"));
 
-       Gtkmm2ext::Choice prompter (prompt, choices);
+       Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices);
 
        if (prompter.run () == 1) {
                _route->clear_processors (PreFader);
@@ -1385,17 +2015,50 @@ ProcessorBox::clear_processors (Placement p)
        choices.push_back (_("Cancel"));
        choices.push_back (_("Yes, remove them all"));
 
-       Gtkmm2ext::Choice prompter (prompt, choices);
+       Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices);
 
        if (prompter.run () == 1) {
                _route->clear_processors (p);
        }
 }
 
-void
-ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
+bool
+ProcessorBox::processor_can_be_edited (boost::shared_ptr<Processor> processor)
+{
+       boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack> (_route);
+       if (at && at->freeze_state() == AudioTrack::Frozen) {
+               return false;
+       }
+
+       if (
+               (boost::dynamic_pointer_cast<Send> (processor) && !boost::dynamic_pointer_cast<InternalSend> (processor))||
+               boost::dynamic_pointer_cast<Return> (processor) ||
+               boost::dynamic_pointer_cast<PluginInsert> (processor) ||
+               boost::dynamic_pointer_cast<PortInsert> (processor)
+               ) {
+               return true;
+       }
+
+       return false;
+}
+
+bool
+ProcessorBox::one_processor_can_be_edited ()
+{
+       list<ProcessorEntry*> selection = processor_display.selection ();
+       list<ProcessorEntry*>::iterator i = selection.begin();
+       while (i != selection.end() && processor_can_be_edited ((*i)->processor()) == false) {
+               ++i;
+       }
+
+       return (i != selection.end());
+}
+
+Gtk::Window*
+ProcessorBox::get_editor_window (boost::shared_ptr<Processor> processor, bool use_custom)
 {
        boost::shared_ptr<Send> send;
+       boost::shared_ptr<InternalSend> internal_send;
        boost::shared_ptr<Return> retrn;
        boost::shared_ptr<PluginInsert> plugin_insert;
        boost::shared_ptr<PortInsert> port_insert;
@@ -1404,53 +2067,62 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
        if (boost::dynamic_pointer_cast<AudioTrack>(_route) != 0) {
 
                if (boost::dynamic_pointer_cast<AudioTrack> (_route)->freeze_state() == AudioTrack::Frozen) {
-                       return;
+                       return 0;
                }
        }
 
-       if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
+       if (boost::dynamic_pointer_cast<Amp> (processor)) {
 
-               if (!_session.engine().connected()) {
-                       return;
+               if (_parent_strip) {
+                       _parent_strip->revert_to_default_display ();
                }
 
-#ifdef OLD_SEND_EDITING
-               SendUIWindow *send_ui;
-
-               if (send->get_gui() == 0) {
-                       send_ui = new SendUIWindow (send, _session);
-                       send_ui->set_title (send->name());
-                       send->set_gui (send_ui);
+       } else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
 
-               } else {
-                       send_ui = reinterpret_cast<SendUIWindow *> (send->get_gui());
+               if (!_session->engine().connected()) {
+                       return 0;
                }
 
-               gidget = send_ui;
-#else
-               if (_parent_strip) {
-                       _parent_strip->show_send (send);
+               if (boost::dynamic_pointer_cast<InternalSend> (processor) == 0) {
+
+                       gidget = new SendUIWindow (send, _session);
+
+               } else {
+                       /* assign internal send to main fader */
+
+                       if (_parent_strip) {
+                               if (_parent_strip->current_delivery() == send) {
+                                       _parent_strip->revert_to_default_display ();
+                               } else {
+                                       _parent_strip->show_send(send);
+                               }
+                       } 
                }
-#endif
 
        } else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {
 
-               if (!_session.engine().connected()) {
-                       return;
+               if (boost::dynamic_pointer_cast<InternalReturn> (retrn)) {
+                       /* no GUI for these */
+                       return 0;
+               }
+
+               if (!_session->engine().connected()) {
+                       return 0;
                }
 
                boost::shared_ptr<Return> retrn = boost::dynamic_pointer_cast<Return> (processor);
 
                ReturnUIWindow *return_ui;
+               Window* w = get_processor_ui (retrn);
 
-               if (retrn->get_gui() == 0) {
+               if (w == 0) {
 
                        return_ui = new ReturnUIWindow (retrn, _session);
                        return_ui->set_title (retrn->name ());
-                       send->set_gui (return_ui);
+                       set_processor_ui (send, return_ui);
 
                } else {
-                       return_ui = reinterpret_cast<ReturnUIWindow *> (retrn->get_gui());
+                       return_ui = dynamic_cast<ReturnUIWindow *> (w);
                }
 
                gidget = return_ui;
@@ -1461,57 +2133,65 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 
                /* these are both allowed to be null */
 
-               Container* toplevel = get_toplevel();
-               Window* win = dynamic_cast<Gtk::Window*>(toplevel);
+               Window* w = get_processor_ui (plugin_insert);
 
-               if (plugin_insert->get_gui() == 0) {
-
-                       plugin_ui = new PluginUIWindow (win, plugin_insert);
+               if (w == 0) {
+                       plugin_ui = new PluginUIWindow (plugin_insert, false, use_custom);
                        plugin_ui->set_title (generate_processor_title (plugin_insert));
-                       plugin_insert->set_gui (plugin_ui);
+                       set_processor_ui (plugin_insert, plugin_ui);
 
                } else {
-                       plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_insert->get_gui());
-                       plugin_ui->set_parent (win);
+                       plugin_ui = dynamic_cast<PluginUIWindow *> (w);
                }
 
                gidget = plugin_ui;
 
        } else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
 
-               if (!_session.engine().connected()) {
+               if (!_session->engine().connected()) {
                        MessageDialog msg ( _("Not connected to JACK - no I/O changes are possible"));
                        msg.run ();
-                       return;
+                       return 0;
                }
 
                PortInsertWindow *io_selector;
 
-               if (port_insert->get_gui() == 0) {
+               Window* w = get_processor_ui (port_insert);
+
+               if (w == 0) {
                        io_selector = new PortInsertWindow (_session, port_insert);
-                       port_insert->set_gui (io_selector);
+                       set_processor_ui (port_insert, io_selector);
 
                } else {
-                       io_selector = reinterpret_cast<PortInsertWindow *> (port_insert->get_gui());
+                       io_selector = dynamic_cast<PortInsertWindow *> (w);
                }
 
                gidget = io_selector;
        }
 
-       if (gidget) {
-               if (gidget->is_visible()) {
-                       gidget->get_window()->raise ();
-               } else {
-                       gidget->show_all ();
-                       gidget->present ();
-               }
+       return gidget;
+}
+
+Gtk::Window*
+ProcessorBox::get_generic_editor_window (boost::shared_ptr<Processor> processor)
+{
+       boost::shared_ptr<PluginInsert> plugin_insert
+               = boost::dynamic_pointer_cast<PluginInsert>(processor);
+
+       if (!plugin_insert) {
+               return 0;
        }
+
+       PluginUIWindow* win = new PluginUIWindow (plugin_insert, true, false);
+       win->set_title (generate_processor_title (plugin_insert));
+
+       return win;
 }
 
 void
 ProcessorBox::register_actions ()
 {
-       Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("processormenu"));
+       Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("ProcessorMenu"));
        Glib::RefPtr<Action> act;
 
        /* new stuff */
@@ -1521,13 +2201,13 @@ ProcessorBox::register_actions ()
        act = ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"),
                        sigc::ptr_fun (ProcessorBox::rb_choose_insert));
        ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New Send ..."),
+       act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New External Send ..."),
                        sigc::ptr_fun (ProcessorBox::rb_choose_send));
        ActionManager::jack_sensitive_actions.push_back (act);
 
        ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ..."));
-       ActionManager::register_action (popup_act_grp, X_("newreturn"), _("New Return ..."),
-                                       sigc::ptr_fun (ProcessorBox::rb_choose_return));
+
+       ActionManager::register_action (popup_act_grp, X_("controls"), _("Controls"));
 
        ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear (all)"),
                        sigc::ptr_fun (ProcessorBox::rb_clear));
@@ -1537,9 +2217,9 @@ ProcessorBox::register_actions ()
                        sigc::ptr_fun (ProcessorBox::rb_clear_post));
 
        /* standard editing stuff */
-       act = ActionManager::register_action (popup_act_grp, X_("cut"), _("Cut"),
-                       sigc::ptr_fun (ProcessorBox::rb_cut));
-       ActionManager::plugin_selection_sensitive_actions.push_back(act);
+       cut_action = ActionManager::register_action (popup_act_grp, X_("cut"), _("Cut"),
+                                                     sigc::ptr_fun (ProcessorBox::rb_cut));
+       ActionManager::plugin_selection_sensitive_actions.push_back(cut_action);
        act = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"),
                        sigc::ptr_fun (ProcessorBox::rb_copy));
        ActionManager::plugin_selection_sensitive_actions.push_back(act);
@@ -1550,70 +2230,79 @@ ProcessorBox::register_actions ()
 
        paste_action = ActionManager::register_action (popup_act_grp, X_("paste"), _("Paste"),
                        sigc::ptr_fun (ProcessorBox::rb_paste));
-       act = ActionManager::register_action (popup_act_grp, X_("rename"), _("Rename"),
+       rename_action = ActionManager::register_action (popup_act_grp, X_("rename"), _("Rename"),
                        sigc::ptr_fun (ProcessorBox::rb_rename));
-       ActionManager::plugin_selection_sensitive_actions.push_back(act);
        ActionManager::register_action (popup_act_grp, X_("selectall"), _("Select All"),
                        sigc::ptr_fun (ProcessorBox::rb_select_all));
        ActionManager::register_action (popup_act_grp, X_("deselectall"), _("Deselect All"),
                        sigc::ptr_fun (ProcessorBox::rb_deselect_all));
 
-       /* activation */
-
-       act = ActionManager::register_action (popup_act_grp, X_("activate"), _("Activate"),
-                       sigc::ptr_fun (ProcessorBox::rb_activate));
-       ActionManager::plugin_selection_sensitive_actions.push_back(act);
-       act = ActionManager::register_action (popup_act_grp, X_("deactivate"), _("Deactivate"),
-                       sigc::ptr_fun (ProcessorBox::rb_deactivate));
+       /* activation etc. */
 
-       ActionManager::plugin_selection_sensitive_actions.push_back(act);
-       ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"),
+       ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate All"),
                        sigc::ptr_fun (ProcessorBox::rb_activate_all));
-       ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate all"),
+       ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate All"),
                        sigc::ptr_fun (ProcessorBox::rb_deactivate_all));
+       ActionManager::register_action (popup_act_grp, X_("ab_plugins"), _("A/B Plugins"),
+                       sigc::ptr_fun (ProcessorBox::rb_ab_plugins));
 
        /* show editors */
-       act = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit"),
-                       sigc::ptr_fun (ProcessorBox::rb_edit));
-       ActionManager::plugin_selection_sensitive_actions.push_back(act);
+       edit_action = ActionManager::register_action (
+               popup_act_grp, X_("edit"), _("Edit..."),
+               sigc::ptr_fun (ProcessorBox::rb_edit));
+
+       edit_generic_action = ActionManager::register_action (
+               popup_act_grp, X_("edit-generic"), _("Edit with generic controls..."),
+               sigc::ptr_fun (ProcessorBox::rb_edit_generic));
 
        ActionManager::add_action_group (popup_act_grp);
 }
 
 void
-ProcessorBox::rb_choose_plugin ()
+ProcessorBox::rb_edit_generic ()
 {
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->choose_plugin ();
+
+       _current_processor_box->for_selected_processors (&ProcessorBox::generic_edit_processor);
 }
 
 void
-ProcessorBox::rb_choose_insert ()
+ProcessorBox::rb_ab_plugins ()
 {
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->choose_insert ();
+
+       _current_processor_box->ab_plugins ();
 }
 
 void
-ProcessorBox::rb_choose_send ()
+ProcessorBox::rb_choose_plugin ()
 {
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->choose_send ();
+       _current_processor_box->choose_plugin ();
+}
+
+void
+ProcessorBox::rb_choose_insert ()
+{
+       if (_current_processor_box == 0) {
+               return;
+       }
+       _current_processor_box->choose_insert ();
 }
 
 void
-ProcessorBox::rb_choose_return ()
+ProcessorBox::rb_choose_send ()
 {
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->choose_return ();
+       _current_processor_box->choose_send ();
 }
 
 void
@@ -1665,7 +2354,7 @@ ProcessorBox::rb_cut ()
                return;
        }
 
-       _current_processor_box->cut_processors ();
+       _current_processor_box->processor_operation (ProcessorsCut);
 }
 
 void
@@ -1675,7 +2364,7 @@ ProcessorBox::rb_delete ()
                return;
        }
 
-       _current_processor_box->delete_processors ();
+       _current_processor_box->processor_operation (ProcessorsDelete);
 }
 
 void
@@ -1684,7 +2373,7 @@ ProcessorBox::rb_copy ()
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->copy_processors ();
+       _current_processor_box->processor_operation (ProcessorsCopy);
 }
 
 void
@@ -1694,7 +2383,7 @@ ProcessorBox::rb_paste ()
                return;
        }
 
-       _current_processor_box->paste_processors ();
+       _current_processor_box->processor_operation (ProcessorsPaste);
 }
 
 void
@@ -1713,7 +2402,7 @@ ProcessorBox::rb_select_all ()
                return;
        }
 
-       _current_processor_box->select_all_processors ();
+       _current_processor_box->processor_operation (ProcessorsSelectAll);
 }
 
 void
@@ -1726,61 +2415,73 @@ ProcessorBox::rb_deselect_all ()
        _current_processor_box->deselect_all_processors ();
 }
 
-
 void
-ProcessorBox::rb_activate ()
+ProcessorBox::rb_activate_all ()
 {
        if (_current_processor_box == 0) {
                return;
        }
 
-       _current_processor_box->for_selected_processors (&ProcessorBox::activate_processor);
+       _current_processor_box->all_visible_processors_active (true);
 }
 
 void
-ProcessorBox::rb_deactivate ()
+ProcessorBox::rb_deactivate_all ()
 {
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->for_selected_processors (&ProcessorBox::deactivate_processor);
+       _current_processor_box->all_visible_processors_active (false);
 }
 
-
-
 void
-ProcessorBox::rb_activate_all ()
+ProcessorBox::rb_edit ()
 {
        if (_current_processor_box == 0) {
                return;
        }
 
-       _current_processor_box->all_processors_active (true);
+       _current_processor_box->for_selected_processors (&ProcessorBox::edit_processor);
 }
 
 void
-ProcessorBox::rb_deactivate_all ()
+ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 {
-       if (_current_processor_box == 0) {
+       if (!processor) {
                return;
        }
-       _current_processor_box->all_processors_active (false);
+       
+       ProcessorWindowProxy* proxy = find_window_proxy (processor);
+
+       if (proxy) {
+               proxy->set_custom_ui_mode (true);
+               proxy->toggle ();
+       }
 }
 
 void
-ProcessorBox::rb_edit ()
+ProcessorBox::generic_edit_processor (boost::shared_ptr<Processor> processor)
 {
-       if (_current_processor_box == 0) {
+       if (!processor) {
                return;
        }
+       
+       ProcessorWindowProxy* proxy = find_window_proxy (processor);
 
-       _current_processor_box->for_selected_processors (&ProcessorBox::edit_processor);
+       if (proxy) {
+               proxy->set_custom_ui_mode (false);
+               proxy->toggle ();
+       }
 }
 
 void
-ProcessorBox::route_name_changed ()
+ProcessorBox::route_property_changed (const PropertyChange& what_changed)
 {
-       ENSURE_GUI_THREAD (mem_fun (*this, &ProcessorBox::route_name_changed));
+       if (!what_changed.contains (ARDOUR::Properties::name)) {
+               return;
+       }
+
+       ENSURE_GUI_THREAD (*this, &ProcessorBox::route_property_changed, what_changed);
 
        boost::shared_ptr<Processor> processor;
        boost::shared_ptr<PluginInsert> plugin_insert;
@@ -1792,18 +2493,22 @@ ProcessorBox::route_name_changed ()
 
                processor = (*iter)->processor ();
 
-               void* gui = processor->get_gui();
+               if (!processor) {
+                       continue;
+               }
+
+               Window* w = get_processor_ui (processor);
 
-               if (!gui) {
+               if (!w) {
                        continue;
                }
 
                /* rename editor windows for sends and plugins */
 
                if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
-                       static_cast<Window*>(gui)->set_title (send->name ());
+                       w->set_title (send->name ());
                } else if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor)) != 0) {
-                       static_cast<Window*>(gui)->set_title (generate_processor_title (plugin_insert));
+                       w->set_title (generate_processor_title (plugin_insert));
                }
        }
 }
@@ -1826,3 +2531,203 @@ ProcessorBox::generate_processor_title (boost::shared_ptr<PluginInsert> pi)
        return string_compose(_("%1: %2 (by %3)"), _route->name(), pi->name(), maker);
 }
 
+/** @param p Processor.
+ *  @return the UI window for \a p.
+ */
+Window *
+ProcessorBox::get_processor_ui (boost::shared_ptr<Processor> p) const
+{
+       list<ProcessorWindowProxy*>::const_iterator i = _processor_window_info.begin ();
+       while (i != _processor_window_info.end()) {
+               boost::shared_ptr<Processor> t = (*i)->processor().lock ();
+               if (t && t == p) {
+                       return (*i)->get ();
+               }
+
+               ++i;
+       }
+
+       return 0;
+}
+
+/** Make a note of the UI window that a processor is using.
+ *  @param p Processor.
+ *  @param w UI window.
+ */
+void
+ProcessorBox::set_processor_ui (boost::shared_ptr<Processor> p, Gtk::Window* w)
+{
+       list<ProcessorWindowProxy*>::iterator i = _processor_window_info.begin ();
+
+       p->set_ui (w);
+
+       while (i != _processor_window_info.end()) {
+               boost::shared_ptr<Processor> t = (*i)->processor().lock ();
+               if (t && t == p) {
+                       (*i)->use_window (*w);
+                       return;
+               }
+
+               ++i;
+       }
+
+       /* we shouldn't get here, because the ProcessorUIList should always contain
+          an entry for each processor.
+       */
+       assert (false);
+}
+
+void
+ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr<Delivery> w)
+{
+       boost::shared_ptr<Delivery> d = w.lock ();
+       if (!d) {
+               return;
+       }
+
+       list<ProcessorEntry*> children = processor_display.children ();
+       list<ProcessorEntry*>::const_iterator i = children.begin();
+       while (i != children.end() && (*i)->processor() != d) {
+               ++i;
+       }
+
+       if (i == children.end()) {
+               processor_display.set_active (0);
+       } else {
+               processor_display.set_active (*i);
+       }
+}
+
+/** Called to repair the damage of Editor::show_window doing a show_all() */
+void
+ProcessorBox::hide_things ()
+{
+       list<ProcessorEntry*> c = processor_display.children ();
+       for (list<ProcessorEntry*>::iterator i = c.begin(); i != c.end(); ++i) {
+               (*i)->hide_things ();
+       }
+}
+
+void
+ProcessorBox::processor_menu_unmapped ()
+{
+       processor_display.remove_placeholder ();
+}
+
+XMLNode *
+ProcessorBox::entry_gui_object_state (ProcessorEntry* entry)
+{
+       if (!_parent_strip) {
+               return 0;
+       }
+
+       GUIObjectState& st = _parent_strip->gui_object_state ();
+       
+       XMLNode* strip = st.get_or_add_node (_parent_strip->state_id ());
+       assert (strip);
+       return st.get_or_add_node (strip, entry->state_id());
+}
+
+void
+ProcessorBox::update_gui_object_state (ProcessorEntry* entry)
+{
+       XMLNode* proc = entry_gui_object_state (entry);
+       if (!proc) {
+               return;
+       }
+
+       /* XXX: this is a bit inefficient; we just remove all child nodes and re-add them */
+       proc->remove_nodes_and_delete (X_("Object"));
+       entry->add_control_state (proc);
+}
+
+ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* box, boost::weak_ptr<Processor> processor)
+       : WM::ProxyBase (name, string())
+       , marked (false)
+       , _processor_box (box)
+       , _processor (processor)
+       , is_custom (false)
+       , want_custom (false)
+{
+
+}
+
+ARDOUR::SessionHandlePtr*
+ProcessorWindowProxy::session_handle() 
+{
+       /* we don't care */
+       return 0;
+}
+
+XMLNode&
+ProcessorWindowProxy::get_state () const
+{
+       XMLNode *node;
+       node = &ProxyBase::get_state();
+       node->add_property (X_("custom-ui"), is_custom? X_("yes") : X_("no"));
+       return *node;
+}
+
+void
+ProcessorWindowProxy::set_state (const XMLNode& node)
+{
+       XMLNodeList children = node.children ();
+       XMLNodeList::const_iterator i = children.begin ();
+       while (i != children.end()) {
+               XMLProperty* prop = (*i)->property (X_("name"));
+               if ((*i)->name() == X_("Window") && prop && prop->value() == _name) {
+                       break;
+               }
+               ++i;
+       }
+
+       if (i != children.end()) {
+               XMLProperty* prop;
+               if ((prop = (*i)->property (X_("custom-ui"))) != 0) {
+                       want_custom = PBD::string_is_affirmative (prop->value ());
+               }
+       }
+
+       ProxyBase::set_state(node);
+}
+
+Gtk::Window*
+ProcessorWindowProxy::get (bool create)
+{
+       boost::shared_ptr<Processor> p = _processor.lock ();
+
+       if (!p) {
+               return 0;
+       }
+       if (_window && (is_custom != want_custom)) {
+               /* drop existing window - wrong type */
+               drop_window ();
+       }
+
+       if (!_window) {
+               if (!create) {
+                       return 0;
+               }
+               
+               is_custom = want_custom;
+               _window = _processor_box->get_editor_window (p, is_custom);
+
+               if (_window) {
+                       setup ();
+               }
+       }
+
+       return _window;
+}
+
+void
+ProcessorWindowProxy::toggle ()
+{
+       if (_window && (is_custom != want_custom)) {
+               /* drop existing window - wrong type */
+               drop_window ();
+       }
+       is_custom = want_custom;
+
+       WM::ProxyBase::toggle ();
+}