remove additional "mid" color from ArdourButton; replace Active/Mid widget state...
[ardour.git] / gtk2_ardour / processor_box.cc
index ff1c05e18a2417272185b96b06629f557d6e85ba..5c0b3c74fa6549571b63a5dacd943cbcfb2fc2e4 100644 (file)
@@ -76,7 +76,7 @@
 
 #include "i18n.h"
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 class AUPluginUI;
 #endif
 
@@ -92,78 +92,99 @@ RefPtr<Action> ProcessorBox::paste_action;
 RefPtr<Action> ProcessorBox::cut_action;
 RefPtr<Action> ProcessorBox::rename_action;
 RefPtr<Action> ProcessorBox::edit_action;
-Glib::RefPtr<Gdk::Pixbuf> SendProcessorEntry::_slider;
+RefPtr<Action> ProcessorBox::edit_generic_action;
+Glib::RefPtr<Gdk::Pixbuf> ProcessorEntry::_slider_pixbuf;
 
-ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
-       : _position (PreFader)
+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)
 {
-       _hbox.pack_start (_active, false, false);
-       _event_box.add (_name);
-       _hbox.pack_start (_event_box, true, true);
-       _vbox.pack_start (_hbox);
-       _frame.add (_vbox);
+       _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));
 
-       /* without this, the border is mis-drawn on some systems */
-       _vbox.set_border_width (1);
+       if (_processor) {
 
-       _name.set_alignment (0, 0.5);
-       _name.set_text (name ());
-       _name.set_padding (2, 2);
+               _vbox.pack_start (_button, true, true);
 
-       if (boost::dynamic_pointer_cast<Amp> (p)) {
-               /* Fader processor gets a special look */
-               _event_box.set_name ("ProcessorFader");
-               _frame.set_name ("ProcessorFaderFrame");
-               _name.set_padding (2, 4);
-       }
+               _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), ui_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, _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);
+                       }
 
-       _active.set_active (_processor->active ());
-       _active.signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::active_toggled));
+                       if (boost::dynamic_pointer_cast<Send> (_processor)) {
+                               /* Don't label send faders */
+                               c->hide_label ();
+                       }
+               }
 
-       _frame.show ();
-       _vbox.show ();
-       _hbox.show ();
-       _event_box.show ();
-       _name.show ();
-       _active.show ();
-       
-       _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());
+               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&
 ProcessorEntry::widget ()
 {
-       return _frame;
+       return _vbox;
 }
 
 string
 ProcessorEntry::drag_text () const
 {
-       return name ();
+       return name (Wide);
 }
 
 void
-ProcessorEntry::set_visual_state (Gtk::StateType t)
+ProcessorEntry::set_position (Position p)
 {
-       _visual_state = t;
+       _position = p;
        setup_visuals ();
 }
 
 void
-ProcessorEntry::set_position (Position p)
+ProcessorEntry::set_visual_state (Gtkmm2ext::VisualState s, bool yn)
 {
-       _position = p;
-       setup_visuals ();
+       if (yn) {
+               _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() | s));
+       } else {
+               _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() & ~s));
+       }
 }
 
 void
@@ -171,46 +192,19 @@ ProcessorEntry::setup_visuals ()
 {
        switch (_position) {
        case PreFader:
-               _event_box.set_name ("ProcessorPreFader");
-               if (_visual_state == Gtk::STATE_NORMAL) {
-                       _frame.set_name ("ProcessorPreFaderFrame");
-               }
+               _button.set_name ("processor prefader");
                break;
 
        case Fader:
-               _event_box.set_name ("ProcessorFader");
-               if (_visual_state == Gtk::STATE_NORMAL) {
-                       _frame.set_name ("ProcessorFaderFrame");
-               }
+               _button.set_name ("processor fader");
                break;
 
        case PostFader:
-               _event_box.set_name ("ProcessorPostFader");
-               if (_visual_state == Gtk::STATE_NORMAL) {
-                       _frame.set_name ("ProcessorPostFaderFrame");
-               }
-               break;
-       }
-
-       switch (_visual_state) {
-       case Gtk::STATE_NORMAL:
-               /* _frame has been set up above */
-               _event_box.set_state (Gtk::STATE_NORMAL);
-               break;
-       case Gtk::STATE_SELECTED:
-               _frame.set_name ("ProcessorFrameSelected");
-               /* don't change the background of the box when it is selected */
-               _event_box.set_state (Gtk::STATE_NORMAL);
-               break;
-       case Gtk::STATE_ACTIVE:
-               _frame.set_name ("ProcessorFrameActiveSend");
-               _event_box.set_state (Gtk::STATE_ACTIVE);
-               break;
-       default:
+               _button.set_name ("processor postfader");
                break;
        }
 }
-       
+
 
 boost::shared_ptr<Processor>
 ProcessorEntry::processor () const
@@ -225,15 +219,13 @@ ProcessorEntry::set_enum_width (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 ();
                }
        }
 }
@@ -241,8 +233,8 @@ 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());
        }
 }
 
@@ -250,28 +242,39 @@ void
 ProcessorEntry::processor_property_changed (const PropertyChange& what_changed)
 {
        if (what_changed.contains (ARDOUR::Properties::name)) {
-               _name.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)) {
-               
+
                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;
@@ -279,10 +282,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;
@@ -290,76 +293,292 @@ ProcessorEntry::name () const
                        name_display += PBD::short_version (_processor->display_name(), 5);
                        break;
                }
+
+       }
+
+       return name_display;
+}
+
+void
+ProcessorEntry::setup_slider_pix ()
+{
+       _slider_pixbuf = ::get_icon ("fader_belt_h_thin");
+       assert (_slider_pixbuf);
+}
+
+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 ()
+{
+       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 ());
        }
        
-       return 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 menu;
 }
 
-SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
-       : ProcessorEntry (s, w),
-         _send (s),
-         /* set the adjustment to a gain of 0dB so that the fader's default value is right */
-         _adjustment (0.781787, 0, 1, 0.01, 0.1),
-         _fader (_slider, &_adjustment, 0, false),
-         _ignore_gain_change (false)
+void
+ProcessorEntry::toggle_control_visibility (Control* c)
 {
-       _fader.set_name ("SendFader");
-       _fader.set_controllable (_send->amp()->gain_control ());
-       _vbox.pack_start (_fader);
+       c->set_visible (!c->visible ());
+       _parent->update_gui_object_state (this);
+}
 
-       _fader.show ();
+ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, 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, &_adjustment, 0, false)
+       , _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 ();
 
-       _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &SendProcessorEntry::gain_adjusted));
-       _send->amp()->gain_control()->Changed.connect (send_gain_connection, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context());
-       show_gain ();
+               _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 {
+               
+               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 ());
+       }
+
+       control_changed ();
 }
 
 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 ()
 {
-       ENSURE_GUI_THREAD (*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 ()));
+}
+
+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 ()) << _("dB");
-               _fader.set_tooltip_text (s.str ());
+               s << c->internal_to_user (c->get_value ());
+               
+               _slider.set_tooltip_text (s.str ());
        }
+       
+       _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);
+}
+
+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);
        }
+}
 
-       _send->amp()->set_gain (slider_position_to_gain (_adjustment.get_value()), this);
+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
-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 (
@@ -387,6 +606,7 @@ PluginInsertProcessorEntry::plugin_insert_splitting_changed ()
 void
 PluginInsertProcessorEntry::hide_things ()
 {
+       ProcessorEntry::hide_things ();
        plugin_insert_splitting_changed ();
 }
 
@@ -422,7 +642,7 @@ PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev)
 
        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);
 
@@ -441,19 +661,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(PreFader)
+       , _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);
@@ -469,15 +689,11 @@ 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 ();
@@ -487,10 +703,21 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
                        _mixer_strip_connections, invalidator (*this), ui_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
@@ -499,7 +726,7 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
        if (_route == r) {
                return;
        }
-       
+
        _route_connections.drop_connections();
 
        /* new route: any existing block on processor redisplay must be meaningless */
@@ -509,11 +736,11 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
        _route->processors_changed.connect (
                _route_connections, invalidator (*this), ui_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), ui_bind (&ProcessorBox::route_property_changed, this, _1), gui_context()
                );
@@ -526,6 +753,7 @@ ProcessorBox::route_going_away ()
 {
        /* don't keep updating display as processors are deleted */
        no_processor_redisplay = true;
+       _route.reset ();
 }
 
 void
@@ -534,12 +762,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) {
@@ -557,7 +802,6 @@ 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);
                }
        }
@@ -575,7 +819,7 @@ ProcessorBox::set_width (Width w)
        if (_width == w) {
                return;
        }
-       
+
        _width = w;
 
        list<ProcessorEntry*> children = processor_display.children ();
@@ -586,19 +830,6 @@ 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 ()
 {
@@ -622,28 +853,23 @@ 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));
        }
 
+       /* 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) {
@@ -658,46 +884,78 @@ 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 ());
+
+       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
+          inserted were one chosen from the menu.
+       */
+       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 *)
-{
-       /* 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);
@@ -709,58 +967,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 ();
@@ -768,19 +1005,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
@@ -790,7 +1023,7 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry*
        if (child) {
                processor = child->processor ();
        }
-       
+
        int ret = false;
        bool selected = processor_display.selected (child);
 
@@ -798,7 +1031,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;
 
@@ -823,34 +1060,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 (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
@@ -865,8 +1084,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
                } else {
                        processor->activate ();
                }
-               ret = true;
-
        }
 
        return false;
@@ -880,19 +1097,6 @@ ProcessorBox::build_processor_menu ()
        return processor_menu;
 }
 
-void
-ProcessorBox::selection_changed ()
-{
-       bool const sensitive = (processor_display.selection().empty()) ? false : true;
-       ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive);
-       edit_action->set_sensitive (one_processor_can_be_edited ());
-
-       /* disallow rename for multiple selections and for plugin inserts */
-       rename_action->set_sensitive (
-               processor_display.selection().size() == 1 && boost::dynamic_pointer_cast<PluginInsert> (processor_display.selection().front()->processor()) == 0
-               );
-}
-
 void
 ProcessorBox::select_all_processors ()
 {
@@ -921,7 +1125,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
 
                Route::ProcessorStreams err_streams;
 
-               if (_route->add_processor (processor, _placement, &err_streams, Config->get_new_plugins_active ())) {
+               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?
@@ -942,7 +1146,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
        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;
@@ -986,7 +1190,7 @@ void
 ProcessorBox::choose_insert ()
 {
        boost::shared_ptr<Processor> processor (new PortInsert (*_session, _route->pannable(), _route->mute_master()));
-       _route->add_processor (processor, _placement);
+       _route->add_processor_by_index (processor, _placement);
 }
 
 /* Caller must not hold process lock */
@@ -1048,7 +1252,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 ();
                }
@@ -1076,7 +1280,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 ();
                }
@@ -1099,10 +1303,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
@@ -1119,7 +1320,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;
@@ -1127,12 +1329,24 @@ 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) {
                (*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 */
@@ -1169,7 +1383,7 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
        while (i != _processor_window_proxies.end()) {
 
                boost::shared_ptr<Processor> t = (*i)->processor().lock ();
-               
+
                if (p == t) {
                        /* this processor is already on the list; done */
                        (*i)->marked = true;
@@ -1191,19 +1405,19 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
        } else {
                loc = X_("P");
        }
-       
+
        ProcessorWindowProxy* wp = new ProcessorWindowProxy (
                string_compose ("%1-%2-%3", loc, _route->id(), p->id()),
                _session->extra_xml (X_("UI")),
                this,
                w);
-       
+
        wp->marked = true;
 
-        /* if the processor already has an existing UI, 
+        /* 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) {
@@ -1214,6 +1428,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)
 {
@@ -1223,34 +1454,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);
+       e->set_pixel_width (get_allocation().get_width());
 
-       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);
        }
        
-       ARDOUR_UI::instance()->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
@@ -1265,7 +1490,7 @@ 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;
@@ -1286,8 +1511,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)) {
@@ -1304,14 +1531,14 @@ void
 ProcessorBox::report_failed_reorder ()
 {
        /* reorder failed, so redisplay */
-       
+
        redisplay_processors ();
-       
+
        /* now tell them about the problem */
-       
+
        ArdourDialog dialog (_("Plugin Incompatibility"));
        Label label;
-       
+
        label.set_text (_("\
 You cannot reorder these plugins/sends/inserts\n\
 in that way because the inputs and\n\
@@ -1320,12 +1547,12 @@ outputs will not work correctly."));
        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.run ();
 }
 
@@ -1351,27 +1578,19 @@ ProcessorBox::can_cut () const
         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;
                 }
         }
-        
-        return false;
-}
-
-void
-ProcessorBox::cut_processors ()
-{
-       ProcSelection to_be_removed;
 
-       get_selected_processors (to_be_removed);
+        return false;
 }
 
 void
@@ -1415,14 +1634,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)
 {
@@ -1445,12 +1656,17 @@ ProcessorBox::copy_processors (const ProcSelection& to_be_copied)
 }
 
 void
-ProcessorBox::delete_processors ()
+ProcessorBox::processors_up ()
+{
+       /* unimplemented */
+}
+
+void
+ProcessorBox::processors_down ()
 {
-       ProcSelection to_be_deleted;
-       get_selected_processors (to_be_deleted);
-       delete_processors (to_be_deleted);
+       /* unimplemented */
 }
+       
 
 void
 ProcessorBox::delete_processors (const ProcSelection& targets)
@@ -1617,7 +1833,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                                 }
 
                                p.reset (s);
-                                        
+
 
                        } else if (type->value() == "return") {
 
@@ -1703,9 +1919,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
@@ -1769,7 +1985,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)
@@ -1811,20 +2027,8 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
 
        if (boost::dynamic_pointer_cast<Amp> (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);
-                       }
+                       _parent_strip->revert_to_default_display ();
                }
 
        } else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
@@ -1833,15 +2037,26 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
                        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) {
 
-                if (boost::dynamic_pointer_cast<InternalReturn> (retrn)) {
-                        /* no GUI for these */
-                        return;
-                }
+               if (boost::dynamic_pointer_cast<InternalReturn> (retrn)) {
+                       /* no GUI for these */
+                       return;
+               }
 
                if (!_session->engine().connected()) {
                        return;
@@ -1921,6 +2136,29 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
        }
 }
 
+/** Toggle a generic (Ardour-generated) plugin UI */
+void
+ProcessorBox::toggle_edit_generic_processor (boost::shared_ptr<Processor> processor)
+{
+       boost::shared_ptr<PluginInsert> plugin_insert
+               = boost::dynamic_pointer_cast<PluginInsert>(processor);
+       if (!plugin_insert) {
+               return;
+       }
+
+       Container*      toplevel  = get_toplevel();
+       Window*         win       = dynamic_cast<Gtk::Window*>(toplevel);
+       PluginUIWindow* plugin_ui = new PluginUIWindow(win, plugin_insert, true, false);
+       plugin_ui->set_title(generate_processor_title (plugin_insert));
+
+       if (plugin_ui->is_visible()) {
+               plugin_ui->hide();
+       } else {
+               plugin_ui->show_all();
+               plugin_ui->present();
+       }
+}
+
 void
 ProcessorBox::register_actions ()
 {
@@ -1934,12 +2172,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)"),
@@ -1970,20 +2210,35 @@ ProcessorBox::register_actions ()
 
        /* activation etc. */
 
-       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"),
-                                       sigc::ptr_fun (ProcessorBox::rb_deactivate_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"),
+                       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));
+                       sigc::ptr_fun (ProcessorBox::rb_ab_plugins));
 
        /* show editors */
-       edit_action = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit..."),
-                                                     sigc::ptr_fun (ProcessorBox::rb_edit));
+       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 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 ()
 {
@@ -2070,7 +2325,7 @@ ProcessorBox::rb_cut ()
                return;
        }
 
-       _current_processor_box->cut_processors ();
+       _current_processor_box->processor_operation (ProcessorsCut);
 }
 
 void
@@ -2080,7 +2335,7 @@ ProcessorBox::rb_delete ()
                return;
        }
 
-       _current_processor_box->delete_processors ();
+       _current_processor_box->processor_operation (ProcessorsDelete);
 }
 
 void
@@ -2089,7 +2344,7 @@ ProcessorBox::rb_copy ()
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->copy_processors ();
+       _current_processor_box->processor_operation (ProcessorsCopy);
 }
 
 void
@@ -2099,7 +2354,7 @@ ProcessorBox::rb_paste ()
                return;
        }
 
-       _current_processor_box->paste_processors ();
+       _current_processor_box->processor_operation (ProcessorsPaste);
 }
 
 void
@@ -2118,7 +2373,7 @@ ProcessorBox::rb_select_all ()
                return;
        }
 
-       _current_processor_box->select_all_processors ();
+       _current_processor_box->processor_operation (ProcessorsSelectAll);
 }
 
 void
@@ -2138,7 +2393,7 @@ ProcessorBox::rb_activate_all ()
                return;
        }
 
-       _current_processor_box->all_processors_active (true);
+       _current_processor_box->all_visible_processors_active (true);
 }
 
 void
@@ -2147,7 +2402,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
@@ -2179,6 +2434,10 @@ ProcessorBox::route_property_changed (const PropertyChange& what_changed)
 
                processor = (*iter)->processor ();
 
+               if (!processor) {
+                       continue;
+               }
+
                Window* w = get_processor_ui (processor);
 
                if (!w) {
@@ -2240,10 +2499,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;
 }
 
@@ -2255,9 +2510,9 @@ void
 ProcessorBox::set_processor_ui (boost::shared_ptr<Processor> p, Gtk::Window* w)
 {
        list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin ();
-        
-        p->set_ui (w);
-        
+
+       p->set_ui (w);
+
        while (i != _processor_window_proxies.end()) {
                boost::shared_ptr<Processor> t = (*i)->processor().lock ();
                if (t && t == p) {
@@ -2295,6 +2550,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 ()
 {
@@ -2304,6 +2560,39 @@ ProcessorBox::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,
        XMLNode const * node,