add_option() after addings its choices so that it gets
[ardour.git] / gtk2_ardour / processor_box.cc
index 42711b49362a6f0af6302670a65b881b40082298..883ce4b196ff939128af2ac08c8056407887fdf5 100644 (file)
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/doi.h>
 
 #include "ardour/amp.h"
 #include "ardour/ardour.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/internal_send.h"
+#include "ardour/internal_return.h"
 #include "ardour/ladspa_plugin.h"
 #include "ardour/meter.h"
 #include "ardour/plugin_insert.h"
@@ -55,6 +54,7 @@
 #include "ardour/route.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
+#include "ardour/dB.h"
 
 #include "actions.h"
 #include "ardour_dialog.h"
@@ -66,6 +66,7 @@
 #include "mixer_strip.h"
 #include "plugin_selector.h"
 #include "plugin_ui.h"
+#include "port_insert_ui.h"
 #include "processor_box.h"
 #include "public_editor.h"
 #include "return_ui.h"
@@ -75,7 +76,7 @@
 
 #include "i18n.h"
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 class AUPluginUI;
 #endif
 
@@ -90,32 +91,40 @@ ProcessorBox* ProcessorBox::_current_processor_box = 0;
 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;
 
 ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
-       : _processor (p)
+       : _button (ArdourButton::led_default_elements)
+       , _position (PreFader)
+       , _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);
-
-       _name.set_alignment (0, 0.5);
-       _name.set_text (name ());
-       _name.set_padding (2, 2);
-       
-       _active.set_active (_processor->active ());
-       _active.signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::active_toggled));
+       _vbox.pack_start (_button, true, true);
+       _vbox.show ();
        
+       if (_processor->active()) {
+               _button.set_active_state (Gtkmm2ext::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 ();
+
        _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_visuals ();
 }
 
 EventBox&
 ProcessorEntry::action_widget ()
 {
-       return _event_box;
+       return _button;
 }
 
 Gtk::Widget&
@@ -130,6 +139,42 @@ ProcessorEntry::drag_text () const
        return name ();
 }
 
+void
+ProcessorEntry::set_position (Position p)
+{
+       _position = p;
+       setup_visuals ();
+}
+
+void
+ProcessorEntry::set_visual_state (Gtkmm2ext::VisualState s, bool yn)
+{
+       if (yn) {
+               _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() | s));
+       } else {
+               _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() & ~s));
+       }
+}
+
+void
+ProcessorEntry::setup_visuals ()
+{
+       switch (_position) {
+       case PreFader:
+               _button.set_name ("processor prefader");
+               break;
+
+       case Fader:
+               _button.set_name ("processor fader");
+               break;
+
+       case PostFader:
+               _button.set_name ("processor postfader");
+               break;
+       }
+}
+
+
 boost::shared_ptr<Processor>
 ProcessorEntry::processor () const
 {
@@ -143,24 +188,22 @@ ProcessorEntry::set_enum_width (Width w)
 }
 
 void
-ProcessorEntry::active_toggled ()
+ProcessorEntry::led_clicked()
 {
-       if (_active.get_active ()) {
-               if (!_processor->active ()) {
-                       _processor->activate ();
-               }
+       if (_button.active_state() == Gtkmm2ext::Active) {
+               _processor->deactivate ();
        } else {
-               if (_processor->active ()) {
-                       _processor->deactivate ();
-               }
+               _processor->activate ();
        }
 }
 
 void
 ProcessorEntry::processor_active_changed ()
 {
-       if (_active.get_active () != _processor->active ()) {
-               _active.set_active (_processor->active ());
+       if (_processor->active()) {
+               _button.set_active_state (Gtkmm2ext::Active);
+       } else {
+               _button.unset_active_state ();
        }
 }
 
@@ -168,7 +211,7 @@ void
 ProcessorEntry::processor_property_changed (const PropertyChange& what_changed)
 {
        if (what_changed.contains (ARDOUR::Properties::name)) {
-               _name.set_text (name ());
+               _button.set_text (name ());
        }
 }
 
@@ -177,18 +220,18 @@ ProcessorEntry::name () const
 {
        boost::shared_ptr<Send> send;
        string name_display;
-       
+
        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) {
                case Wide:
                        name_display += send->name().substr (lbracket+1, lbracket-rbracket-1);
@@ -197,9 +240,9 @@ ProcessorEntry::name () const
                        name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4);
                        break;
                }
-               
+
        } else {
-               
+
                switch (_width) {
                case Wide:
                        name_display += _processor->display_name();
@@ -208,27 +251,60 @@ ProcessorEntry::name () const
                        name_display += PBD::short_version (_processor->display_name(), 5);
                        break;
                }
-               
+
        }
-       
+
        return name_display;
 }
 
 SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
-       : ProcessorEntry (s, w),
-         _send (s),
-         _adjustment (0, 0, 1, 0.01, 0.1),
-         _fader (_slider, &_adjustment, 0, false),
-         _ignore_gain_change (false)
-{
+       : 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)
+{
+       _fader.set_name ("SendFader");
        _fader.set_controllable (_send->amp()->gain_control ());
        _vbox.pack_start (_fader);
 
+       _fader.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());
+
+       _send->amp()->gain_control()->Changed.connect (
+               _send_connections, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context()
+               );
+       
+       _send->amp()->ConfigurationChanged.connect (
+               _send_connections, invalidator (*this), ui_bind (&SendProcessorEntry::setup_gain_adjustment, this), gui_context ()
+               );
+
+       setup_gain_adjustment ();
        show_gain ();
 }
 
+void
+SendProcessorEntry::setup_gain_adjustment ()
+{
+       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));
+       } 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);
+       }
+}
+
 void
 SendProcessorEntry::setup_slider_pix ()
 {
@@ -239,14 +315,31 @@ SendProcessorEntry::setup_slider_pix ()
 void
 SendProcessorEntry::show_gain ()
 {
-       ENSURE_GUI_THREAD (*this, &SendProcessorEntry::show_gain)
+       gain_t value = 0;
        
-       float const value = gain_to_slider_position (_send->amp()->gain ());
+       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;
+       }
 
        if (_adjustment.get_value() != value) {
                _ignore_gain_change = true;
                _adjustment.set_value (value);
                _ignore_gain_change = false;
+
+               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 ());
        }
 }
 
@@ -257,7 +350,17 @@ SendProcessorEntry::gain_adjusted ()
                return;
        }
 
-       _send->amp()->set_gain (slider_position_to_gain (_adjustment.get_value()), this);
+       gain_t value = 0;
+
+       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 ();
+       }
+       
+       _send->amp()->set_gain (value, this);
 }
 
 void
@@ -266,13 +369,95 @@ SendProcessorEntry::set_pixel_width (int p)
        _fader.set_fader_length (p);
 }
 
+PluginInsertProcessorEntry::PluginInsertProcessorEntry (boost::shared_ptr<ARDOUR::PluginInsert> p, Width w)
+       : ProcessorEntry (p, w)
+       , _plugin_insert (p)
+{
+       p->SplittingChanged.connect (
+               _splitting_connection, invalidator (*this), ui_bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context()
+               );
+
+       _splitting_icon.set_size_request (-1, 12);
+
+       _vbox.pack_start (_splitting_icon);
+       _vbox.reorder_child (_splitting_icon, 0);
+
+       plugin_insert_splitting_changed ();
+}
+
+void
+PluginInsertProcessorEntry::plugin_insert_splitting_changed ()
+{
+       if (_plugin_insert->splitting ()) {
+               _splitting_icon.show ();
+       } else {
+               _splitting_icon.hide ();
+       }
+}
+
+void
+PluginInsertProcessorEntry::hide_things ()
+{
+       plugin_insert_splitting_changed ();
+}
+
+void
+PluginInsertProcessorEntry::setup_visuals ()
+{
+       switch (_position) {
+       case PreFader:
+               _splitting_icon.set_name ("ProcessorPreFader");
+               break;
+
+       case Fader:
+               _splitting_icon.set_name ("ProcessorFader");
+               break;
+
+       case PostFader:
+               _splitting_icon.set_name ("ProcessorPostFader");
+               break;
+       }
+
+       ProcessorEntry::setup_visuals ();
+}
+
+bool
+PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev)
+{
+       cairo_t* cr = gdk_cairo_create (get_window()->gobj());
+
+       cairo_set_line_width (cr, 1);
+
+       double const width = ev->area.width;
+       double const height = ev->area.height;
+
+       Gdk::Color const bg = get_style()->get_bg (STATE_NORMAL);
+       cairo_set_source_rgb (cr, bg.get_red_p (), bg.get_green_p (), bg.get_blue_p ());
+
+       cairo_rectangle (cr, 0, 0, width, height);
+       cairo_fill (cr);
+
+       Gdk::Color const fg = get_style()->get_fg (STATE_NORMAL);
+       cairo_set_source_rgb (cr, fg.get_red_p (), fg.get_green_p (), fg.get_blue_p ());
+
+       cairo_move_to (cr, width * 0.3, height);
+       cairo_line_to (cr, width * 0.3, height * 0.5);
+       cairo_line_to (cr, width * 0.7, height * 0.5);
+       cairo_line_to (cr, width * 0.7, height);
+       cairo_move_to (cr, width * 0.5, height * 0.5);
+       cairo_line_to (cr, width * 0.5, 0);
+       cairo_stroke (cr);
+
+       return true;
+}
+
 ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelector*()> get_plugin_selector,
                            RouteRedirectSelection& 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)
        , _rr_selection(rsel)
 {
        set_session (sess);
@@ -287,9 +472,10 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
        pack_start (processor_scroller, true, true);
 
        processor_display.set_flags (CAN_FOCUS);
-       processor_display.set_name ("ProcessorSelector");
+       processor_display.set_name ("ProcessorList");
        processor_display.set_size_request (48, -1);
        processor_display.set_data ("processorbox", this);
+       processor_display.set_spacing (2);
 
        processor_display.signal_enter_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::enter_notify), false);
        processor_display.signal_leave_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::leave_notify), false);
@@ -303,6 +489,15 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
        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 ()
+                       );
+       }
 }
 
 ProcessorBox::~ProcessorBox ()
@@ -315,16 +510,24 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
        if (_route == r) {
                return;
        }
-       
-       connections.drop_connections();
+
+       _route_connections.drop_connections();
 
        /* new route: any existing block on processor redisplay must be meaningless */
        no_processor_redisplay = false;
        _route = r;
 
-       _route->processors_changed.connect (connections, invalidator (*this), ui_bind (&ProcessorBox::route_processors_changed, this, _1), gui_context());
-       _route->DropReferences.connect (connections, invalidator (*this), boost::bind (&ProcessorBox::route_going_away, this), gui_context());
-       _route->PropertyChanged.connect (connections, invalidator (*this), ui_bind (&ProcessorBox::route_property_changed, this, _1), gui_context());
+       _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()
+               );
 
        redisplay_processors ();
 }
@@ -334,6 +537,7 @@ ProcessorBox::route_going_away ()
 {
        /* don't keep updating display as processors are deleted */
        no_processor_redisplay = true;
+       _route.reset ();
 }
 
 void
@@ -383,7 +587,7 @@ ProcessorBox::set_width (Width w)
        if (_width == w) {
                return;
        }
-       
+
        _width = w;
 
        list<ProcessorEntry*> children = processor_display.children ();
@@ -394,28 +598,6 @@ ProcessorBox::set_width (Width w)
        redisplay_processors ();
 }
 
-void
-ProcessorBox::remove_processor_gui (boost::shared_ptr<Processor> processor)
-{
-       boost::shared_ptr<Send> send;
-       boost::shared_ptr<Return> retrn;
-       boost::shared_ptr<PortInsert> port_insert;
-
-       if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
-               PortInsertUI *io_selector = reinterpret_cast<PortInsertUI *> (port_insert->get_gui());
-               port_insert->set_gui (0);
-               delete io_selector;
-       } else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
-               SendUIWindow *sui = reinterpret_cast<SendUIWindow*> (send->get_gui());
-               send->set_gui (0);
-               delete sui;
-       } else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {
-               ReturnUIWindow *rui = reinterpret_cast<ReturnUIWindow*> (retrn->get_gui());
-               retrn->set_gui (0);
-               delete rui;
-       }
-}
-
 void
 ProcessorBox::build_send_action_menu ()
 {
@@ -462,19 +644,20 @@ ProcessorBox::new_send ()
 }
 
 void
-ProcessorBox::show_processor_menu (gint arg)
+ProcessorBox::show_processor_menu (int arg)
 {
        if (processor_menu == 0) {
                processor_menu = build_processor_menu ();
+               processor_menu->signal_unmap().connect (sigc::mem_fun (*this, &ProcessorBox::processor_menu_unmapped));
        }
 
-       Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/processormenu/newplugin"));
+       Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newplugin"));
 
        if (plugin_menu_item) {
                plugin_menu_item->set_submenu (*_get_plugin_selector()->plugin_menu());
        }
 
-       Gtk::MenuItem* aux_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/processormenu/newaux"));
+       Gtk::MenuItem* aux_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newaux"));
 
        if (aux_menu_item) {
                Menu* m = build_possible_aux_menu();
@@ -492,6 +675,13 @@ ProcessorBox::show_processor_menu (gint arg)
        paste_action->set_sensitive (!_rr_selection.processors.empty());
 
        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);
 }
 
 bool
@@ -537,7 +727,7 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
                int x, y;
                processor_display.get_pointer (x, y);
 
-               pair<ProcessorEntry *, int> const pointer = processor_display.get_child_at_position (x, y);
+               pair<ProcessorEntry *, double> const pointer = processor_display.get_child_at_position (y);
 
                if (pointer.first) {
                        targets.push_back (pointer.first->processor ());
@@ -550,7 +740,7 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                        processor_display.select_all ();
                        ret = true;
-               } 
+               }
                break;
 
        case GDK_c:
@@ -620,7 +810,7 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry*
        if (child) {
                processor = child->processor ();
        }
-       
+
        int ret = false;
        bool selected = processor_display.selected (child);
 
@@ -628,7 +818,7 @@ 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 */
-                       edit_processor (processor);
+                       toggle_edit_processor (processor);
                }
                ret = true;
 
@@ -653,34 +843,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
@@ -695,8 +867,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
                } else {
                        processor->activate ();
                }
-               ret = true;
-
        }
 
        return false;
@@ -705,24 +875,32 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
 Menu *
 ProcessorBox::build_processor_menu ()
 {
-       processor_menu = dynamic_cast<Gtk::Menu*>(ActionManager::get_widget("/processormenu") );
+       processor_menu = dynamic_cast<Gtk::Menu*>(ActionManager::get_widget("/ProcessorMenu") );
        processor_menu->set_name ("ArdourContextMenu");
-
-       show_all_children();
-
        return processor_menu;
 }
 
 void
 ProcessorBox::selection_changed ()
 {
-       bool sensitive = (processor_display.selection().empty()) ? false : true;
-       ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive);
+       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 (
-               processor_display.selection().size() == 1 && boost::dynamic_pointer_cast<PluginInsert> (processor_display.selection().front()->processor()) == 0
-               );
+       rename_action->set_sensitive(single_selection && pi);
 }
 
 void
@@ -743,7 +921,8 @@ ProcessorBox::choose_plugin ()
        _get_plugin_selector()->set_interested_object (*this);
 }
 
-void
+/** @return true if an error occurred, otherwise false */
+bool
 ProcessorBox::use_plugins (const SelectedPlugins& plugins)
 {
        for (SelectedPlugins::const_iterator p = plugins.begin(); p != plugins.end(); ++p) {
@@ -752,12 +931,9 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
 
                Route::ProcessorStreams err_streams;
 
-               if (Config->get_new_plugins_active()) {
-                       processor->activate ();
-               }
-
-               if (_route->add_processor (processor, _placement, &err_streams)) {
+               if (_route->add_processor_by_index (processor, _placement, &err_streams, Config->get_new_plugins_active ())) {
                        weird_plugin_dialog (**p, err_streams);
+                       return true;
                        // XXX SHAREDPTR delete plugin here .. do we even need to care?
                } else {
 
@@ -766,15 +942,17 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
                        }
                }
        }
+
+       return false;
 }
 
 void
 ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 {
-       ArdourDialog dialog (_("ardour: weird plugin dialog"));
+       ArdourDialog dialog (_("Plugin Incompatibility"));
        Label label;
 
-       string text = string_compose(_("You attempted to add the plugin \"%1\" at index %2.\n"),
+       string text = string_compose(_("You attempted to add the plugin \"%1\" in slot %2.\n"),
                        p.name(), streams.index);
 
        bool has_midi  = streams.count.n_midi() > 0 || p.get_info()->n_inputs.n_midi() > 0;
@@ -782,18 +960,22 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 
        text += _("\nThis plugin has:\n");
        if (has_midi) {
-               text += string_compose("\t%1 ", p.get_info()->n_inputs.n_midi()) + _("MIDI input(s)\n");
+               uint32_t const n = p.get_info()->n_inputs.n_midi ();
+               text += string_compose (ngettext ("\t%1 MIDI input\n", "\t%1 MIDI inputs\n", n), n);
        }
        if (has_audio) {
-               text += string_compose("\t%1 ", p.get_info()->n_inputs.n_audio()) + _("audio input(s)\n");
+               uint32_t const n = p.get_info()->n_inputs.n_audio ();
+               text += string_compose (ngettext ("\t%1 audio input\n", "\t%1 audio inputs\n", n), n);
        }
 
-       text += _("\nBut at the insertion point, there are:\n");
+       text += _("\nbut at the insertion point, there are:\n");
        if (has_midi) {
-               text += string_compose("\t%1 ", streams.count.n_midi()) + _("MIDI channel(s)\n");
+               uint32_t const n = streams.count.n_midi ();
+               text += string_compose (ngettext ("\t%1 MIDI channel\n", "\t%1 MIDI channels\n", n), n);
        }
        if (has_audio) {
-               text += string_compose("\t%1 ", streams.count.n_audio()) + _("audio channel(s)\n");
+               uint32_t const n = streams.count.n_audio ();
+               text += string_compose (ngettext ("\t%1 audio channel\n", "\t%1 audio channels\n", n), n);
        }
 
        text += string_compose (_("\n%1 is unable to insert this plugin here.\n"), PROGRAM_NAME);
@@ -813,14 +995,15 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 void
 ProcessorBox::choose_insert ()
 {
-       boost::shared_ptr<Processor> processor (new PortInsert (*_session, _route->mute_master()));
-       _route->add_processor (processor, _placement);
+       boost::shared_ptr<Processor> processor (new PortInsert (*_session, _route->pannable(), _route->mute_master()));
+       _route->add_processor_by_index (processor, _placement);
 }
 
+/* Caller must not hold process lock */
 void
 ProcessorBox::choose_send ()
 {
-       boost::shared_ptr<Send> send (new Send (*_session, _route->mute_master()));
+       boost::shared_ptr<Send> send (new Send (*_session, _route->pannable(), _route->mute_master()));
 
        /* make an educated guess at the initial number of outputs for the send */
        ChanCount outs = (_session->master_out())
@@ -829,6 +1012,7 @@ ProcessorBox::choose_send ()
 
        /* XXX need processor lock on route */
        try {
+               Glib::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;
@@ -843,7 +1027,7 @@ ProcessorBox::choose_send ()
         */
 
        IOSelectorWindow *ios = new IOSelectorWindow (_session, send->output(), true);
-       ios->show_all ();
+       ios->show ();
 
        /* keep a reference to the send so it doesn't get deleted while
           the IOSelectorWindow is doing its stuff
@@ -874,7 +1058,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 ();
                }
@@ -902,7 +1086,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 ();
                }
@@ -955,7 +1139,89 @@ ProcessorBox::redisplay_processors ()
 
        _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display));
 
-       build_processor_tooltip (processor_eventbox, _("Inserts, sends & plugins:"));
+       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 */
+
+       list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin();
+       while (i != _processor_window_proxies.end()) {
+               list<ProcessorWindowProxy*>::iterator j = i;
+               ++j;
+
+               if (!(*i)->marked) {
+                       ARDOUR_UI::instance()->remove_window_proxy (*i);
+                       delete *i;
+                       _processor_window_proxies.erase (i);
+               }
+
+               i = j;
+       }
+
+       setup_entry_positions ();
+}
+
+/** Add a ProcessorWindowProxy for a processor to our list, if that processor does
+ *  not already have one.
+ */
+void
+ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
+{
+       boost::shared_ptr<Processor> p = w.lock ();
+       if (!p) {
+               return;
+       }
+
+       list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin ();
+       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;
+                       return;
+               }
+
+               ++i;
+       }
+
+       /* not on the list; add it */
+
+       string loc;
+       if (_parent_strip) {
+               if (_parent_strip->mixer_owned()) {
+                       loc = X_("M");
+               } else {
+                       loc = X_("R");
+               }
+       } else {
+               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,
+           note that so that we don't recreate it
+        */
+
+        void* existing_ui = p->get_ui ();
+
+        if (existing_ui) {
+                wp->set (static_cast<Gtk::Window*>(existing_ui));
+        }
+
+       _processor_window_proxies.push_back (wp);
+       ARDOUR_UI::instance()->add_window_proxy (wp);
 }
 
 void
@@ -968,12 +1234,16 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
        }
 
        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);
        } else {
                e = new ProcessorEntry (processor, _width);
        }
+
        e->set_pixel_width (get_allocation().get_width());
        processor_display.add_child (e);
 }
@@ -989,7 +1259,7 @@ ProcessorBox::build_processor_tooltip (EventBox& box, string start)
                tip += '\n';
                tip += (*i)->processor()->name();
        }
-       
+
        ARDOUR_UI::instance()->set_tip (box, tip);
 }
 
@@ -997,6 +1267,27 @@ void
 ProcessorBox::reordered ()
 {
        compute_processor_sort_keys ();
+       setup_entry_positions ();
+}
+
+void
+ProcessorBox::setup_entry_positions ()
+{
+       list<ProcessorEntry*> children = processor_display.children ();
+       bool pre_fader = true;
+
+       for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
+               if (boost::dynamic_pointer_cast<Amp>((*i)->processor())) {
+                       pre_fader = false;
+                       (*i)->set_position (ProcessorEntry::Fader);
+               } else {
+                       if (pre_fader) {
+                               (*i)->set_position (ProcessorEntry::PreFader);
+                       } else {
+                               (*i)->set_position (ProcessorEntry::PostFader);
+                       }
+               }
+       }
 }
 
 void
@@ -1010,32 +1301,42 @@ ProcessorBox::compute_processor_sort_keys ()
        }
 
        if (_route->reorder_processors (our_processors)) {
+               /* Reorder failed, so report this to the user.  As far as I can see this must be done
+                  in an idle handler: it seems that the redisplay_processors() that happens below destroys
+                  widgets that were involved in the drag-and-drop on the processor list, which causes problems
+                  when the drag is torn down after this handler function is finished.
+               */
+               Glib::signal_idle().connect_once (sigc::mem_fun (*this, &ProcessorBox::report_failed_reorder));
+       }
+}
 
-               /* reorder failed, so redisplay */
+void
+ProcessorBox::report_failed_reorder ()
+{
+       /* reorder failed, so redisplay */
 
-               redisplay_processors ();
+       redisplay_processors ();
 
-               /* now tell them about the problem */
+       /* now tell them about the problem */
 
-               ArdourDialog dialog (_("ardour: weird plugin dialog"));
-               Label label;
+       ArdourDialog dialog (_("Plugin Incompatibility"));
+       Label label;
 
-               label.set_text (_("\
+       label.set_text (_("\
 You cannot reorder these plugins/sends/inserts\n\
 in that way because the inputs and\n\
 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.get_vbox()->set_border_width (12);
+       dialog.get_vbox()->pack_start (label);
+       dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
 
-               dialog.set_name (X_("PluginIODialog"));
-               dialog.set_position (Gtk::WIN_POS_MOUSE);
-               dialog.set_modal (true);
-               dialog.show_all ();
+       dialog.set_name (X_("PluginIODialog"));
+       dialog.set_position (Gtk::WIN_POS_MOUSE);
+       dialog.set_modal (true);
+       dialog.show_all ();
 
-               dialog.run ();
-       }
+       dialog.run ();
 }
 
 void
@@ -1060,18 +1361,18 @@ 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;
 }
 
@@ -1100,10 +1401,10 @@ ProcessorBox::cut_processors (const ProcSelection& to_be_removed)
                    (boost::dynamic_pointer_cast<Send>((*i)) != 0) ||
                    (boost::dynamic_pointer_cast<Return>((*i)) != 0)) {
 
-                       void* gui = (*i)->get_gui ();
+                       Window* w = get_processor_ui (*i);
 
-                       if (gui) {
-                               static_cast<Gtk::Widget*>(gui)->hide ();
+                       if (w) {
+                               w->hide ();
                        }
 
                        XMLNode& child ((*i)->get_state());
@@ -1172,10 +1473,10 @@ ProcessorBox::delete_processors (const ProcSelection& targets)
 
        for (ProcSelection::const_iterator i = targets.begin(); i != targets.end(); ++i) {
 
-               void* gui = (*i)->get_gui ();
+               Window* w = get_processor_ui (*i);
 
-               if (gui) {
-                       static_cast<Gtk::Widget*>(gui)->hide ();
+               if (w) {
+                       w->hide ();
                }
 
                _route->remove_processor(*i);
@@ -1193,10 +1494,10 @@ ProcessorBox::delete_dragged_processors (const list<boost::shared_ptr<Processor>
        no_processor_redisplay = true;
        for (x = procs.begin(); x != procs.end(); ++x) {
 
-               void* gui = (*x)->get_gui ();
+               Window* w = get_processor_ui (*x);
 
-               if (gui) {
-                       static_cast<Gtk::Widget*>(gui)->hide ();
+               if (w) {
+                       w->hide ();
                }
 
                _route->remove_processor(*x);
@@ -1319,14 +1620,14 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
 
                                XMLNode n (**niter);
                                Send::make_unique (n, *_session);
-                                Send* s = new Send (*_session, _route->mute_master());
+                                Send* s = new Send (*_session, _route->pannable(), _route->mute_master());
                                 if (s->set_state (n, Stateful::loading_state_version)) {
                                         delete s;
                                         return;
                                 }
 
                                p.reset (s);
-                                        
+
 
                        } else if (type->value() == "return") {
 
@@ -1341,6 +1642,14 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
 
                                p.reset (r);
 
+                       } 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)) {
+                                       return;
+                               }
+
                        } else {
                                /* XXX its a bit limiting to assume that everything else
                                   is a plugin.
@@ -1406,7 +1715,8 @@ ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(boost::share
 void
 ProcessorBox::all_processors_active (bool state)
 {
-       _route->all_processors_active (_placement, state);
+       _route->all_processors_active (PreFader, state);
+       _route->all_processors_active (PostFader, state);
 }
 
 void
@@ -1461,10 +1771,43 @@ ProcessorBox::clear_processors (Placement p)
        }
 }
 
+bool
+ProcessorBox::processor_can_be_edited (boost::shared_ptr<Processor> processor)
+{
+       boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack> (_route);
+       if (at && at->freeze_state() == AudioTrack::Frozen) {
+               return false;
+       }
+
+       if (
+               boost::dynamic_pointer_cast<Send> (processor) ||
+               boost::dynamic_pointer_cast<Return> (processor) ||
+               boost::dynamic_pointer_cast<PluginInsert> (processor) ||
+               boost::dynamic_pointer_cast<PortInsert> (processor)
+               ) {
+               return true;
+       }
+
+       return false;
+}
+
+bool
+ProcessorBox::one_processor_can_be_edited ()
+{
+       list<ProcessorEntry*> selection = processor_display.selection ();
+       list<ProcessorEntry*>::iterator i = selection.begin();
+       while (i != selection.end() && processor_can_be_edited ((*i)->processor()) == false) {
+               ++i;
+       }
+
+       return (i != selection.end());
+}
+
 void
-ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
+ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
 {
        boost::shared_ptr<Send> send;
+       boost::shared_ptr<InternalSend> internal_send;
        boost::shared_ptr<Return> retrn;
        boost::shared_ptr<PluginInsert> plugin_insert;
        boost::shared_ptr<PortInsert> port_insert;
@@ -1477,33 +1820,42 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
                }
        }
 
-       if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
+       if (boost::dynamic_pointer_cast<Amp> (processor)) {
+
+               if (_parent_strip) {
+                       _parent_strip->revert_to_default_display ();
+               }
+
+       } else if ((internal_send = boost::dynamic_pointer_cast<InternalSend> (processor)) != 0) {
 
                if (!_session->engine().connected()) {
                        return;
                }
 
-#ifdef OLD_SEND_EDITING
-               SendUIWindow *send_ui;
+               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);
+                       }
+               }
 
-               if (send->get_gui() == 0) {
-                       send_ui = new SendUIWindow (send, _session);
-                       send_ui->set_title (send->name());
-                       send->set_gui (send_ui);
+       } else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
 
-               } else {
-                       send_ui = reinterpret_cast<SendUIWindow *> (send->get_gui());
+               if (!_session->engine().connected()) {
+                       return;
                }
 
-               gidget = send_ui;
-#else
-               if (_parent_strip) {
-                       _parent_strip->show_send (send);
-               }
-#endif
+               SendUIWindow* w = new SendUIWindow (send, _session);
+               w->show ();
 
        } else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {
 
+               if (boost::dynamic_pointer_cast<InternalReturn> (retrn)) {
+                       /* no GUI for these */
+                       return;
+               }
+
                if (!_session->engine().connected()) {
                        return;
                }
@@ -1511,15 +1863,16 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
                boost::shared_ptr<Return> retrn = boost::dynamic_pointer_cast<Return> (processor);
 
                ReturnUIWindow *return_ui;
+               Window* w = get_processor_ui (retrn);
 
-               if (retrn->get_gui() == 0) {
+               if (w == 0) {
 
                        return_ui = new ReturnUIWindow (retrn, _session);
                        return_ui->set_title (retrn->name ());
-                       send->set_gui (return_ui);
+                       set_processor_ui (send, return_ui);
 
                } else {
-                       return_ui = reinterpret_cast<ReturnUIWindow *> (retrn->get_gui());
+                       return_ui = dynamic_cast<ReturnUIWindow *> (w);
                }
 
                gidget = return_ui;
@@ -1533,14 +1886,16 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
                Container* toplevel = get_toplevel();
                Window* win = dynamic_cast<Gtk::Window*>(toplevel);
 
-               if (plugin_insert->get_gui() == 0) {
+               Window* w = get_processor_ui (plugin_insert);
+
+               if (w == 0) {
 
                        plugin_ui = new PluginUIWindow (win, plugin_insert);
                        plugin_ui->set_title (generate_processor_title (plugin_insert));
-                       plugin_insert->set_gui (plugin_ui);
+                       set_processor_ui (plugin_insert, plugin_ui);
 
                } else {
-                       plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_insert->get_gui());
+                       plugin_ui = dynamic_cast<PluginUIWindow *> (w);
                        plugin_ui->set_parent (win);
                }
 
@@ -1556,12 +1911,14 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 
                PortInsertWindow *io_selector;
 
-               if (port_insert->get_gui() == 0) {
+               Window* w = get_processor_ui (port_insert);
+
+               if (w == 0) {
                        io_selector = new PortInsertWindow (_session, port_insert);
-                       port_insert->set_gui (io_selector);
+                       set_processor_ui (port_insert, io_selector);
 
                } else {
-                       io_selector = reinterpret_cast<PortInsertWindow *> (port_insert->get_gui());
+                       io_selector = dynamic_cast<PortInsertWindow *> (w);
                }
 
                gidget = io_selector;
@@ -1569,7 +1926,7 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 
        if (gidget) {
                if (gidget->is_visible()) {
-                       gidget->get_window()->raise ();
+                       gidget->hide ();
                } else {
                        gidget->show_all ();
                        gidget->present ();
@@ -1577,10 +1934,32 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
        }
 }
 
+void
+ProcessorBox::toggle_processor_controls (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 ()
 {
-       Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("processormenu"));
+       Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("ProcessorMenu"));
        Glib::RefPtr<Action> act;
 
        /* new stuff */
@@ -1627,16 +2006,21 @@ ProcessorBox::register_actions ()
        /* activation etc. */
 
        ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"),
-                                       sigc::ptr_fun (ProcessorBox::rb_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));
+                       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 */
-       act = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit"),
-                                             sigc::ptr_fun (ProcessorBox::rb_edit));
-       ActionManager::plugin_selection_sensitive_actions.push_back(act);
+       edit_action = ActionManager::register_action (
+               popup_act_grp, X_("edit"), _("Edit..."),
+               sigc::ptr_fun (ProcessorBox::rb_edit));
+
+       /* show plugin GUI */
+       controls_action = ActionManager::register_action (
+                       popup_act_grp, X_("controls"), _("Controls..."),
+                       sigc::ptr_fun (ProcessorBox::rb_controls));
 
        ActionManager::add_action_group (popup_act_grp);
 }
@@ -1814,7 +2198,17 @@ ProcessorBox::rb_edit ()
                return;
        }
 
-       _current_processor_box->for_selected_processors (&ProcessorBox::edit_processor);
+       _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
@@ -1836,18 +2230,18 @@ ProcessorBox::route_property_changed (const PropertyChange& what_changed)
 
                processor = (*iter)->processor ();
 
-               void* gui = processor->get_gui();
+               Window* w = get_processor_ui (processor);
 
-               if (!gui) {
+               if (!w) {
                        continue;
                }
 
                /* rename editor windows for sends and plugins */
 
                if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
-                       static_cast<Window*>(gui)->set_title (send->name ());
+                       w->set_title (send->name ());
                } else if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor)) != 0) {
-                       static_cast<Window*>(gui)->set_title (generate_processor_title (plugin_insert));
+                       w->set_title (generate_processor_title (plugin_insert));
                }
        }
 }
@@ -1880,3 +2274,116 @@ ProcessorBox::on_size_allocate (Allocation& a)
                (*i)->set_pixel_width (a.get_width ());
        }
 }
+
+/** @param p Processor.
+ *  @return the UI window for \a p.
+ */
+Window *
+ProcessorBox::get_processor_ui (boost::shared_ptr<Processor> p) const
+{
+       list<ProcessorWindowProxy*>::const_iterator i = _processor_window_proxies.begin ();
+       while (i != _processor_window_proxies.end()) {
+               boost::shared_ptr<Processor> t = (*i)->processor().lock ();
+               if (t && t == p) {
+                       return (*i)->get ();
+               }
+
+               ++i;
+       }
+
+       /* we shouldn't get here, because the ProcessorUIList should always contain
+          an entry for each processor.
+       */
+       assert (false);
+       return 0;
+}
+
+/** Make a note of the UI window that a processor is using.
+ *  @param p Processor.
+ *  @param w UI window.
+ */
+void
+ProcessorBox::set_processor_ui (boost::shared_ptr<Processor> p, Gtk::Window* w)
+{
+       list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin ();
+
+       p->set_ui (w);
+
+       while (i != _processor_window_proxies.end()) {
+               boost::shared_ptr<Processor> t = (*i)->processor().lock ();
+               if (t && t == p) {
+                       (*i)->set (w);
+                       return;
+               }
+
+               ++i;
+       }
+
+       /* we shouldn't get here, because the ProcessorUIList should always contain
+          an entry for each processor.
+       */
+       assert (false);
+}
+
+void
+ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr<Delivery> w)
+{
+       boost::shared_ptr<Delivery> d = w.lock ();
+       if (!d) {
+               return;
+       }
+
+       list<ProcessorEntry*> children = processor_display.children ();
+       list<ProcessorEntry*>::const_iterator i = children.begin();
+       while (i != children.end() && (*i)->processor() != d) {
+               ++i;
+       }
+
+       if (i == children.end()) {
+               processor_display.set_active (0);
+       } else {
+               processor_display.set_active (*i);
+       }
+}
+
+void
+ProcessorBox::hide_things ()
+{
+       list<ProcessorEntry*> c = processor_display.children ();
+       for (list<ProcessorEntry*>::iterator i = c.begin(); i != c.end(); ++i) {
+               (*i)->hide_things ();
+       }
+}
+
+void
+ProcessorBox::processor_menu_unmapped ()
+{
+       processor_display.remove_placeholder ();
+}
+
+ProcessorWindowProxy::ProcessorWindowProxy (
+       string const & name,
+       XMLNode const * node,
+       ProcessorBox* box,
+       boost::weak_ptr<Processor> processor
+       )
+       : WindowProxy<Gtk::Window> (name, node)
+       , marked (false)
+       , _processor_box (box)
+       , _processor (processor)
+{
+
+}
+
+
+void
+ProcessorWindowProxy::show ()
+{
+       boost::shared_ptr<Processor> p = _processor.lock ();
+       if (!p) {
+               return;
+       }
+
+       _processor_box->toggle_edit_processor (p);
+}
+