allow button release events to be processed for region selection ops
[ardour.git] / gtk2_ardour / processor_box.cc
index 60e87ab77e6e8e68c1e0b9572f386cece7be9d14..70e479363e4d99c0901171c8e00b02766bd6c842 100644 (file)
@@ -28,7 +28,6 @@
 #include <sigc++/bind.h>
 
 #include "pbd/convert.h"
-#include "pbd/stacktrace.h"
 
 #include <glibmm/miscutils.h>
 
 #include <gtkmm2ext/doi.h>
 
 #include "ardour/amp.h"
-#include "ardour/ardour.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
-#include "ardour/internal_send.h"
 #include "ardour/internal_return.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/meter.h"
+#include "ardour/internal_send.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/port_insert.h"
 #include "ardour/profile.h"
@@ -55,7 +51,7 @@
 #include "ardour/route.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
-#include "ardour/dB.h"
+#include "ardour/types.h"
 
 #include "actions.h"
 #include "ardour_dialog.h"
@@ -93,12 +89,14 @@ 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;
+RefPtr<Action> ProcessorBox::edit_generic_action;
 Glib::RefPtr<Gdk::Pixbuf> ProcessorEntry::_slider_pixbuf;
+Glib::RefPtr<Gdk::Pixbuf> ProcessorEntry::_slider_pixbuf_desensitised;
 
-ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
+ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processor> p, Width w)
        : _button (ArdourButton::led_default_elements)
        , _position (PreFader)
+       , _parent (parent)
        , _processor (p)
        , _width (w)
        , _visual_state (Gtk::STATE_NORMAL)
@@ -112,26 +110,36 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
        _button.set_text (name (_width));
 
        if (_processor) {
+
                _vbox.pack_start (_button, true, true);
 
-               if (_processor->active()) {
-                       _button.set_active_state (Gtkmm2ext::Active);
-               }
-               
+               _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());
+               _processor->PropertyChanged.connect (name_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context());
 
                set<Evoral::Parameter> p = _processor->what_can_be_automated ();
                for (set<Evoral::Parameter>::iterator i = p.begin(); i != p.end(); ++i) {
-                       if (boost::dynamic_pointer_cast<Amp> (_processor)) {
-                               continue;
-                       }
                        
-                       Control* c = new Control (_slider_pixbuf, _processor->automation_control (*i), _processor->describe_parameter (*i));
+                       Control* c = new Control (
+                               _slider_pixbuf,
+                               _slider_pixbuf_desensitised,
+                               _processor->automation_control (*i),
+                               _processor->describe_parameter (*i)
+                               );
+                       
                        _controls.push_back (c);
-                       _vbox.pack_start (c->box);
+
+                       if (boost::dynamic_pointer_cast<Amp> (_processor) == 0) {
+                               /* Add non-Amp controls to the processor box */
+                               _vbox.pack_start (c->box);
+                       }
+
+                       if (boost::dynamic_pointer_cast<Send> (_processor)) {
+                               /* Don't label send faders */
+                               c->hide_label ();
+                       }
                }
 
                setup_tooltip ();
@@ -141,6 +149,13 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
        }
 }
 
+ProcessorEntry::~ProcessorEntry ()
+{
+       for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               delete *i;
+       }
+}
+
 EventBox&
 ProcessorEntry::action_widget ()
 {
@@ -211,7 +226,7 @@ void
 ProcessorEntry::led_clicked()
 {
        if (_processor) {
-               if (_button.active_state() == Gtkmm2ext::Active) {
+               if (_button.get_active ()) {
                        _processor->deactivate ();
                } else {
                        _processor->activate ();
@@ -223,11 +238,7 @@ void
 ProcessorEntry::processor_active_changed ()
 {
        if (_processor) {
-               if (_processor->active()) {
-                       _button.set_active_state (Gtkmm2ext::Active);
-               } else {
-                       _button.unset_active_state ();
-               }
+               _button.set_active (_processor->active());
        }
 }
 
@@ -297,6 +308,8 @@ ProcessorEntry::setup_slider_pix ()
 {
        _slider_pixbuf = ::get_icon ("fader_belt_h_thin");
        assert (_slider_pixbuf);
+       _slider_pixbuf_desensitised = ::get_icon ("fader_belt_h_thin_desensitised");
+       assert (_slider_pixbuf_desensitised);
 }
 
 void
@@ -311,16 +324,20 @@ void
 ProcessorEntry::show_all_controls ()
 {
        for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
-               (*i)->show ();
+               (*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)->hide ();
+               (*i)->set_visible (false);
        }
+
+       _parent->update_gui_object_state (this);
 }
 
 void
@@ -353,37 +370,117 @@ ProcessorEntry::hide_things ()
        }
 }
 
-ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, boost::shared_ptr<AutomationControl> c, string const & l)
+
+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 ());
+       }
+       
+       for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+               items.push_back (CheckMenuElem ((*i)->name ()));
+               CheckMenuItem* c = dynamic_cast<CheckMenuItem*> (&items.back ());
+               c->set_active ((*i)->visible ());
+               c->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ProcessorEntry::toggle_control_visibility), *i));
+       }
+
+       return menu;
+}
+
+void
+ProcessorEntry::toggle_control_visibility (Control* c)
+{
+       c->set_visible (!c->visible ());
+       _parent->update_gui_object_state (this);
+}
+
+ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, Glib::RefPtr<Gdk::Pixbuf> sd, boost::shared_ptr<AutomationControl> c, string const & n)
        : _control (c)
        , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
-       , _slider (s, &_adjustment, 0, false)
-       , _ignore_slider_adjustment (false)
+       , _slider (s, sd, &_adjustment, 0, false)
+       , _slider_persistant_tooltip (&_slider)
+       , _button (ArdourButton::Element (ArdourButton::Text | ArdourButton::Indicator))
+       , _ignore_ui_adjustment (false)
        , _visible (false)
+       , _name (n)
 {
        _slider.set_controllable (c);
 
-       if (!l.empty ()) {
+       if (c->toggled()) {
+               _button.set_text (_name);
+               _button.set_led_left (true);
+               _button.set_name ("processor control button");
+               box.pack_start (_button);
+               _button.show ();
+
+               _button.signal_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked));
+               _button.signal_led_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked));
+               c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ());
+
+       } else {
+               
                box.pack_start (_label);
                _label.show ();
-               _label.set_text (l);
-       }
+               _label.set_text (_name);
+               box.pack_start (_slider);
+               _slider.show ();
 
-       _slider.show ();
-       box.pack_start (_slider);
+               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 ());
+       }
 
-       double const lo = c->user_to_ui (c->lower ());
-       double const up = c->user_to_ui (c->upper ());
+       ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &Control::control_changed));
        
-       _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 (up);
+       control_changed ();
+       set_tooltip ();
 
-       _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 ());
+       /* We're providing our own PersistentTooltip */
+       set_no_tooltip_whatsoever (_slider);
+}
 
-       control_changed ();
+void
+ProcessorEntry::Control::set_tooltip ()
+{
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+
+       if (!c) {
+               return;
+       }
+       
+       stringstream s;
+       s << _name << ": ";
+       if (c->toggled ()) {
+               s << (c->get_value() > 0.5 ? _("on") : _("off"));
+       } else {
+               s << setprecision(2) << fixed;
+               s << c->internal_to_user (c->get_value ());
+       }
+       
+       ARDOUR_UI::instance()->set_tip (_label, s.str ());
+       _slider_persistant_tooltip.set_tip (s.str ());
+       ARDOUR_UI::instance()->set_tip (_button, s.str ());
 }
 
 void
@@ -395,7 +492,7 @@ ProcessorEntry::Control::set_pixel_width (int p)
 void
 ProcessorEntry::Control::slider_adjusted ()
 {
-       if (_ignore_slider_adjustment) {
+       if (_ignore_ui_adjustment) {
                return;
        }
        
@@ -404,8 +501,24 @@ ProcessorEntry::Control::slider_adjusted ()
        if (!c) {
                return;
        }
-       
-       c->set_value (c->ui_to_user (_adjustment.get_value ()));
+
+       c->set_value (c->interface_to_internal (_adjustment.get_value ()));
+       set_tooltip ();
+}
+
+void
+ProcessorEntry::Control::button_clicked ()
+{
+       boost::shared_ptr<AutomationControl> c = _control.lock ();
+
+       if (!c) {
+               return;
+       }
+
+       bool const n = _button.get_active ();
+
+       c->set_value (n ? 0 : 1);
+       _button.set_active (!n);
 }
 
 void
@@ -416,9 +529,23 @@ ProcessorEntry::Control::control_changed ()
                return;
        }
 
-       _ignore_slider_adjustment = true;
-       _adjustment.set_value (c->user_to_ui (c->get_value ()));
-       _ignore_slider_adjustment = false;
+       _ignore_ui_adjustment = true;
+
+       if (c->toggled ()) {
+
+               _button.set_active (c->get_value() > 0.5);
+               
+       } else {
+
+               _adjustment.set_value (c->internal_to_interface (c->get_value ()));
+               
+               stringstream s;
+               s.precision (1);
+               s.setf (ios::fixed, ios::floatfield);
+               s << c->internal_to_user (c->get_value ());
+       }
+       
+       _ignore_ui_adjustment = false;
 }
 
 void
@@ -436,28 +563,22 @@ ProcessorEntry::Control::set_state (XMLNode const * node)
        XMLNode* n = GUIObjectState::get_node (node, state_id ());
        if (n) {
                XMLProperty* p = n->property (X_("visible"));
-               if (p && string_is_affirmative (p->value ())) {
-                       show ();
-               } else {
-                       hide ();
-               }
+               set_visible (p && string_is_affirmative (p->value ()));
        } else {
-               hide ();
+               set_visible (false);
        }
 }
 
 void
-ProcessorEntry::Control::show ()
+ProcessorEntry::Control::set_visible (bool v)
 {
-       box.show ();
-       _visible = true;
-}
-
-void
-ProcessorEntry::Control::hide ()
-{
-       box.hide ();
-       _visible = false;
+       if (v) {
+               box.show ();
+       } else {
+               box.hide ();
+       }
+       
+       _visible = v;
 }
 
 /** Called when the Editor might have re-shown things that
@@ -471,6 +592,12 @@ ProcessorEntry::Control::hide_things ()
        }
 }
 
+void
+ProcessorEntry::Control::hide_label ()
+{
+       _label.hide ();
+}
+
 string
 ProcessorEntry::Control::state_id () const
 {
@@ -480,122 +607,17 @@ ProcessorEntry::Control::state_id () const
        return string_compose (X_("control %1"), c->id().to_s ());
 }
 
-BlankProcessorEntry::BlankProcessorEntry (Width w)
-       : ProcessorEntry (boost::shared_ptr<Processor>(), w)
+BlankProcessorEntry::BlankProcessorEntry (ProcessorBox* b, Width w)
+       : ProcessorEntry (b, boost::shared_ptr<Processor>(), w)
 {
 }
 
-SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
-       : ProcessorEntry (s, w)
-       , _send (s)
-       , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
-       , _fader (_slider_pixbuf, &_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_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::show_gain ()
-{
-       gain_t value = 0;
-       
-       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 ());
-       }
-}
-
-void
-SendProcessorEntry::gain_adjusted ()
-{
-       if (_ignore_gain_change) {
-               return;
-       }
-
-       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
-SendProcessorEntry::set_pixel_width (int p)
-{
-       _fader.set_fader_length (p);
-}
-
-PluginInsertProcessorEntry::PluginInsertProcessorEntry (boost::shared_ptr<ARDOUR::PluginInsert> p, Width w)
-       : ProcessorEntry (p, w)
+PluginInsertProcessorEntry::PluginInsertProcessorEntry (ProcessorBox* b, boost::shared_ptr<ARDOUR::PluginInsert> p, Width w)
+       : ProcessorEntry (b, p, w)
        , _plugin_insert (p)
 {
        p->SplittingChanged.connect (
-               _splitting_connection, invalidator (*this), ui_bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context()
+               _splitting_connection, invalidator (*this), boost::bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context()
                );
 
        _splitting_icon.set_size_request (-1, 12);
@@ -713,7 +735,7 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
 
        if (parent) {
                parent->DeliveryChanged.connect (
-                       _mixer_strip_connections, invalidator (*this), ui_bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context ()
+                       _mixer_strip_connections, invalidator (*this), boost::bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context ()
                        );
        }
 
@@ -747,7 +769,7 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
        _route = r;
 
        _route->processors_changed.connect (
-               _route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_processors_changed, this, _1), gui_context()
+               _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_processors_changed, this, _1), gui_context()
                );
 
        _route->DropReferences.connect (
@@ -755,7 +777,7 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
                );
 
        _route->PropertyChanged.connect (
-               _route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_property_changed, this, _1), gui_context()
+               _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_property_changed, this, _1), gui_context()
                );
 
        redisplay_processors ();
@@ -775,6 +797,21 @@ 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 ();
@@ -805,12 +842,6 @@ ProcessorBox::object_drop(DnDVBox<ProcessorEntry>* source, ProcessorEntry* posit
        }
 }
 
-void
-ProcessorBox::update()
-{
-       redisplay_processors ();
-}
-
 void
 ProcessorBox::set_width (Width w)
 {
@@ -834,6 +865,7 @@ ProcessorBox::build_possible_aux_menu ()
        boost::shared_ptr<RouteList> rl = _session->get_routes_with_internal_returns();
 
        if (rl->empty()) {
+               /* No aux sends if there are no busses */
                return 0;
        }
 
@@ -882,9 +914,9 @@ ProcessorBox::show_processor_menu (int arg)
                }
        }
 
-       boost::shared_ptr<Processor> single_selection;
+       ProcessorEntry* single_selection = 0;
        if (processor_display.selection().size() == 1) {
-               single_selection = processor_display.selection().front()->processor ();
+               single_selection = processor_display.selection().front();
        }
 
        /* And the controls submenu */
@@ -893,7 +925,7 @@ ProcessorBox::show_processor_menu (int arg)
 
        if (controls_menu_item) {
                if (single_selection) {
-                       Menu* m = build_controls_menu (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);
@@ -915,11 +947,14 @@ ProcessorBox::show_processor_menu (int arg)
 
        boost::shared_ptr<PluginInsert> pi;
        if (single_selection) {
-               pi = boost::dynamic_pointer_cast<PluginInsert> (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));
+       rename_action->set_sensitive (single_selection && !pi && !boost::dynamic_pointer_cast<Amp> (single_selection->processor ()));
 
        processor_menu->popup (1, arg);
 
@@ -930,10 +965,8 @@ ProcessorBox::show_processor_menu (int arg)
        processor_display.get_pointer (x, y);
        _placement = processor_display.add_placeholder (y);
 
-       if (_visible_prefader_processors == 0) {
-               if (_placement == 1) {
-                       _placement = 0;
-               }
+       if (_visible_prefader_processors == 0 && _placement > 0) {
+               --_placement;
        }
 }
 
@@ -945,7 +978,7 @@ ProcessorBox::enter_notify (GdkEventCrossing*)
 }
 
 bool
-ProcessorBox::leave_notify (GdkEventCrossing* ev)
+ProcessorBox::leave_notify (GdkEventCrossing*)
 {
        return false;
 }
@@ -1028,7 +1061,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;
 
@@ -1199,7 +1236,7 @@ ProcessorBox::choose_send ()
 
        /* XXX need processor lock on route */
        try {
-               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
+               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock());
                send->output()->ensure_io (outs, false, this);
        } catch (AudioEngine::PortRegistrationFailure& err) {
                error << string_compose (_("Cannot set up new send: %1"), err.what()) << endmsg;
@@ -1296,10 +1333,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
@@ -1332,7 +1366,7 @@ ProcessorBox::redisplay_processors ()
                                               &_visible_prefader_processors, &fader_seen));
 
        if (_visible_prefader_processors == 0) { // fader only
-               BlankProcessorEntry* bpe = new BlankProcessorEntry (_width);
+               BlankProcessorEntry* bpe = new BlankProcessorEntry (this, _width);
                bpe->set_pixel_width (get_allocation().get_width());
                processor_display.add_child (bpe);
        }
@@ -1450,15 +1484,12 @@ 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());
@@ -1469,6 +1500,11 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
                e->set_control_state (proc);
        }
        
+       if (boost::dynamic_pointer_cast<Send> (processor)) {
+               /* Always show send controls */
+               e->show_all_controls ();
+       }
+
        processor_display.add_child (e);
 }
 
@@ -1649,19 +1685,6 @@ ProcessorBox::copy_processors (const ProcSelection& to_be_copied)
        _rr_selection.set (node);
 }
 
-void
-ProcessorBox::processors_up ()
-{
-       /* unimplemented */
-}
-
-void
-ProcessorBox::processors_down ()
-{
-       /* unimplemented */
-}
-       
-
 void
 ProcessorBox::delete_processors (const ProcSelection& targets)
 {
@@ -1819,8 +1842,10 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                        } else if (type->value() == "send") {
 
                                XMLNode n (**niter);
-                               Send::make_unique (n, *_session);
                                 Send* s = new Send (*_session, _route->pannable(), _route->mute_master());
+
+                               IOProcessor::prepare_for_reset (n, s->name());
+                               
                                 if (s->set_state (n, Stateful::loading_state_version)) {
                                         delete s;
                                         return;
@@ -1828,13 +1853,13 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
 
                                p.reset (s);
 
-
                        } else if (type->value() == "return") {
 
                                XMLNode n (**niter);
-                               Return::make_unique (n, *_session);
                                 Return* r = new Return (*_session);
 
+                               IOProcessor::prepare_for_reset (n, r->name());
+
                                 if (r->set_state (n, Stateful::loading_state_version)) {
                                         delete r;
                                         return;
@@ -1845,10 +1870,15 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                        } else if (type->value() == "port") {
 
                                XMLNode n (**niter);
-                               p.reset (new PortInsert (*_session, _route->pannable (), _route->mute_master ()));
-                               if (p->set_state (n, Stateful::loading_state_version)) {
+                               PortInsert* pi = new PortInsert (*_session, _route->pannable (), _route->mute_master ());
+                               
+                               IOProcessor::prepare_for_reset (n, pi->name());
+                               
+                               if (pi->set_state (n, Stateful::loading_state_version)) {
                                        return;
                                }
+                               
+                               p.reset (pi);
 
                        } else {
                                /* XXX its a bit limiting to assume that everything else
@@ -1863,7 +1893,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                }
 
                catch (...) {
-                       cerr << "plugin insert constructor failed\n";
+                       error << _("plugin insert constructor failed") << endmsg;
                }
        }
 
@@ -1882,18 +1912,6 @@ could not match the configuration of this track.");
        }
 }
 
-void
-ProcessorBox::activate_processor (boost::shared_ptr<Processor> r)
-{
-       r->activate ();
-}
-
-void
-ProcessorBox::deactivate_processor (boost::shared_ptr<Processor> r)
-{
-       r->deactivate ();
-}
-
 void
 ProcessorBox::get_selected_processors (ProcSelection& processors) const
 {
@@ -2130,6 +2148,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 ()
 {
@@ -2193,9 +2234,23 @@ ProcessorBox::register_actions ()
                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 ()
 {
@@ -2523,51 +2578,6 @@ ProcessorBox::processor_menu_unmapped ()
        processor_display.remove_placeholder ();
 }
 
-Menu *
-ProcessorBox::build_controls_menu (boost::shared_ptr<Processor> p)
-{
-       using namespace Menu_Helpers;
-       Menu* menu = manage (new Menu);
-       MenuList& items = menu->items ();
-
-       items.push_back (
-               MenuElem (_("Show All Controls"), sigc::bind (sigc::mem_fun (*this, &ProcessorBox::show_or_hide_all_controls), boost::weak_ptr<Processor> (p), true)
-                       ));
-       
-       items.push_back (
-               MenuElem (_("Hide All Controls"), sigc::bind (sigc::mem_fun (*this, &ProcessorBox::show_or_hide_all_controls), boost::weak_ptr<Processor> (p), false)
-                       ));
-
-       return menu;
-}
-
-void
-ProcessorBox::show_or_hide_all_controls (boost::weak_ptr<Processor> w, bool show)
-{
-       boost::shared_ptr<Processor> p (w.lock ());
-       if (!p) {
-               return;
-       }
-
-       list<ProcessorEntry*> processors = processor_display.children ();
-       list<ProcessorEntry*>::iterator i = processors.begin();
-       while (i != processors.end () && (*i)->processor() != p) {
-               ++i;
-       }
-
-       if (i == processors.end ()) {
-               return;
-       }
-
-       if (show) {
-               (*i)->show_all_controls ();
-       } else {
-               (*i)->hide_all_controls ();
-       }
-
-       update_gui_object_state (*i);
-}
-
 XMLNode *
 ProcessorBox::entry_gui_object_state (ProcessorEntry* entry)
 {