finalize fix for MIDI track monitoring
[ardour.git] / gtk2_ardour / processor_box.cc
index ce33f61de7dde512ab721ec687da639e8ad67595..dd8a2e957f38a2a4251fea94fee5f77ce94a9b90 100644 (file)
 #include <gtkmm2ext/doi.h>
 
 #include "ardour/amp.h"
-#include "ardour/ardour.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
-#include "ardour/internal_send.h"
 #include "ardour/internal_return.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/meter.h"
+#include "ardour/internal_send.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/port_insert.h"
 #include "ardour/profile.h"
@@ -54,7 +51,7 @@
 #include "ardour/route.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
-#include "ardour/dB.h"
+#include "ardour/types.h"
 
 #include "actions.h"
 #include "ardour_dialog.h"
@@ -92,33 +89,71 @@ RefPtr<Action> ProcessorBox::paste_action;
 RefPtr<Action> ProcessorBox::cut_action;
 RefPtr<Action> ProcessorBox::rename_action;
 RefPtr<Action> ProcessorBox::edit_action;
-RefPtr<Action> ProcessorBox::controls_action;
-Glib::RefPtr<Gdk::Pixbuf> SendProcessorEntry::_slider;
+RefPtr<Action> ProcessorBox::edit_generic_action;
+Glib::RefPtr<Gdk::Pixbuf> ProcessorEntry::_slider_pixbuf;
+Glib::RefPtr<Gdk::Pixbuf> ProcessorEntry::_slider_pixbuf_desensitised;
 
-ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
+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.pack_start (_button, true, true);
        _vbox.show ();
        
-       if (_processor->active()) {
-               _button.set_active_state (CairoWidget::Active);
-       }
        _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());
-       _button.show ();
+       _button.set_text (name (_width));
 
-       _processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context());
-       _processor->PropertyChanged.connect (name_connection, invalidator (*this), ui_bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context());
+       if (_processor) {
 
-       setup_visuals ();
+               _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 (
+                               _slider_pixbuf,
+                               _slider_pixbuf_desensitised,
+                               _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&
@@ -136,7 +171,7 @@ ProcessorEntry::widget ()
 string
 ProcessorEntry::drag_text () const
 {
-       return name ();
+       return name (Wide);
 }
 
 void
@@ -147,25 +182,12 @@ ProcessorEntry::set_position (Position p)
 }
 
 void
-ProcessorEntry::set_visual_state (Gtk::StateType t)
+ProcessorEntry::set_visual_state (Gtkmm2ext::VisualState s, bool yn)
 {
-       /* map from GTK state to CairoWidget */
-
-       switch (t) {
-       case Gtk::STATE_ACTIVE:
-               _button.set_active_state (CairoWidget::Active);
-               _button.unset_visual_state ();
-               break;
-
-       case Gtk::STATE_SELECTED:
-               _button.set_visual_state (CairoWidget::Selected);
-               break;
-
-       case Gtk::STATE_NORMAL:
-       default:
-               _button.unset_visual_state ();
-               _button.unset_active_state ();
-               break;
+       if (yn) {
+               _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() | s));
+       } else {
+               _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() & ~s));
        }
 }
 
@@ -203,20 +225,20 @@ ProcessorEntry::set_enum_width (Width w)
 void
 ProcessorEntry::led_clicked()
 {
-       if (!_processor->active ()) {
-               _processor->activate ();
-       } else {
-               _processor->deactivate ();
+       if (_processor) {
+               if (_button.get_active ()) {
+                       _processor->deactivate ();
+               } else {
+                       _processor->activate ();
+               }
        }
 }
 
 void
 ProcessorEntry::processor_active_changed ()
 {
-       if (_processor->active()) {
-               _button.set_active_state (CairoWidget::Active);
-       } else {
-               _button.unset_active_state ();
+       if (_processor) {
+               _button.set_active (_processor->active());
        }
 }
 
@@ -224,16 +246,27 @@ void
 ProcessorEntry::processor_property_changed (const PropertyChange& what_changed)
 {
        if (what_changed.contains (ARDOUR::Properties::name)) {
-               _button.set_text (name ());
+               _button.set_text (name (_width));
+               setup_tooltip ();
        }
 }
 
+void
+ProcessorEntry::setup_tooltip ()
+{
+       ARDOUR_UI::instance()->set_tip (_button, name (Wide));
+}
+
 string
-ProcessorEntry::name () const
+ProcessorEntry::name (Width w) const
 {
        boost::shared_ptr<Send> send;
        string name_display;
 
+       if (!_processor) {
+               return string();
+       }
+
        if ((send = boost::dynamic_pointer_cast<Send> (_processor)) != 0 &&
            !boost::dynamic_pointer_cast<InternalSend>(_processor)) {
 
@@ -245,7 +278,7 @@ ProcessorEntry::name () const
                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;
@@ -256,7 +289,7 @@ ProcessorEntry::name () const
 
        } else {
 
-               switch (_width) {
+               switch (w) {
                case Wide:
                        name_display += _processor->display_name();
                        break;
@@ -270,124 +303,325 @@ ProcessorEntry::name () const
        return name_display;
 }
 
-SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
-       : ProcessorEntry (s, w)
-       , _send (s)
-       , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
-       , _fader (_slider, &_adjustment, 0, false)
-       , _ignore_gain_change (false)
-       , _data_type (DataType::AUDIO)
+void
+ProcessorEntry::setup_slider_pix ()
+{
+       _slider_pixbuf = ::get_icon ("fader_belt_h_thin");
+       assert (_slider_pixbuf);
+       _slider_pixbuf_desensitised = ::get_icon ("fader_belt_h_thin_desensitised");
+       assert (_slider_pixbuf_desensitised);
+}
+
+void
+ProcessorEntry::set_pixel_width (int p)
+{
+       for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               (*i)->set_pixel_width (p);
+       }
+}
+
+void
+ProcessorEntry::show_all_controls ()
 {
-       _fader.set_name ("SendFader");
-       _fader.set_controllable (_send->amp()->gain_control ());
-       _vbox.pack_start (_fader);
+       for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               (*i)->set_visible (true);
+       }
+
+       _parent->update_gui_object_state (this);
+}
 
-       _fader.show ();
+void
+ProcessorEntry::hide_all_controls ()
+{
+       for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               (*i)->set_visible (false);
+       }
 
-       _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &SendProcessorEntry::gain_adjusted));
+       _parent->update_gui_object_state (this);
+}
 
-       _send->amp()->gain_control()->Changed.connect (
-               _send_connections, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context()
+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))
                );
-       
-       _send->amp()->ConfigurationChanged.connect (
-               _send_connections, invalidator (*this), ui_bind (&SendProcessorEntry::setup_gain_adjustment, this), gui_context ()
+               
+       items.push_back (
+               MenuElem (_("Hide All Controls"), sigc::mem_fun (*this, &ProcessorEntry::hide_all_controls))
                );
 
-       setup_gain_adjustment ();
-       show_gain ();
+       if (!_controls.empty ()) {
+               items.push_back (SeparatorElem ());
+       }
+       
+       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 menu;
+}
+
+void
+ProcessorEntry::toggle_control_visibility (Control* c)
+{
+       c->set_visible (!c->visible ());
+       _parent->update_gui_object_state (this);
+}
+
+ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, Glib::RefPtr<Gdk::Pixbuf> sd, 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 (s, sd, &_adjustment, 0, false)
+       , _slider_persistant_tooltip (&_slider)
+       , _button (ArdourButton::Element (ArdourButton::Text | ArdourButton::Indicator))
+       , _ignore_ui_adjustment (false)
+       , _visible (false)
+       , _name (n)
+{
+       _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_size_request (-1, 16);
+               _slider.set_text (_name);
+
+//             box.pack_start (_label);
+//             _label.show ();
+//             _label.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 ();
+
+       /* We're providing our own PersistentTooltip */
+       set_no_tooltip_whatsoever (_slider);
 }
 
 void
-SendProcessorEntry::setup_gain_adjustment ()
+ProcessorEntry::Control::set_tooltip ()
 {
-       if (_send->amp()->output_streams().n_midi() == 0) {
-               _data_type = DataType::AUDIO;
-               _adjustment.set_lower (0);
-               _adjustment.set_upper (1);
-               _adjustment.set_step_increment (0.01);
-               _adjustment.set_page_increment (0.1);
-               _fader.set_default_value (gain_to_slider_position (1));
+       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 {
-               _data_type = DataType::MIDI;
-               _adjustment.set_lower (0);
-               _adjustment.set_upper (2);
-               _adjustment.set_step_increment (0.05);
-               _adjustment.set_page_increment (0.1);
-               _fader.set_default_value (1);
+               s << setprecision(2) << fixed;
+               s << c->internal_to_user (c->get_value ());
        }
+       
+       ARDOUR_UI::instance()->set_tip (_label, s.str ());
+       _slider_persistant_tooltip.set_tip (s.str ());
+       ARDOUR_UI::instance()->set_tip (_button, s.str ());
 }
 
 void
-SendProcessorEntry::setup_slider_pix ()
+ProcessorEntry::Control::set_pixel_width (int p)
 {
-       _slider = ::get_icon ("fader_belt_h_thin");
-       assert (_slider);
+       _slider.set_fader_length (p);
 }
 
 void
-SendProcessorEntry::show_gain ()
+ProcessorEntry::Control::slider_adjusted ()
 {
-       gain_t value = 0;
+       if (_ignore_ui_adjustment) {
+               return;
+       }
        
-       switch (_data_type) {
-       case DataType::AUDIO:
-               value = gain_to_slider_position_with_max (_send->amp()->gain (), Config->get_max_gain());
-               break;
-       case DataType::MIDI:
-               value = _send->amp()->gain ();
-               break;
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+
+       if (!c) {
+               return;
        }
 
-       if (_adjustment.get_value() != value) {
-               _ignore_gain_change = true;
-               _adjustment.set_value (value);
-               _ignore_gain_change = false;
+       c->set_value (c->interface_to_internal (_adjustment.get_value ()));
+       set_tooltip ();
+}
+
+void
+ProcessorEntry::Control::button_clicked ()
+{
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+
+       if (!c) {
+               return;
+       }
+
+       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 << accurate_coefficient_to_dB (_send->amp()->gain ());
-               if (_data_type == DataType::AUDIO) {
-                       s << _("dB");
-               }
-               
-               _fader.set_tooltip_text (s.str ());
+               s << c->internal_to_user (c->get_value ());
        }
+       
+       _ignore_ui_adjustment = false;
 }
 
 void
-SendProcessorEntry::gain_adjusted ()
+ProcessorEntry::Control::add_state (XMLNode* node) const
 {
-       if (_ignore_gain_change) {
-               return;
-       }
+       XMLNode* c = new XMLNode (X_("Object"));
+       c->add_property (X_("id"), state_id ());
+       c->add_property (X_("visible"), _visible);
+       node->add_child_nocopy (*c);
+}
 
-       gain_t value = 0;
+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);
+       }
+}
 
-       switch (_data_type) {
-       case DataType::AUDIO:
-               value = slider_position_to_gain_with_max (_adjustment.get_value(), Config->get_max_gain());
-               break;
-       case DataType::MIDI:
-               value = _adjustment.get_value ();
+void
+ProcessorEntry::Control::set_visible (bool v)
+{
+       if (v) {
+               box.show ();
+       } else {
+               box.hide ();
        }
        
-       _send->amp()->set_gain (value, this);
+       _visible = v;
 }
 
+/** Called when the Editor might have re-shown things that
+    we want hidden.
+*/
 void
-SendProcessorEntry::set_pixel_width (int p)
+ProcessorEntry::Control::hide_things ()
 {
-       _fader.set_fader_length (p);
+       if (!_visible) {
+               box.hide ();
+       }
 }
 
-PluginInsertProcessorEntry::PluginInsertProcessorEntry (boost::shared_ptr<ARDOUR::PluginInsert> p, Width w)
-       : ProcessorEntry (p, w)
+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), ui_bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context()
+               _splitting_connection, invalidator (*this), boost::bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context()
                );
 
        _splitting_icon.set_size_request (-1, 12);
@@ -411,6 +645,7 @@ PluginInsertProcessorEntry::plugin_insert_splitting_changed ()
 void
 PluginInsertProcessorEntry::hide_things ()
 {
+       ProcessorEntry::hide_things ();
        plugin_insert_splitting_changed ();
 }
 
@@ -465,19 +700,19 @@ PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev)
 }
 
 ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelector*()> get_plugin_selector,
-                           RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer)
+                           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 (-1)
+       , _visible_prefader_processors (0)
        , _rr_selection(rsel)
 {
        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);
@@ -493,28 +728,35 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
        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_key_press_event().connect (sigc::mem_fun(*this, &ProcessorBox::processor_key_press_event));
-       processor_display.signal_key_release_event().connect (sigc::mem_fun(*this, &ProcessorBox::processor_key_release_event));
-
        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.Reordered.connect (sigc::mem_fun (*this, &ProcessorBox::reordered));
        processor_display.DropFromAnotherBox.connect (sigc::mem_fun (*this, &ProcessorBox::object_drop));
-       processor_display.SelectionChanged.connect (sigc::mem_fun (*this, &ProcessorBox::selection_changed));
 
        processor_scroller.show ();
        processor_display.show ();
 
        if (parent) {
                parent->DeliveryChanged.connect (
-                       _mixer_strip_connections, invalidator (*this), ui_bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context ()
+                       _mixer_strip_connections, invalidator (*this), boost::bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context ()
                        );
        }
+
+       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
@@ -531,7 +773,7 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
        _route = r;
 
        _route->processors_changed.connect (
-               _route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_processors_changed, this, _1), gui_context()
+               _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_processors_changed, this, _1), gui_context()
                );
 
        _route->DropReferences.connect (
@@ -539,7 +781,7 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
                );
 
        _route->PropertyChanged.connect (
-               _route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_property_changed, this, _1), gui_context()
+               _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_property_changed, this, _1), gui_context()
                );
 
        redisplay_processors ();
@@ -559,12 +801,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) {
@@ -582,18 +841,11 @@ 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)
 {
@@ -611,25 +863,13 @@ ProcessorBox::set_width (Width w)
        redisplay_processors ();
 }
 
-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"), sigc::mem_fun(*this, &ProcessorBox::new_send)));
-       items.push_back (MenuElem (_("Show send controls"), sigc::mem_fun(*this, &ProcessorBox::show_send_controls)));
-}
-
 Gtk::Menu*
 ProcessorBox::build_possible_aux_menu ()
 {
        boost::shared_ptr<RouteList> rl = _session->get_routes_with_internal_returns();
 
        if (rl->empty()) {
+               /* No aux sends if there are no busses */
                return 0;
        }
 
@@ -646,16 +886,6 @@ ProcessorBox::build_possible_aux_menu ()
        return menu;
 }
 
-void
-ProcessorBox::show_send_controls ()
-{
-}
-
-void
-ProcessorBox::new_send ()
-{
-}
-
 void
 ProcessorBox::show_processor_menu (int arg)
 {
@@ -664,12 +894,16 @@ ProcessorBox::show_processor_menu (int arg)
                processor_menu->signal_unmap().connect (sigc::mem_fun (*this, &ProcessorBox::processor_menu_unmapped));
        }
 
+       /* 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());
        }
 
+       /* And the aux submenu */
+
        Gtk::MenuItem* aux_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newaux"));
 
        if (aux_menu_item) {
@@ -684,9 +918,48 @@ ProcessorBox::show_processor_menu (int 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 ());
+
+       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_generic_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);
 
        /* Add a placeholder gap to the processor list to indicate where a processor would be
@@ -695,42 +968,28 @@ ProcessorBox::show_processor_menu (int arg)
        int x, y;
        processor_display.get_pointer (x, y);
        _placement = processor_display.add_placeholder (y);
+
+       if (_visible_prefader_processors == 0 && _placement > 0) {
+               --_placement;
+       }
 }
 
 bool
 ProcessorBox::enter_notify (GdkEventCrossing*)
 {
        _current_processor_box = this;
-       Keyboard::magic_widget_grab_focus ();
-       processor_display.grab_focus ();
-
-       return false;
-}
-
-bool
-ProcessorBox::leave_notify (GdkEventCrossing* ev)
-{
-       switch (ev->detail) {
-       case GDK_NOTIFY_INFERIOR:
-               break;
-       default:
-               Keyboard::magic_widget_drop_focus ();
-       }
-
        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);
@@ -742,58 +1001,37 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
 
                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 (ev->keyval) {
-       case GDK_a:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       processor_display.select_all ();
-                       ret = true;
-               }
+       switch (op) {
+       case ProcessorsSelectAll:
+               processor_display.select_all ();
                break;
 
-       case GDK_c:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       copy_processors (targets);
-                       ret = true;
-               }
+       case ProcessorsCopy:
+               copy_processors (targets);
                break;
 
-       case GDK_x:
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                       cut_processors (targets);
-                       ret = true;
-               }
+       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());
-                       }
-                       ret = true;
+       case ProcessorsPaste:
+               if (targets.empty()) {
+                       paste_processors ();
+               } else {
+                       paste_processors (targets.front());
                }
                break;
 
-       case GDK_Up:
-               break;
-
-       case GDK_Down:
-               break;
-
-       case GDK_Delete:
-       case GDK_BackSpace:
+       case ProcessorsDelete:
                delete_processors (targets);
-               ret = true;
                break;
 
-       case GDK_Return:
+       case ProcessorsToggleActive:
                for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) {
                        if ((*i)->active()) {
                                (*i)->deactivate ();
@@ -801,19 +1039,15 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
                                (*i)->activate ();
                        }
                }
-               ret = true;
                break;
 
-       case GDK_slash:
+       case ProcessorsAB:
                ab_plugins ();
-               ret = true;
                break;
 
        default:
                break;
        }
-
-       return ret;
 }
 
 bool
@@ -831,7 +1065,11 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry*
 
                if (_session->engine().connected()) {
                        /* XXX giving an error message here is hard, because we may be in the midst of a button press */
-                       toggle_edit_processor (processor);
+                       if (Config->get_use_plugin_own_gui ()) {
+                               toggle_edit_processor (processor);
+                       } else {
+                               toggle_edit_generic_processor (processor);
+                       }
                }
                ret = true;
 
@@ -893,29 +1131,6 @@ ProcessorBox::build_processor_menu ()
        return processor_menu;
 }
 
-void
-ProcessorBox::selection_changed ()
-{
-       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());
-
-       const bool single_selection = (processor_display.selection().size() == 1);
-
-       boost::shared_ptr<PluginInsert> pi;
-       if (single_selection) {
-               pi = boost::dynamic_pointer_cast<PluginInsert>(
-                       processor_display.selection().front()->processor());
-       }
-
-       /* enable gui for plugin inserts with editors */
-       controls_action->set_sensitive(pi && pi->plugin()->has_editor());
-
-       /* disallow rename for multiple selections and for plugin inserts */
-       rename_action->set_sensitive(single_selection && pi);
-}
-
 void
 ProcessorBox::select_all_processors ()
 {
@@ -1025,7 +1240,7 @@ ProcessorBox::choose_send ()
 
        /* XXX need processor lock on route */
        try {
-               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
+               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;
@@ -1122,10 +1337,7 @@ ProcessorBox::choose_aux (boost::weak_ptr<Route> wr)
                return;
        }
 
-       boost::shared_ptr<RouteList> rlist (new RouteList);
-       rlist->push_back (_route);
-
-       _session->add_internal_sends (target, PreFader, rlist);
+       _session->add_internal_send (target, _placement, _route);
 }
 
 void
@@ -1142,7 +1354,8 @@ ProcessorBox::route_processors_changed (RouteProcessorChange c)
 void
 ProcessorBox::redisplay_processors ()
 {
-       ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors)
+       ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors);
+       bool     fader_seen;
 
        if (no_processor_redisplay) {
                return;
@@ -1150,6 +1363,18 @@ ProcessorBox::redisplay_processors ()
 
        processor_display.clear ();
 
+       _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));
+
+       if (_visible_prefader_processors == 0) { // fader only
+               BlankProcessorEntry* bpe = new BlankProcessorEntry (this, _width);
+               bpe->set_pixel_width (get_allocation().get_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_proxies.begin(); i != _processor_window_proxies.end(); ++i) {
@@ -1237,6 +1462,23 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
        ARDOUR_UI::instance()->add_window_proxy (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::add_processor_to_display (boost::weak_ptr<Processor> p)
 {
@@ -1246,34 +1488,28 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
                return;
        }
 
-       boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
        boost::shared_ptr<PluginInsert> plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor);
        ProcessorEntry* e = 0;
-       if (send) {
-               e = new SendProcessorEntry (send, _width);
-       } else if (plugin_insert) {
-               e = new PluginInsertProcessorEntry (plugin_insert, _width);
+       if (plugin_insert) {
+               e = new PluginInsertProcessorEntry (this, plugin_insert, _width);
        } else {
-               e = new ProcessorEntry (processor, _width);
+               e = new ProcessorEntry (this, processor, _width);
        }
 
        e->set_pixel_width (get_allocation().get_width());
-       processor_display.add_child (e);
-}
-
-
-void
-ProcessorBox::build_processor_tooltip (EventBox& box, string start)
-{
-       string tip(start);
 
-       list<ProcessorEntry*> children = processor_display.children ();
-       for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
-               tip += '\n';
-               tip += (*i)->processor()->name();
+       /* Set up this entry's state from the GUIObjectState */
+       XMLNode* proc = entry_gui_object_state (e);
+       if (proc) {
+               e->set_control_state (proc);
+       }
+       
+       if (boost::dynamic_pointer_cast<Send> (processor)) {
+               /* Always show send controls */
+               e->show_all_controls ();
        }
 
-       ARDOUR_UI::instance()->set_tip (box, tip);
+       processor_display.add_child (e);
 }
 
 void
@@ -1309,8 +1545,10 @@ 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)) {
@@ -1389,14 +1627,6 @@ ProcessorBox::can_cut () const
         return false;
 }
 
-void
-ProcessorBox::cut_processors ()
-{
-       ProcSelection to_be_removed;
-
-       get_selected_processors (to_be_removed);
-}
-
 void
 ProcessorBox::cut_processors (const ProcSelection& to_be_removed)
 {
@@ -1438,14 +1668,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)
 {
@@ -1467,14 +1689,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)
 {
@@ -1632,8 +1846,10 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                        } else if (type->value() == "send") {
 
                                XMLNode n (**niter);
-                               Send::make_unique (n, *_session);
                                 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;
@@ -1641,13 +1857,13 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
 
                                p.reset (s);
 
-
                        } else if (type->value() == "return") {
 
                                XMLNode n (**niter);
-                               Return::make_unique (n, *_session);
                                 Return* r = new Return (*_session);
 
+                               IOProcessor::prepare_for_reset (n, r->name());
+
                                 if (r->set_state (n, Stateful::loading_state_version)) {
                                         delete r;
                                         return;
@@ -1658,10 +1874,15 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                        } else if (type->value() == "port") {
 
                                XMLNode n (**niter);
-                               p.reset (new PortInsert (*_session, _route->pannable (), _route->mute_master ()));
-                               if (p->set_state (n, Stateful::loading_state_version)) {
+                               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
@@ -1676,7 +1897,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                }
 
                catch (...) {
-                       cerr << "plugin insert constructor failed\n";
+                       error << _("plugin insert constructor failed") << endmsg;
                }
        }
 
@@ -1695,18 +1916,6 @@ 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) const
 {
@@ -1726,10 +1935,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 (PreFader, state);
-       _route->all_processors_active (PostFader, state);
+       _route->all_visible_processors_active (state);
 }
 
 void
@@ -1793,7 +2001,7 @@ ProcessorBox::processor_can_be_edited (boost::shared_ptr<Processor> processor)
        }
 
        if (
-               boost::dynamic_pointer_cast<Send> (processor) ||
+               (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)
@@ -1839,28 +2047,25 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
                        _parent_strip->revert_to_default_display ();
                }
 
-       } else if ((internal_send = boost::dynamic_pointer_cast<InternalSend> (processor)) != 0) {
-
-               if (!_session->engine().connected()) {
-                       return;
-               }
-
-               if (_parent_strip) {
-                       if (boost::dynamic_pointer_cast<Send> (_parent_strip->current_delivery()) == internal_send) {
-                               _parent_strip->revert_to_default_display ();
-                       } else {
-                               _parent_strip->show_send (internal_send);
-                       }
-               }
-
        } else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
 
                if (!_session->engine().connected()) {
                        return;
                }
 
-               SendUIWindow* w = new SendUIWindow (send, _session);
-               w->show ();
+               if (boost::dynamic_pointer_cast<InternalSend> (processor) == 0) {
+                       SendUIWindow* w = new SendUIWindow (send, _session);
+                       w->show ();
+               } 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);
+                               }
+                       } 
+               }
 
        } else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {
 
@@ -1947,8 +2152,9 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
        }
 }
 
+/** Toggle a generic (Ardour-generated) plugin UI */
 void
-ProcessorBox::toggle_processor_controls (boost::shared_ptr<Processor> processor)
+ProcessorBox::toggle_edit_generic_processor (boost::shared_ptr<Processor> processor)
 {
        boost::shared_ptr<PluginInsert> plugin_insert
                = boost::dynamic_pointer_cast<PluginInsert>(processor);
@@ -1982,12 +2188,14 @@ 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_("controls"), _("Controls"));
+
        ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear (all)"),
                        sigc::ptr_fun (ProcessorBox::rb_clear));
        ActionManager::register_action (popup_act_grp, X_("clear_pre"), _("Clear (pre-fader)"),
@@ -2018,9 +2226,9 @@ ProcessorBox::register_actions ()
 
        /* activation etc. */
 
-       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));
@@ -2030,14 +2238,23 @@ ProcessorBox::register_actions ()
                popup_act_grp, X_("edit"), _("Edit..."),
                sigc::ptr_fun (ProcessorBox::rb_edit));
 
-       /* show plugin GUI */
-       controls_action = ActionManager::register_action (
-                       popup_act_grp, X_("controls"), _("Controls..."),
-                       sigc::ptr_fun (ProcessorBox::rb_controls));
+       edit_generic_action = ActionManager::register_action (
+               popup_act_grp, X_("edit-generic"), _("Edit with basic controls..."),
+               sigc::ptr_fun (ProcessorBox::rb_edit_generic));
 
        ActionManager::add_action_group (popup_act_grp);
 }
 
+void
+ProcessorBox::rb_edit_generic ()
+{
+       if (_current_processor_box == 0) {
+               return;
+       }
+
+       _current_processor_box->for_selected_processors (&ProcessorBox::toggle_edit_generic_processor);
+}
+
 void
 ProcessorBox::rb_ab_plugins ()
 {
@@ -2124,7 +2341,7 @@ ProcessorBox::rb_cut ()
                return;
        }
 
-       _current_processor_box->cut_processors ();
+       _current_processor_box->processor_operation (ProcessorsCut);
 }
 
 void
@@ -2134,7 +2351,7 @@ ProcessorBox::rb_delete ()
                return;
        }
 
-       _current_processor_box->delete_processors ();
+       _current_processor_box->processor_operation (ProcessorsDelete);
 }
 
 void
@@ -2143,7 +2360,7 @@ ProcessorBox::rb_copy ()
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->copy_processors ();
+       _current_processor_box->processor_operation (ProcessorsCopy);
 }
 
 void
@@ -2153,7 +2370,7 @@ ProcessorBox::rb_paste ()
                return;
        }
 
-       _current_processor_box->paste_processors ();
+       _current_processor_box->processor_operation (ProcessorsPaste);
 }
 
 void
@@ -2172,7 +2389,7 @@ ProcessorBox::rb_select_all ()
                return;
        }
 
-       _current_processor_box->select_all_processors ();
+       _current_processor_box->processor_operation (ProcessorsSelectAll);
 }
 
 void
@@ -2192,7 +2409,7 @@ ProcessorBox::rb_activate_all ()
                return;
        }
 
-       _current_processor_box->all_processors_active (true);
+       _current_processor_box->all_visible_processors_active (true);
 }
 
 void
@@ -2201,7 +2418,7 @@ ProcessorBox::rb_deactivate_all ()
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->all_processors_active (false);
+       _current_processor_box->all_visible_processors_active (false);
 }
 
 void
@@ -2214,16 +2431,6 @@ ProcessorBox::rb_edit ()
        _current_processor_box->for_selected_processors (&ProcessorBox::toggle_edit_processor);
 }
 
-void
-ProcessorBox::rb_controls ()
-{
-       if (_current_processor_box == 0) {
-               return;
-       }
-
-       _current_processor_box->for_selected_processors (&ProcessorBox::toggle_processor_controls);
-}
-
 void
 ProcessorBox::route_property_changed (const PropertyChange& what_changed)
 {
@@ -2243,6 +2450,10 @@ ProcessorBox::route_property_changed (const PropertyChange& what_changed)
 
                processor = (*iter)->processor ();
 
+               if (!processor) {
+                       continue;
+               }
+
                Window* w = get_processor_ui (processor);
 
                if (!w) {
@@ -2304,10 +2515,6 @@ ProcessorBox::get_processor_ui (boost::shared_ptr<Processor> p) const
                ++i;
        }
 
-       /* we shouldn't get here, because the ProcessorUIList should always contain
-          an entry for each processor.
-       */
-       assert (false);
        return 0;
 }
 
@@ -2359,6 +2566,7 @@ ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr<Delivery> w)
        }
 }
 
+/** Called to repair the damage of Editor::show_window doing a show_all() */
 void
 ProcessorBox::hide_things ()
 {
@@ -2374,6 +2582,33 @@ 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,
        XMLNode const * node,