Various tweaks to the port matrix: open to full size; remove buttons and move their...
[ardour.git] / gtk2_ardour / processor_box.cc
index 12e30e59c0b4668d16cab982a6648375a0e86e9c..7b7d18f7e73acb779c475b6abf74de108ce8f8cf 100644 (file)
 
 */
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
 #include <cmath>
 #include <iostream>
+#include <set>
 
 #include <sigc++/bind.h>
 
-#include <pbd/convert.h>
+#include "pbd/convert.h"
 
 #include <glibmm/miscutils.h>
 
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/audioengine.h>
-#include <ardour/route.h>
-#include <ardour/audio_track.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/send.h>
-#include <ardour/plugin_insert.h>
-#include <ardour/port_insert.h>
-#include <ardour/ladspa_plugin.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/ladspa_plugin.h"
+#include "ardour/meter.h"
+#include "ardour/plugin_insert.h"
+#include "ardour/port_insert.h"
+#include "ardour/profile.h"
+#include "ardour/return.h"
+#include "ardour/route.h"
+#include "ardour/send.h"
+#include "ardour/session.h"
 
-#include "ardour_ui.h"
+#include "actions.h"
 #include "ardour_dialog.h"
-#include "public_editor.h"
-#include "processor_box.h"
+#include "ardour_ui.h"
+#include "gui_thread.h"
+#include "io_selector.h"
 #include "keyboard.h"
-#include "plugin_selector.h"
-#include "route_processor_selection.h"
 #include "mixer_ui.h"
-#include "actions.h"
+#include "mixer_strip.h"
+#include "plugin_selector.h"
 #include "plugin_ui.h"
+#include "processor_box.h"
+#include "public_editor.h"
+#include "return_ui.h"
+#include "route_processor_selection.h"
 #include "send_ui.h"
-#include "io_selector.h"
 #include "utils.h"
-#include "gui_thread.h"
 
 #include "i18n.h"
 
-#ifdef HAVE_AUDIOUNIT
-#include "au_pluginui.h"
+#ifdef HAVE_AUDIOUNITS
+class AUPluginUI;
 #endif
 
+using namespace std;
 using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
@@ -81,20 +94,22 @@ bool ProcessorBox::get_colors = true;
 Gdk::Color* ProcessorBox::active_processor_color;
 Gdk::Color* ProcessorBox::inactive_processor_color;
 
-ProcessorBox::ProcessorBox (Placement pcmnt, Session& sess, boost::shared_ptr<Route> rt, PluginSelector &plugsel, 
-                         RouteRedirectSelection & rsel, bool owner_is_mixer)
-       : _route(rt), 
-         _session(sess), 
-         _owner_is_mixer (owner_is_mixer), 
-         _placement(pcmnt), 
-         _plugin_selector(plugsel),
-         _rr_selection(rsel)
+ProcessorBox::ProcessorBox (Session& sess, PluginSelector &plugsel,
+                           RouteRedirectSelection & rsel, MixerStrip* parent, bool owner_is_mixer)
+       : _session(sess)
+       , _parent_strip (parent)
+       , _owner_is_mixer (owner_is_mixer)
+       , _placement(PreFader)
+       , _plugin_selector(plugsel)
+       , _rr_selection(rsel)
 {
        if (get_colors) {
                active_processor_color = new Gdk::Color;
                inactive_processor_color = new Gdk::Color;
-               set_color (*active_processor_color, rgba_from_style ("RedirectSelector", 0xff, 0, 0, 0, "fg", Gtk::STATE_ACTIVE, false ));
-               set_color (*inactive_processor_color, rgba_from_style ("RedirectSelector", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false ));
+               set_color (*active_processor_color, rgba_from_style (
+                               "ProcessorSelector", 0xff, 0, 0, 0, "fg", Gtk::STATE_ACTIVE, false ));
+               set_color (*inactive_processor_color, rgba_from_style (
+                               "ProcessorSelector", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false ));
                get_colors = false;
        }
 
@@ -104,65 +119,75 @@ ProcessorBox::ProcessorBox (Placement pcmnt, Session& sess, boost::shared_ptr<Ro
        processor_drag_in_progress = false;
        no_processor_redisplay = false;
        ignore_delete = false;
-       ab_direction = true;
 
        model = ListStore::create(columns);
 
        RefPtr<TreeSelection> selection = processor_display.get_selection();
        selection->set_mode (Gtk::SELECTION_MULTIPLE);
        selection->signal_changed().connect (mem_fun (*this, &ProcessorBox::selection_changed));
-
+       
+       processor_display.set_data ("processorbox", this);
        processor_display.set_model (model);
        processor_display.append_column (X_("notshown"), columns.text);
-       processor_display.set_name ("RedirectSelector");
+       processor_display.set_name ("ProcessorSelector");
        processor_display.set_headers_visible (false);
        processor_display.set_reorderable (true);
        processor_display.set_size_request (-1, 40);
        processor_display.get_column(0)->set_sizing(TREE_VIEW_COLUMN_FIXED);
        processor_display.get_column(0)->set_fixed_width(48);
-       processor_display.add_object_drag (columns.processor.index(), "redirects");
-       processor_display.signal_object_drop.connect (mem_fun (*this, &ProcessorBox::object_drop));
+       processor_display.add_object_drag (columns.processor.index(), "processors");
+       processor_display.set_enable_search (false);
+       processor_display.signal_drop.connect (mem_fun (*this, &ProcessorBox::object_drop));
 
        TreeViewColumn* name_col = processor_display.get_column(0);
-       CellRendererText* renderer = dynamic_cast<CellRendererText*>(processor_display.get_column_cell_renderer (0));
+       CellRendererText* renderer = dynamic_cast<CellRendererText*>(
+                       processor_display.get_column_cell_renderer (0));
        name_col->add_attribute(renderer->property_foreground_gdk(), columns.color);
 
        processor_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-       
+
        model->signal_row_deleted().connect (mem_fun (*this, &ProcessorBox::row_deleted));
 
        processor_scroller.add (processor_display);
        processor_eventbox.add (processor_scroller);
-       
+
        processor_scroller.set_size_request (-1, 40);
 
        pack_start (processor_eventbox, true, true);
 
-       _route->processors_changed.connect (mem_fun(*this, &ProcessorBox::redisplay_processors));
-       _route->GoingAway.connect (mem_fun (*this, &ProcessorBox::route_going_away));
-
-       processor_eventbox.signal_enter_notify_event().connect (bind (sigc::ptr_fun (ProcessorBox::enter_box), this));
+       processor_display.signal_enter_notify_event().connect (mem_fun(*this, &ProcessorBox::enter_notify), false);
+       processor_display.signal_leave_notify_event().connect (mem_fun(*this, &ProcessorBox::leave_notify), false);
 
-       processor_display.signal_button_press_event().connect (mem_fun(*this, &ProcessorBox::processor_button_press_event), false);
-       processor_display.signal_button_release_event().connect (mem_fun(*this, &ProcessorBox::processor_button_release_event));
-
-       /* start off as a passthru strip. we'll correct this, if necessary,
-          in update_diskstream_display().
-       */
+       processor_display.signal_key_press_event().connect (mem_fun(*this, &ProcessorBox::processor_key_press_event));
+       processor_display.signal_key_release_event().connect (mem_fun(*this, &ProcessorBox::processor_key_release_event));
 
-       /* now force an update of all the various elements */
-
-       redisplay_processors ();
-       processor_eventbox.show();
-       processor_scroller.show();
-       processor_display.show();
-       show();
+       processor_display.signal_button_press_event().connect (
+               mem_fun(*this, &ProcessorBox::processor_button_press_event), false);
+       processor_display.signal_button_release_event().connect (
+               mem_fun(*this, &ProcessorBox::processor_button_release_event));
 }
 
 ProcessorBox::~ProcessorBox ()
 {
 }
 
+void
+ProcessorBox::set_route (boost::shared_ptr<Route> r)
+{
+       connections.clear ();
+
+       _route = r;
+
+       connections.push_back (_route->processors_changed.connect (
+                       mem_fun(*this, &ProcessorBox::redisplay_processors)));
+       connections.push_back (_route->GoingAway.connect (
+                       mem_fun (*this, &ProcessorBox::route_going_away)));
+       connections.push_back (_route->NameChanged.connect (
+                       mem_fun(*this, &ProcessorBox::route_name_changed)));
+
+       redisplay_processors ();
+}
+
 void
 ProcessorBox::route_going_away ()
 {
@@ -170,22 +195,44 @@ ProcessorBox::route_going_away ()
        no_processor_redisplay = true;
 }
 
+
 void
-ProcessorBox::object_drop (string type, uint32_t cnt, const boost::shared_ptr<Processor>* ptr)
+ProcessorBox::object_drop (const list<boost::shared_ptr<Processor> >& procs, Gtk::TreeView* source, int x, int y, Glib::RefPtr<Gdk::DragContext>& context)
 {
-       if (type != "redirects" || cnt == 0 || !ptr) {
-               return;
-       }
+       TreeIter iter;
+       TreeModel::Path path;
+       TreeViewColumn* column;
+       int cellx;
+       int celly;
+       boost::shared_ptr<Processor> p;
 
-       /* do something with the dropped processors */
+       if (processor_display.get_path_at_pos (x, y, path, column, cellx, celly)) {
+               if ((iter = model->get_iter (path))) {
+                       p = (*iter)[columns.processor];
+               } 
+       }
 
-       list<boost::shared_ptr<Processor> > processors;
-       
-       for (uint32_t n = 0; n < cnt; ++n) {
-               processors.push_back (ptr[n]);
+       for (list<boost::shared_ptr<Processor> >::const_iterator i = procs.begin(); i != procs.end(); ++i) {
+               XMLNode& state = (*i)->get_state ();
+               XMLNodeList nlist;
+               nlist.push_back (&state);
+               paste_processor_state (nlist, p);
+               delete &state;
        }
        
-       paste_processor_list (processors);
+       /* since the treeview doesn't take care of this properly, we have to delete the originals
+          ourselves.
+       */
+
+       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);
+               }
+       }
+
+       context->drag_finish (true, (context->get_suggested_action() == Gdk::ACTION_MOVE), 0);
 }
 
 void
@@ -210,22 +257,26 @@ void
 ProcessorBox::remove_processor_gui (boost::shared_ptr<Processor> processor)
 {
        boost::shared_ptr<Send> send;
-       boost::shared_ptr<PortInsert> port_processor;
+       boost::shared_ptr<Return> retrn;
+       boost::shared_ptr<PortInsert> port_insert;
 
-       if ((port_processor = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
-                       PortInsertUI *io_selector = reinterpret_cast<PortInsertUI *> (port_processor->get_gui());
-                       port_processor->set_gui (0);
-                       delete io_selector;
+       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 
+void
 ProcessorBox::build_send_action_menu ()
-
 {
        using namespace Menu_Helpers;
 
@@ -239,13 +290,11 @@ ProcessorBox::build_send_action_menu ()
 
 void
 ProcessorBox::show_send_controls ()
-
 {
 }
 
 void
 ProcessorBox::new_send ()
-
 {
 }
 
@@ -256,6 +305,12 @@ ProcessorBox::show_processor_menu (gint arg)
                processor_menu = build_processor_menu ();
        }
 
+       Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/processormenu/newplugin"));
+
+       if (plugin_menu_item) {
+               plugin_menu_item->set_submenu (_plugin_selector.plugin_menu());
+       }
+
        paste_action->set_sensitive (!_rr_selection.processors.empty());
 
        processor_menu->popup (1, arg);
@@ -273,6 +328,110 @@ ProcessorBox::processor_drag_end (GdkDragContext *context)
        processor_drag_in_progress = false;
 }
 
+bool
+ProcessorBox::enter_notify (GdkEventCrossing* ev)
+{
+       _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 *ev)
+{
+       /* do real stuff on key release */
+       return false;
+}
+
+bool
+ProcessorBox::processor_key_release_event (GdkEventKey *ev)
+{
+       bool ret = false;
+       ProcSelection targets;
+
+       get_selected_processors (targets);
+
+       if (targets.empty()) {
+
+               int x, y;
+               TreeIter iter;
+               TreeModel::Path path;
+               TreeViewColumn* column;
+               int cellx;
+               int celly;
+               
+               processor_display.get_pointer (x, y);
+               
+               if (processor_display.get_path_at_pos (x, y, path, column, cellx, celly)) {
+                       if ((iter = model->get_iter (path))) {
+                               targets.push_back ((*iter)[columns.processor]);
+                       }
+               }
+       }
+       
+       
+       switch (ev->keyval) {
+       case GDK_c:
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                       copy_processors (targets);
+               }
+               break;
+
+       case GDK_x:
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                       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());
+                       }
+               }
+               break;
+
+       case GDK_Delete:
+       case GDK_BackSpace:
+               delete_processors (targets);
+               ret = true;
+               break;
+
+       case GDK_slash:
+               for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) {
+                       if ((*i)->active()) {
+                               (*i)->deactivate ();
+                       } else {
+                               (*i)->activate ();
+                       }
+               }
+               ret = true;
+               break;
+               
+       default:
+               break;
+       }
+
+       return ret;
+}
+
 bool
 ProcessorBox::processor_button_press_event (GdkEventButton *ev)
 {
@@ -290,23 +449,29 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev)
                        processor = (*iter)[columns.processor];
                        selected = processor_display.get_selection()->is_selected (iter);
                }
-               
+
        }
 
        if (processor && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS))) {
-               
+
                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);
                }
                ret = true;
-               
+
        } else if (processor && ev->button == 1 && selected) {
 
-               // this is purely informational but necessary
-               InsertSelected (processor); // emit
+               // this is purely informational but necessary for route params UI
+               ProcessorSelected (processor); // emit
+
+       } else if (!processor && ev->button == 1 && ev->type == GDK_2BUTTON_PRESS) {
+
+               choose_plugin ();
+               _plugin_selector.show_manager ();
        }
-       
+
+
        return ret;
 }
 
@@ -321,7 +486,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev)
        boost::shared_ptr<Processor> processor;
        int ret = false;
 
-
        if (processor_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
                if ((iter = model->get_iter (path))) {
                        processor = (*iter)[columns.processor];
@@ -329,21 +493,47 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev)
        }
 
        if (processor && Keyboard::is_delete_event (ev)) {
-               
-               Glib::signal_idle().connect (bind (mem_fun(*this, &ProcessorBox::idle_delete_processor), boost::weak_ptr<Processor>(processor)));
+
+               Glib::signal_idle().connect (bind (
+                               mem_fun(*this, &ProcessorBox::idle_delete_processor),
+                               boost::weak_ptr<Processor>(processor)));
                ret = true;
-               
+
        } else if (Keyboard::is_context_menu_event (ev)) {
 
-               show_processor_menu(ev->time);
-               ret = true;
+               /* figure out if we are above or below the fader/amp processor,
+                  and set the next insert position appropriately.
+               */
 
-       } else if (processor && (ev->button == 2) && (Keyboard::no_modifier_keys_pressed (ev) && ((ev->state & Gdk::BUTTON2_MASK) == Gdk::BUTTON2_MASK))) {
+               if (processor) {
+                       if (_route->processor_is_prefader (processor)) {
+                               _placement = PreFader;
+                       } else {
+                               _placement = PostFader;
+                       }
+               } else {
+                       _placement = PostFader;
+               }
                
-               processor->set_active (!processor->active());
+               show_processor_menu (ev->time);
+               ret = true;
+
+       } else if (processor && Keyboard::is_button2_event (ev)
+#ifndef GTKOSX
+                  && (Keyboard::no_modifier_keys_pressed (ev) && ((ev->state & Gdk::BUTTON2_MASK) == Gdk::BUTTON2_MASK))
+#endif
+               ) {
+
+               /* button2-click with no/appropriate modifiers */
+
+               if (processor->active()) {
+                       processor->deactivate ();
+               } else {
+                       processor->activate ();
+               }
                ret = true;
 
-       } 
+       }
 
        return ret;
 }
@@ -381,81 +571,67 @@ ProcessorBox::deselect_all_processors ()
 void
 ProcessorBox::choose_plugin ()
 {
-       sigc::connection newplug_connection = _plugin_selector.PluginCreated.connect (mem_fun(*this,&ProcessorBox::processor_plugin_chosen));
-       _plugin_selector.show_all();
-       _plugin_selector.run ();
-       newplug_connection.disconnect();
+       _plugin_selector.set_interested_object (*this);
 }
 
 void
-ProcessorBox::processor_plugin_chosen (boost::shared_ptr<Plugin> plugin)
+ProcessorBox::use_plugins (const SelectedPlugins& plugins)
 {
-       if (plugin) {
+       for (SelectedPlugins::const_iterator p = plugins.begin(); p != plugins.end(); ++p) {
 
-               boost::shared_ptr<Processor> processor (new PluginInsert (_session, plugin, _placement));
-               
-               Route::ProcessorStreams err;
+               boost::shared_ptr<Processor> processor (new PluginInsert (_session, *p));
+
+               Route::ProcessorStreams err_streams;
+
+               if (Config->get_new_plugins_active()) {
+                       processor->activate ();
+               }
 
-               if (_route->add_processor (processor, &err)) {
-                       weird_plugin_dialog (*plugin, err, _route);
-                       // XXX SHAREDPTR delete plugin here .. do we even need to care? 
+               if (_route->add_processor (processor, _placement, &err_streams)) {
+                       weird_plugin_dialog (**p, err_streams);
+                       // XXX SHAREDPTR delete plugin here .. do we even need to care?
                } else {
-                       processor->ActiveChanged.connect (bind (mem_fun (*this, &ProcessorBox::show_processor_active), boost::weak_ptr<Processor>(processor)));
+
+                       if (Profile->get_sae()) {
+                               processor->activate ();
+                       }
+                       processor->ActiveChanged.connect (bind (
+                                       mem_fun (*this, &ProcessorBox::show_processor_active),
+                                       boost::weak_ptr<Processor>(processor)));
                }
        }
 }
 
 void
-ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams, boost::shared_ptr<IO> io)
+ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 {
        ArdourDialog dialog (_("ardour: weird plugin dialog"));
        Label label;
 
-       /* i hate this kind of code */
-
-       if (streams.count > p.get_info()->n_inputs) {
-               label.set_text (string_compose (_(
-"You attempted to add a plugin (%1).\n"
-"The plugin has %2 inputs\n"
-"but at the processorion point, there are\n"
-"%3 active signal streams.\n"
-"\n"
-"This makes no sense - you are throwing away\n"
-"part of the signal."),
-                                        p.name(),
-                                        p.get_info()->n_inputs.n_total(),
-                                        streams.count.n_total()));
-       } else if (streams.count < p.get_info()->n_inputs) {
-               label.set_text (string_compose (_(
-"You attempted to add a plugin (%1).\n"
-"The plugin has %2 inputs\n"
-"but at the processorion point there are\n"
-"only %3 active signal streams.\n"
-"\n"
-"This makes no sense - unless the plugin supports\n"
-"side-chain inputs. A future version of Ardour will\n"
-"support this type of configuration."),
-                                        p.name(),
-                                        p.get_info()->n_inputs.n_total(),
-                                        streams.count.n_total()));
-       } else {
-               label.set_text (string_compose (_(
-"You attempted to add a plugin (%1).\n"
-"\n"
-"The I/O configuration doesn't make sense:\n"
-"\n" 
-"The plugin has %2 inputs and %3 outputs.\n"
-"The track/bus has %4 inputs and %5 outputs.\n"
-"The processorion point, has %6 active signals.\n"
-"\n"
-"Ardour does not understand what to do in such situations.\n"),
-                                        p.name(),
-                                        p.get_info()->n_inputs.n_total(),
-                                        p.get_info()->n_outputs.n_total(),
-                                        io->n_inputs().n_total(),
-                                        io->n_outputs().n_total(),
-                                        streams.count.n_total()));
+       string text = string_compose(_("You attempted to add the plugin \"%1\" at index %2.\n"),
+                       p.name(), streams.index);
+
+       bool has_midi  = streams.count.n_midi() > 0 || p.get_info()->n_inputs.n_midi() > 0;
+       bool has_audio = streams.count.n_audio() > 0 || p.get_info()->n_inputs.n_audio() > 0;
+
+       text += _("\nThis plugin has:\n");
+       if (has_midi) {
+               text += string_compose("\t%1 ", p.get_info()->n_inputs.n_midi()) + _("MIDI input(s)\n");
        }
+       if (has_audio) {
+               text += string_compose("\t%1 ", p.get_info()->n_inputs.n_audio()) + _("audio input(s)\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");
+       }
+       if (has_audio) {
+               text += string_compose("\t%1 ", streams.count.n_audio()) + _("audio channel(s)\n");
+       }
+
+       text += _("\nArdour is unable to insert this plugin here.\n");
+       label.set_text(text);
 
        dialog.get_vbox()->pack_start (label);
        dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
@@ -469,63 +645,140 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams, b
 }
 
 void
-ProcessorBox::choose_processor ()
+ProcessorBox::choose_insert ()
 {
-       boost::shared_ptr<Processor> processor (new PortInsert (_session, _placement));
-       processor->ActiveChanged.connect (bind (mem_fun(*this, &ProcessorBox::show_processor_active), boost::weak_ptr<Processor>(processor)));
-       _route->add_processor (processor);
+       boost::shared_ptr<Processor> processor (new PortInsert (_session, _route->mute_master()));
+       processor->ActiveChanged.connect (bind (mem_fun(*this, &ProcessorBox::show_processor_active),
+                                               boost::weak_ptr<Processor>(processor)));
+
+       _route->add_processor (processor, _placement);
 }
 
 void
 ProcessorBox::choose_send ()
 {
-       boost::shared_ptr<Send> send (new Send (_session, _placement));
-       //send->set_default_type(_route->default_type());
-
-       ChanCount outs;
+       boost::shared_ptr<Send> send (new Send (_session, _route->mute_master()));
 
        /* make an educated guess at the initial number of outputs for the send */
+       ChanCount outs = (_session.master_out())
+                       ? _session.master_out()->n_outputs()
+                       : _route->n_outputs();
+
+       /* XXX need processor lock on route */
+       try {
+               send->output()->ensure_io (outs, false, this);
+       } catch (AudioEngine::PortRegistrationFailure& err) {
+               error << string_compose (_("Cannot set up new send: %1"), err.what()) << endmsg;
+               return;
+       }
 
-       if (_session.master_out()) {
-               outs = _session.master_out()->n_outputs();
-       } else {
-               outs = _route->n_outputs();
+       /* let the user adjust the IO setup before creation */
+       IOSelectorWindow *ios = new IOSelectorWindow (_session, send->output(), true);
+       ios->show_all ();
+
+       /* keep a reference to the send so it doesn't get deleted while
+          the IOSelectorWindow is doing its stuff */
+       _processor_being_created = send;
+
+       ios->selector().Finished.connect (bind (
+                       mem_fun(*this, &ProcessorBox::send_io_finished),
+                       boost::weak_ptr<Processor>(send), ios));
+}
+
+void
+ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr<Processor> weak_processor, IOSelectorWindow* ios)
+{
+       boost::shared_ptr<Processor> processor (weak_processor.lock());
+
+       /* drop our temporary reference to the new send */
+       _processor_being_created.reset ();
+
+       if (!processor) {
+               return;
        }
 
-       send->io()->ensure_io (ChanCount::ZERO, outs, false, this);
+       switch (r) {
+       case IOSelector::Cancelled:
+               // processor will go away when all shared_ptrs to it vanish
+               break;
 
-       SendUIWindow* gui = new SendUIWindow (send, _session);
-       
-       /* let the user adjust the output setup (number and connections) before passing
-          it along to the Route
-       */
-       
-       gui->show_all ();
-       gui->present ();
+       case IOSelector::Accepted:
+               _route->add_processor (processor, _placement);
+               if (Profile->get_sae()) {
+                       processor->activate ();
+               }
+               break;
+       }
+
+       delete_when_idle (ios);
+}
+
+void
+ProcessorBox::choose_return ()
+{
+       boost::shared_ptr<Return> retrn (new Return (_session));
+
+       /* assume user just wants a single audio input (sidechain) by default */
+       ChanCount ins(DataType::AUDIO, 1);
+
+       /* XXX need processor lock on route */
+       try {
+               retrn->input()->ensure_io (ins, false, this);
+       } catch (AudioEngine::PortRegistrationFailure& err) {
+               error << string_compose (_("Cannot set up new return: %1"), err.what()) << endmsg;
+               return;
+       }
 
-       /* pass shared_ptr, it will go out of scope when the GUI is deleted */
-       /* also, connect it *before* existing handlers so that its definitely executed */
+       /* let the user adjust the IO setup before creation */
+       IOSelectorWindow *ios = new IOSelectorWindow (_session, retrn->output(), true);
+       ios->show_all ();
 
-       gui->signal_delete_event().connect (bind (mem_fun(*this, &ProcessorBox::send_io_finished), send, gui), false);
+       /* keep a reference to the send so it doesn't get deleted while
+          the IOSelectorWindow is doing its stuff */
+       _processor_being_created = retrn;
+
+       ios->selector().Finished.connect (bind (
+                       mem_fun(*this, &ProcessorBox::return_io_finished),
+                       boost::weak_ptr<Processor>(retrn), ios));
 }
 
-bool
-ProcessorBox::send_io_finished (GdkEventAny* ev, boost::shared_ptr<Send> send, SendUIWindow* sui)
+void
+ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptr<Processor> weak_processor, IOSelectorWindow* ios)
 {
-       _route->add_processor (send);
-       delete sui;
-       return false;
+       boost::shared_ptr<Processor> processor (weak_processor.lock());
+
+       /* drop our temporary reference to the new return */
+       _processor_being_created.reset ();
+
+       if (!processor) {
+               return;
+       }
+
+       switch (r) {
+       case IOSelector::Cancelled:
+               // processor will go away when all shared_ptrs to it vanish
+               break;
+
+       case IOSelector::Accepted:
+               _route->add_processor (processor, _placement);
+               if (Profile->get_sae()) {
+                       processor->activate ();
+               }
+               break;
+       }
+
+       delete_when_idle (ios);
 }
 
 void
 ProcessorBox::redisplay_processors ()
 {
-       ENSURE_GUI_THREAD(mem_fun(*this, &ProcessorBox::redisplay_processors));
+       ENSURE_GUI_THREAD (mem_fun(*this, &ProcessorBox::redisplay_processors));
 
        if (no_processor_redisplay) {
                return;
        }
-       
+
        ignore_delete = true;
        model->clear ();
        ignore_delete = false;
@@ -533,34 +786,35 @@ ProcessorBox::redisplay_processors ()
        processor_active_connections.clear ();
        processor_name_connections.clear ();
 
-       void (ProcessorBox::*pmf)(boost::shared_ptr<Processor>) = &ProcessorBox::add_processor_to_display;
-       _route->foreach_processor (this, pmf);
+       _route->foreach_processor (mem_fun (*this, &ProcessorBox::add_processor_to_display));
 
-       switch (_placement) {
-       case PreFader:
-               build_processor_tooltip(processor_eventbox, _("Pre-fader processors, sends & plugins:"));
-               break;
-       case PostFader:
-               build_processor_tooltip(processor_eventbox, _("Post-fader processors, sends & plugins:"));
-               break;
-       }
+       build_processor_tooltip (processor_eventbox, _("Inserts, sends & plugins:"));
 }
 
 void
-ProcessorBox::add_processor_to_display (boost::shared_ptr<Processor> processor)
+ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
 {
-       if (processor->placement() != _placement) {
+       boost::shared_ptr<Processor> processor (p.lock ());
+       if (!processor) {
                return;
        }
-       
+
+       if (!processor->visible()) {
+               return;
+       }
+
        Gtk::TreeModel::Row row = *(model->append());
        row[columns.text] = processor_name (processor);
        row[columns.processor] = processor;
 
        show_processor_active (processor);
 
-       processor_active_connections.push_back (processor->ActiveChanged.connect (bind (mem_fun(*this, &ProcessorBox::show_processor_active), boost::weak_ptr<Processor>(processor))));
-       processor_name_connections.push_back (processor->NameChanged.connect (bind (mem_fun(*this, &ProcessorBox::show_processor_name), boost::weak_ptr<Processor>(processor))));
+       processor_active_connections.push_back (processor->ActiveChanged.connect (bind (
+                       mem_fun(*this, &ProcessorBox::show_processor_active),
+                       boost::weak_ptr<Processor>(processor))));
+       processor_name_connections.push_back (processor->NameChanged.connect (bind (
+                       mem_fun(*this, &ProcessorBox::show_processor_name),
+                       boost::weak_ptr<Processor>(processor))));
 }
 
 string
@@ -579,7 +833,8 @@ ProcessorBox::processor_name (boost::weak_ptr<Processor> weak_processor)
                name_display = " (";
        }
 
-       if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
+       if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0 && 
+           !boost::dynamic_pointer_cast<InternalSend>(processor)) {
 
                name_display += '>';
 
@@ -588,7 +843,7 @@ ProcessorBox::processor_name (boost::weak_ptr<Processor> weak_processor)
                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);
@@ -602,10 +857,10 @@ ProcessorBox::processor_name (boost::weak_ptr<Processor> weak_processor)
 
                switch (_width) {
                case Wide:
-                       name_display += processor->name();
+                       name_display += processor->display_name();
                        break;
                case Narrow:
-                       name_display += PBD::short_version (processor->name(), 5);
+                       name_display += PBD::short_version (processor->display_name(), 5);
                        break;
                }
 
@@ -627,11 +882,7 @@ ProcessorBox::build_processor_tooltip (EventBox& box, string start)
        for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
                Gtk::TreeModel::Row row = *iter;
                tip += '\n';
-
-               /* don't use the column text, since it may be narrowed */
-
-               boost::shared_ptr<Processor> i = row[columns.processor];
-               tip += i->name();
+               tip += row[columns.text];
        }
        ARDOUR_UI::instance()->tooltips().set_tip (box, tip);
 }
@@ -646,14 +897,14 @@ ProcessorBox::show_processor_name (boost::weak_ptr<Processor> processor)
 void
 ProcessorBox::show_processor_active (boost::weak_ptr<Processor> weak_processor)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &ProcessorBox::show_processor_active), weak_processor));
-       
        boost::shared_ptr<Processor> processor (weak_processor.lock());
-       
+
        if (!processor) {
                return;
        }
 
+       ENSURE_GUI_THREAD(bind (mem_fun(*this, &ProcessorBox::show_processor_active), weak_processor));
+
        Gtk::TreeModel::Children children = model->children();
        Gtk::TreeModel::Children::iterator iter = children.begin();
 
@@ -663,7 +914,7 @@ ProcessorBox::show_processor_active (boost::weak_ptr<Processor> weak_processor)
 
                if (r == processor) {
                        (*iter)[columns.text] = processor_name (r);
-                       
+
                        if (processor->active()) {
                                (*iter)[columns.color] = *active_processor_color;
                        } else {
@@ -687,16 +938,17 @@ ProcessorBox::row_deleted (const Gtk::TreeModel::Path& path)
 void
 ProcessorBox::compute_processor_sort_keys ()
 {
-       uint32_t sort_key = 0;
        Gtk::TreeModel::Children children = model->children();
+       Route::ProcessorList our_processors;
 
        for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
-               boost::shared_ptr<Processor> i = (*iter)[columns.processor];
-               i->set_sort_key (sort_key);
-               sort_key++;
+               boost::shared_ptr<Processor> p = (*iter)[columns.processor];
+               our_processors.push_back ((*iter)[columns.processor]);
        }
 
-       if (_route->sort_processors ()) {
+       if (_route->reorder_processors (our_processors)) {
+
+               /* reorder failed, so redisplay */
 
                redisplay_processors ();
 
@@ -725,15 +977,15 @@ outputs do not work correctly."));
 void
 ProcessorBox::rename_processors ()
 {
-       vector<boost::shared_ptr<Processor> > to_be_renamed;
-       
+       ProcSelection to_be_renamed;
+
        get_selected_processors (to_be_renamed);
 
        if (to_be_renamed.empty()) {
                return;
        }
 
-       for (vector<boost::shared_ptr<Processor> >::iterator i = to_be_renamed.begin(); i != to_be_renamed.end(); ++i) {
+       for (ProcSelection::iterator i = to_be_renamed.begin(); i != to_be_renamed.end(); ++i) {
                rename_processor (*i);
        }
 }
@@ -741,35 +993,44 @@ ProcessorBox::rename_processors ()
 void
 ProcessorBox::cut_processors ()
 {
-       vector<boost::shared_ptr<Processor> > to_be_removed;
-       XMLNode* node = new XMLNode (X_("cut"));
+       ProcSelection to_be_removed;
 
        get_selected_processors (to_be_removed);
+}
 
+void
+ProcessorBox::cut_processors (const ProcSelection& to_be_removed)
+{
        if (to_be_removed.empty()) {
                return;
        }
 
+       XMLNode* node = new XMLNode (X_("cut"));
+       Route::ProcessorList to_cut;
+
        no_processor_redisplay = true;
-       for (vector<boost::shared_ptr<Processor> >::iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) {
-               // Do not cut inserts or sends
+       for (ProcSelection::const_iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) {
+               // Cut only plugins, sends and returns
+               if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0 ||
+                   (boost::dynamic_pointer_cast<Send>((*i)) != 0) ||
+                   (boost::dynamic_pointer_cast<Return>((*i)) != 0)) {
 
-               if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0) {
                        void* gui = (*i)->get_gui ();
-               
+
                        if (gui) {
                                static_cast<Gtk::Widget*>(gui)->hide ();
                        }
-                       
-                       XMLNode& child ((*i)->get_state());
 
-                       if (_route->remove_processor (*i) == 0) {
-                               /* success */
-                               node->add_child_nocopy (child);
-                       } else {
-                               delete &child;
-                       }
-               } 
+                       XMLNode& child ((*i)->get_state());
+                       node->add_child_nocopy (child);
+                       to_cut.push_back (*i);
+               }
+       }
+               
+       if (_route->remove_processors (to_cut) != 0) {
+               delete node;
+               no_processor_redisplay = false;
+               return;
        }
 
        _rr_selection.set (node);
@@ -781,18 +1042,25 @@ ProcessorBox::cut_processors ()
 void
 ProcessorBox::copy_processors ()
 {
-       vector<boost::shared_ptr<Processor> > to_be_copied;
-       XMLNode* node = new XMLNode (X_("copy"));
-
+       ProcSelection to_be_copied;
        get_selected_processors (to_be_copied);
+       copy_processors (to_be_copied);
+}
 
+void
+ProcessorBox::copy_processors (const ProcSelection& to_be_copied)
+{
        if (to_be_copied.empty()) {
                return;
        }
 
-       for (vector<boost::shared_ptr<Processor> >::iterator i = to_be_copied.begin(); i != to_be_copied.end(); ++i) {
-               // Do not copy processors or sends
-               if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0) {
+       XMLNode* node = new XMLNode (X_("copy"));
+
+       for (ProcSelection::const_iterator i = to_be_copied.begin(); i != to_be_copied.end(); ++i) {
+               // Copy only plugins, sends, returns
+               if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0 ||
+                   (boost::dynamic_pointer_cast<Send>((*i)) != 0) ||
+                   (boost::dynamic_pointer_cast<Return>((*i)) != 0)) {
                        node->add_child_nocopy ((*i)->get_state());
                }
        }
@@ -803,18 +1071,24 @@ ProcessorBox::copy_processors ()
 void
 ProcessorBox::delete_processors ()
 {
-       vector<boost::shared_ptr<Processor> > to_be_deleted;
-       
+       ProcSelection to_be_deleted;
        get_selected_processors (to_be_deleted);
+       delete_processors (to_be_deleted);
+}
 
-       if (to_be_deleted.empty()) {
+void
+ProcessorBox::delete_processors (const ProcSelection& targets)
+{
+       if (targets.empty()) {
                return;
        }
 
-       for (vector<boost::shared_ptr<Processor> >::iterator i = to_be_deleted.begin(); i != to_be_deleted.end(); ++i) {
-               
+       no_processor_redisplay = true;
+
+       for (ProcSelection::const_iterator i = targets.begin(); i != targets.end(); ++i) {
+
                void* gui = (*i)->get_gui ();
-               
+
                if (gui) {
                        static_cast<Gtk::Widget*>(gui)->hide ();
                }
@@ -826,6 +1100,27 @@ ProcessorBox::delete_processors ()
        redisplay_processors ();
 }
 
+void
+ProcessorBox::delete_dragged_processors (const list<boost::shared_ptr<Processor> >& procs)
+{
+       list<boost::shared_ptr<Processor> >::const_iterator x;
+
+       no_processor_redisplay = true;
+       for (x = procs.begin(); x != procs.end(); ++x) {
+
+               void* gui = (*x)->get_gui ();
+
+               if (gui) {
+                       static_cast<Gtk::Widget*>(gui)->hide ();
+               }
+               
+               _route->remove_processor(*x);
+       }
+
+       no_processor_redisplay = false;
+       redisplay_processors ();
+}
+
 gint
 ProcessorBox::idle_delete_processor (boost::weak_ptr<Processor> weak_processor)
 {
@@ -862,7 +1157,7 @@ ProcessorBox::rename_processor (boost::shared_ptr<Processor> processor)
         name_prompter.get_result (result);
         if (result.length()) {
                        processor->set_name (result);
-               }       
+               }
                break;
        }
 
@@ -876,61 +1171,76 @@ ProcessorBox::paste_processors ()
                return;
        }
 
-       cerr << "paste from node called " << _rr_selection.processors.get_node().name() << endl;
-
-       paste_processor_state (_rr_selection.processors.get_node());
+       paste_processor_state (_rr_selection.processors.get_node().children(), boost::shared_ptr<Processor>());
 }
 
 void
-ProcessorBox::paste_processor_list (list<boost::shared_ptr<Processor> >& processors)
+ProcessorBox::paste_processors (boost::shared_ptr<Processor> before)
 {
-       list<boost::shared_ptr<Processor> > copies;
-       
-       for (list<boost::shared_ptr<Processor> >::iterator i = processors.begin(); i != processors.end(); ++i) {
-               
-               boost::shared_ptr<Processor> copy = Processor::clone (*i);
-               
-               copy->set_placement (_placement);
-               copies.push_back (copy);
-       }
-
-       if (_route->add_processors (copies)) {
 
-               string msg = _(
-                       "Copying the set of processors on the clipboard failed,\n\
-probably because the I/O configuration of the plugins\n\
-could not match the configuration of this track.");
-               MessageDialog am (msg);
-               am.run ();
+       if (_rr_selection.processors.empty()) {
+               return;
        }
+
+       paste_processor_state (_rr_selection.processors.get_node().children(), before);
 }
 
 void
-ProcessorBox::paste_processor_state (const XMLNode& node)
+ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr<Processor> p)
 {
-       XMLNodeList nlist;
        XMLNodeConstIterator niter;
        list<boost::shared_ptr<Processor> > copies;
 
-       nlist = node.children();
-
-       cerr << "Pasting processor selection containing " << nlist.size() << endl;
-
        if (nlist.empty()) {
                return;
        }
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               cerr << "try using " << (*niter)->name() << endl;
+
+               XMLProperty const * type = (*niter)->property ("type");
+               assert (type);
+
+               boost::shared_ptr<Processor> p;
                try {
-                       copies.push_back (boost::shared_ptr<Processor> (new PluginInsert (_session, **niter)));
+                       if (type->value() == "meter" || 
+                           type->value() == "main-outs" ||
+                           type->value() == "amp" ||
+                           type->value() == "intsend" || type->value() == "intreturn") {
+                               /* do not paste meter, main outs, amp or internal send/returns */
+                               continue;
+
+                       } else if (type->value() == "send") {
+                               
+                               XMLNode n (**niter);
+                               Send::make_unique (n, _session);
+                               p.reset (new Send (_session, _route->mute_master(), n));
+
+                       } else if (type->value() == "return") {
+
+                               XMLNode n (**niter);
+                               Return::make_unique (n, _session);
+                               p.reset (new Return (_session, **niter));
+                               
+                       } else {
+                               /* XXX its a bit limiting to assume that everything else
+                                  is a plugin.
+                               */
+                               p.reset (new PluginInsert (_session, **niter));
+                       }
+
+                       copies.push_back (p);
                }
+
                catch (...) {
                        cerr << "plugin insert constructor failed\n";
                }
        }
 
-       if (_route->add_processors (copies)) {
+       if (copies.empty()) {
+               return;
+       }
+
+       if (_route->add_processors (copies, p)) {
 
                string msg = _(
                        "Copying the set of processors on the clipboard failed,\n\
@@ -944,50 +1254,33 @@ could not match the configuration of this track.");
 void
 ProcessorBox::activate_processor (boost::shared_ptr<Processor> r)
 {
-       r->set_active (true);
+       r->activate ();
 }
 
 void
 ProcessorBox::deactivate_processor (boost::shared_ptr<Processor> r)
 {
-       r->set_active (false);
+       r->deactivate ();
 }
 
 void
-ProcessorBox::get_selected_processors (vector<boost::shared_ptr<Processor> >& processors)
+ProcessorBox::get_selected_processors (ProcSelection& processors)
 {
     vector<Gtk::TreeModel::Path> pathlist = processor_display.get_selection()->get_selected_rows();
+
     for (vector<Gtk::TreeModel::Path>::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter) {
            processors.push_back ((*(model->get_iter(*iter)))[columns.processor]);
     }
 }
 
 void
-ProcessorBox::for_selected_processors (void (ProcessorBox::*pmf)(boost::shared_ptr<Processor>))
+ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(boost::shared_ptr<Processor>))
 {
     vector<Gtk::TreeModel::Path> pathlist = processor_display.get_selection()->get_selected_rows();
 
        for (vector<Gtk::TreeModel::Path>::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter) {
                boost::shared_ptr<Processor> processor = (*(model->get_iter(*iter)))[columns.processor];
-               (this->*pmf)(processor);
-       }
-}
-
-void
-ProcessorBox::clone_processors ()
-{
-       RouteSelection& routes (_rr_selection.routes);
-
-       if (!routes.empty()) {
-               if (_route->copy_processors (*routes.front(), _placement)) {
-                       string msg = _(
-"Copying the set of processors on the clipboard failed,\n\
-probably because the I/O configuration of the plugins\n\
-could not match the configuration of this track.");
-                       MessageDialog am (msg);
-                       am.run ();
-               }
+               (this->*method)(processor);
        }
 }
 
@@ -997,16 +1290,6 @@ ProcessorBox::all_processors_active (bool state)
        _route->all_processors_active (_placement, state);
 }
 
-void
-ProcessorBox::all_plugins_active (bool state)
-{
-       if (state) {
-               // XXX not implemented
-       } else {
-               _route->disable_plugins (_placement);
-       }
-}
-
 void
 ProcessorBox::ab_plugins ()
 {
@@ -1014,28 +1297,39 @@ ProcessorBox::ab_plugins ()
        ab_direction = !ab_direction;
 }
 
+
 void
 ProcessorBox::clear_processors ()
 {
        string prompt;
        vector<string> choices;
 
-       if (boost::dynamic_pointer_cast<AudioTrack>(_route) != 0) {
-               if (_placement == PreFader) {
-                       prompt = _("Do you really want to remove all pre-fader processors from this track?\n"
-                                  "(this cannot be undone)");
-               } else {
-                       prompt = _("Do you really want to remove all post-fader processors from this track?\n"
-                                  "(this cannot be undone)");
-               }
+       prompt = string_compose (_("Do you really want to remove all processors from %1?\n"
+                                  "(this cannot be undone)"), _route->name());
+       
+       choices.push_back (_("Cancel"));
+       choices.push_back (_("Yes, remove them all"));
+
+       Gtkmm2ext::Choice prompter (prompt, choices);
+
+       if (prompter.run () == 1) {
+               _route->clear_processors (PreFader);
+               _route->clear_processors (PostFader);
+       }
+}
+
+void
+ProcessorBox::clear_processors (Placement p)
+{
+       string prompt;
+       vector<string> choices;
+
+       if (p == PreFader) {
+               prompt = string_compose (_("Do you really want to remove all pre-fader processors from %1?\n"
+                                          "(this cannot be undone)"), _route->name());
        } else {
-               if (_placement == PreFader) {
-                       prompt = _("Do you really want to remove all pre-fader processors from this bus?\n"
-                                  "(this cannot be undone)");
-               } else {
-                       prompt = _("Do you really want to remove all post-fader processors from this bus?\n"
-                                  "(this cannot be undone)");
-               }
+               prompt = string_compose (_("Do you really want to remove all post-fader processors from %1?\n"
+                                          "(this cannot be undone)"), _route->name());
        }
 
        choices.push_back (_("Cancel"));
@@ -1044,7 +1338,7 @@ ProcessorBox::clear_processors ()
        Gtkmm2ext::Choice prompter (prompt, choices);
 
        if (prompter.run () == 1) {
-               _route->clear_processors (_placement);
+               _route->clear_processors (p);
        }
 }
 
@@ -1052,8 +1346,10 @@ void
 ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 {
        boost::shared_ptr<Send> send;
-       boost::shared_ptr<PluginInsert> plugin_processor;
-       boost::shared_ptr<PortInsert> port_processor;
+       boost::shared_ptr<Return> retrn;
+       boost::shared_ptr<PluginInsert> plugin_insert;
+       boost::shared_ptr<PortInsert> port_insert;
+       Window* gidget = 0;
 
        if (boost::dynamic_pointer_cast<AudioTrack>(_route) != 0) {
 
@@ -1061,17 +1357,17 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
                        return;
                }
        }
-       
+
        if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
-               
+
                if (!_session.engine().connected()) {
                        return;
                }
 
+#ifdef OLD_SEND_EDITING
                SendUIWindow *send_ui;
-               
+
                if (send->get_gui() == 0) {
-                       
                        send_ui = new SendUIWindow (send, _session);
 
                        WindowTitle title(Glib::get_application_name());
@@ -1079,77 +1375,72 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
                        send_ui->set_title (title.get_string());
 
                        send->set_gui (send_ui);
-                       
+
                } else {
                        send_ui = reinterpret_cast<SendUIWindow *> (send->get_gui());
                }
-               
-               if (send_ui->is_visible()) {
-                       send_ui->get_window()->raise ();
+
+               gidget = send_ui;
+#else
+               if (_parent_strip) {
+                       _parent_strip->gain_meter().set_controls (_route, send->meter(), send->amp()->gain_control(), send->amp());
+                       _parent_strip->panner_ui().set_panner (send->panner());
+               }
+#endif
+       
+       } else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {
+
+               if (!_session.engine().connected()) {
+                       return;
+               }
+
+               boost::shared_ptr<Return> retrn = boost::dynamic_pointer_cast<Return> (processor);
+
+               ReturnUIWindow *return_ui;
+
+               if (retrn->get_gui() == 0) {
+
+                       return_ui = new ReturnUIWindow (retrn, _session);
+
+                       WindowTitle title(Glib::get_application_name());
+                       title += retrn->name();
+                       return_ui->set_title (title.get_string());
+
+                       send->set_gui (return_ui);
+
                } else {
-                       send_ui->show_all ();
-                       send_ui->present ();
+                       return_ui = reinterpret_cast<ReturnUIWindow *> (retrn->get_gui());
                }
-               
-       } else if ((plugin_processor = boost::dynamic_pointer_cast<PluginInsert> (processor)) != 0) {
-                       
-                       ARDOUR::PluginType type = plugin_processor->type();
-
-                       if (type == ARDOUR::LADSPA || type == ARDOUR::VST) {
-                               PluginUIWindow *plugin_ui;
-                       
-                               if (plugin_processor->get_gui() == 0) {
-                                                               
-                                       plugin_ui = new PluginUIWindow (plugin_processor, _session.frame_rate(), _session.engine().frames_per_cycle());
-
-                                       if (_owner_is_mixer) {
-                                               ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui);
-                                       } else {
-                                               ARDOUR_UI::instance()->the_editor().ensure_float (*plugin_ui);
-                                       }
-
-                                       WindowTitle title(Glib::get_application_name());
-                                       title += generate_processor_title (plugin_processor);
-                                       plugin_ui->set_title (title.get_string());
-
-                                       plugin_processor->set_gui (plugin_ui);
-                                       
-                                       // change window title when route name is changed
-                                       _route->NameChanged.connect (bind (mem_fun(*this, &ProcessorBox::route_name_changed), plugin_ui, boost::weak_ptr<PluginInsert> (plugin_processor)));
-                                       
-                               
-                               } else {
-                                       plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_processor->get_gui());
-                               }
-                       
-                               if (plugin_ui->is_visible()) {
-                                       plugin_ui->get_window()->raise ();
-                               } else {
-                                       plugin_ui->show_all ();
-                                       plugin_ui->present ();
-                               }
-#ifdef HAVE_AUDIOUNIT
-                       } else if (type == ARDOUR::AudioUnit) {
-                               AUPluginUI* plugin_ui;
-                               if (plugin_processor->get_gui() == 0) {
-                                       plugin_ui = new AUPluginUI (plugin_processor);
-                               } else {
-                                       plugin_ui = reinterpret_cast<AUPluginUI*> (plugin_processor->get_gui());
-                               }
-                               
-                               if (plugin_ui->is_visible()) {
-                                       plugin_ui->get_window()->raise ();
-                               } else {
-                                       plugin_ui->show_all ();
-                                       plugin_ui->present ();
-                               }
-#endif                         
-                       } else {
-                               warning << "Unsupported plugin sent to ProcessorBox::edit_processor()" << endmsg;
-                               return;
-                       }
 
-       } else if ((port_processor = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
+               gidget = return_ui;
+
+       } else if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor)) != 0) {
+
+               PluginUIWindow *plugin_ui;
+
+               /* these are both allowed to be null */
+
+               Container* toplevel = get_toplevel();
+               Window* win = dynamic_cast<Gtk::Window*>(toplevel);
+
+               if (plugin_insert->get_gui() == 0) {
+
+                       plugin_ui = new PluginUIWindow (win, plugin_insert);
+
+                       WindowTitle title(Glib::get_application_name());
+                       title += generate_processor_title (plugin_insert);
+                       plugin_ui->set_title (title.get_string());
+
+                       plugin_insert->set_gui (plugin_ui);
+
+               } else {
+                       plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_insert->get_gui());
+                       plugin_ui->set_parent (win);
+               }
+
+               gidget = plugin_ui;
+
+       } else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
 
                if (!_session.engine().connected()) {
                        MessageDialog msg ( _("Not connected to JACK - no I/O changes are possible"));
@@ -1159,38 +1450,25 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 
                PortInsertWindow *io_selector;
 
-               if (port_processor->get_gui() == 0) {
-                       io_selector = new PortInsertWindow (_session, port_processor);
-                       port_processor->set_gui (io_selector);
+               if (port_insert->get_gui() == 0) {
+                       io_selector = new PortInsertWindow (_session, port_insert);
+                       port_insert->set_gui (io_selector);
 
                } else {
-                       io_selector = reinterpret_cast<PortInsertWindow *> (port_processor->get_gui());
+                       io_selector = reinterpret_cast<PortInsertWindow *> (port_insert->get_gui());
                }
 
-               if (io_selector->is_visible()) {
-                       io_selector->get_window()->raise ();
-               } else {
-                       io_selector->show_all ();
-                       io_selector->present ();
-               }
+               gidget = io_selector;
        }
-}
 
-bool
-ProcessorBox::enter_box (GdkEventCrossing *ev, ProcessorBox* rb)
-{
-       switch (ev->detail) {
-       case GDK_NOTIFY_INFERIOR:
-               break;
-
-       case GDK_NOTIFY_VIRTUAL:
-               /* fallthru */
-
-       default:
-               _current_processor_box = rb;
+       if (gidget) {
+               if (gidget->is_visible()) {
+                       gidget->get_window()->raise ();
+               } else {
+                       gidget->show_all ();
+                       gidget->present ();
+               }
        }
-
-       return false;
 }
 
 void
@@ -1200,48 +1478,66 @@ ProcessorBox::register_actions ()
        Glib::RefPtr<Action> act;
 
        /* new stuff */
-       ActionManager::register_action (popup_act_grp, X_("newplugin"), _("New Plugin ..."),  sigc::ptr_fun (ProcessorBox::rb_choose_plugin));
+       ActionManager::register_action (popup_act_grp, X_("newplugin"), _("New Plugin"),
+                       sigc::ptr_fun (ProcessorBox::rb_choose_plugin));
 
-       act = ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"),  sigc::ptr_fun (ProcessorBox::rb_choose_processor));
+       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 ..."),  sigc::ptr_fun (ProcessorBox::rb_choose_send));
+       act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New Send ..."),
+                       sigc::ptr_fun (ProcessorBox::rb_choose_send));
+       ActionManager::jack_sensitive_actions.push_back (act);
+       act = ActionManager::register_action (popup_act_grp, X_("newreturn"), _("New Return ..."),
+                       sigc::ptr_fun (ProcessorBox::rb_choose_return));
        ActionManager::jack_sensitive_actions.push_back (act);
 
-       ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear"),  sigc::ptr_fun (ProcessorBox::rb_clear));
+       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)"),
+                       sigc::ptr_fun (ProcessorBox::rb_clear_pre));
+       ActionManager::register_action (popup_act_grp, X_("clear_post"), _("Clear (post-fader)"),
+                       sigc::ptr_fun (ProcessorBox::rb_clear_post));
 
        /* standard editing stuff */
-       act = ActionManager::register_action (popup_act_grp, X_("cut"), _("Cut"),  sigc::ptr_fun (ProcessorBox::rb_cut));
+       act = ActionManager::register_action (popup_act_grp, X_("cut"), _("Cut"),
+                       sigc::ptr_fun (ProcessorBox::rb_cut));
        ActionManager::plugin_selection_sensitive_actions.push_back(act);
-       act = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"),  sigc::ptr_fun (ProcessorBox::rb_copy));
+       act = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"),
+                       sigc::ptr_fun (ProcessorBox::rb_copy));
        ActionManager::plugin_selection_sensitive_actions.push_back(act);
 
-       act = ActionManager::register_action (popup_act_grp, X_("delete"), _("Delete"),  sigc::ptr_fun (ProcessorBox::rb_delete));
+       act = ActionManager::register_action (popup_act_grp, X_("delete"), _("Delete"),
+                       sigc::ptr_fun (ProcessorBox::rb_delete));
        ActionManager::plugin_selection_sensitive_actions.push_back(act); // ??
 
-       paste_action = ActionManager::register_action (popup_act_grp, X_("paste"), _("Paste"),  sigc::ptr_fun (ProcessorBox::rb_paste));
-       act = ActionManager::register_action (popup_act_grp, X_("rename"), _("Rename"),  sigc::ptr_fun (ProcessorBox::rb_rename));
+       paste_action = ActionManager::register_action (popup_act_grp, X_("paste"), _("Paste"),
+                       sigc::ptr_fun (ProcessorBox::rb_paste));
+       act = ActionManager::register_action (popup_act_grp, X_("rename"), _("Rename"),
+                       sigc::ptr_fun (ProcessorBox::rb_rename));
        ActionManager::plugin_selection_sensitive_actions.push_back(act);
-       ActionManager::register_action (popup_act_grp, X_("selectall"), _("Select All"),  sigc::ptr_fun (ProcessorBox::rb_select_all));
-       ActionManager::register_action (popup_act_grp, X_("deselectall"), _("Deselect All"),  sigc::ptr_fun (ProcessorBox::rb_deselect_all));
-               
+       ActionManager::register_action (popup_act_grp, X_("selectall"), _("Select All"),
+                       sigc::ptr_fun (ProcessorBox::rb_select_all));
+       ActionManager::register_action (popup_act_grp, X_("deselectall"), _("Deselect All"),
+                       sigc::ptr_fun (ProcessorBox::rb_deselect_all));
+
        /* activation */
-       act = ActionManager::register_action (popup_act_grp, X_("activate"), _("Activate"),  sigc::ptr_fun (ProcessorBox::rb_activate));
+       act = ActionManager::register_action (popup_act_grp, X_("activate"), _("Activate"),
+                       sigc::ptr_fun (ProcessorBox::rb_activate));
        ActionManager::plugin_selection_sensitive_actions.push_back(act);
-       act = ActionManager::register_action (popup_act_grp, X_("deactivate"), _("Deactivate"),  sigc::ptr_fun (ProcessorBox::rb_deactivate));
+       act = ActionManager::register_action (popup_act_grp, X_("deactivate"), _("Deactivate"),
+                       sigc::ptr_fun (ProcessorBox::rb_deactivate));
        ActionManager::plugin_selection_sensitive_actions.push_back(act);
-       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_("a_b_plugins"), _("A/B plugins"),  sigc::ptr_fun (ProcessorBox::rb_ab_plugins));
-       ActionManager::register_action (popup_act_grp, X_("deactivate_plugins"), _("Deactivate plugins"),  sigc::ptr_fun (ProcessorBox::rb_deactivate_plugins));
+       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));
 
        /* show editors */
-       act = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit"),  sigc::ptr_fun (ProcessorBox::rb_edit));
+       act = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit"),
+                       sigc::ptr_fun (ProcessorBox::rb_edit));
        ActionManager::plugin_selection_sensitive_actions.push_back(act);
 
        ActionManager::add_action_group (popup_act_grp);
-
-
 }
 
 void
@@ -1254,12 +1550,12 @@ ProcessorBox::rb_choose_plugin ()
 }
 
 void
-ProcessorBox::rb_choose_processor ()
+ProcessorBox::rb_choose_insert ()
 {
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->choose_processor ();
+       _current_processor_box->choose_insert ();
 }
 
 void
@@ -1271,6 +1567,15 @@ ProcessorBox::rb_choose_send ()
        _current_processor_box->choose_send ();
 }
 
+void
+ProcessorBox::rb_choose_return ()
+{
+       if (_current_processor_box == 0) {
+               return;
+       }
+       _current_processor_box->choose_return ();
+}
+
 void
 ProcessorBox::rb_clear ()
 {
@@ -1281,6 +1586,28 @@ ProcessorBox::rb_clear ()
        _current_processor_box->clear_processors ();
 }
 
+
+void
+ProcessorBox::rb_clear_pre ()
+{
+       if (_current_processor_box == 0) {
+               return;
+       }
+
+       _current_processor_box->clear_processors (PreFader);
+}
+
+
+void
+ProcessorBox::rb_clear_post ()
+{
+       if (_current_processor_box == 0) {
+               return;
+       }
+
+       _current_processor_box->clear_processors (PostFader);
+}
+
 void
 ProcessorBox::rb_cut ()
 {
@@ -1388,54 +1715,55 @@ ProcessorBox::rb_deactivate_all ()
 }
 
 void
-ProcessorBox::rb_deactivate_plugins ()
+ProcessorBox::rb_edit ()
 {
        if (_current_processor_box == 0) {
                return;
        }
-       _current_processor_box->all_plugins_active (false);
-}
 
+       _current_processor_box->for_selected_processors (&ProcessorBox::edit_processor);
+}
 
 void
-ProcessorBox::rb_ab_plugins ()
+ProcessorBox::route_name_changed ()
 {
-       if (_current_processor_box == 0) {
-               return;
-       }
+       ENSURE_GUI_THREAD (mem_fun (*this, &ProcessorBox::route_name_changed));
 
-       _current_processor_box->ab_plugins ();
-}
+       boost::shared_ptr<Processor> processor;
+       boost::shared_ptr<PluginInsert> plugin_insert;
+       boost::shared_ptr<Send> send;
 
+       Gtk::TreeModel::Children children = model->children();
 
-void
-ProcessorBox::rb_edit ()
-{
-       if (_current_processor_box == 0) {
-               return;
-       }
+       for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
+               Gtk::TreeModel::Row row = *iter;
 
-       _current_processor_box->for_selected_processors (&ProcessorBox::edit_processor);
-}
+               processor= row[columns.processor];
 
-void
-ProcessorBox::route_name_changed (PluginUIWindow* plugin_ui, boost::weak_ptr<PluginInsert> wpi)
-{
-       ENSURE_GUI_THREAD(bind (mem_fun (*this, &ProcessorBox::route_name_changed), plugin_ui, wpi));
-       boost::shared_ptr<PluginInsert> pi (wpi.lock());
-       
+               void* gui = processor->get_gui();
 
-       if (pi) {
-               WindowTitle title(Glib::get_application_name());
-               title += generate_processor_title (pi);
-               plugin_ui->set_title (title.get_string());
+               if (!gui) {
+                       continue;
+               }
+
+               /* rename editor windows for sends and plugins */
+
+               WindowTitle title (Glib::get_application_name());
+
+               if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
+                       title += send->name();
+                       static_cast<Window*>(gui)->set_title (title.get_string());
+               } else if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor)) != 0) {
+                       title += generate_processor_title (plugin_insert);
+                       static_cast<Window*>(gui)->set_title (title.get_string());
+               }
        }
 }
 
-string 
+string
 ProcessorBox::generate_processor_title (boost::shared_ptr<PluginInsert> pi)
 {
-       string maker = pi->plugin()->maker();
+       string maker = pi->plugin()->maker() ? pi->plugin()->maker() : "";
        string::size_type email_pos;
 
        if ((email_pos = maker.find_first_of ('<')) != string::npos) {
@@ -1447,6 +1775,6 @@ ProcessorBox::generate_processor_title (boost::shared_ptr<PluginInsert> pi)
                maker += " ...";
        }
 
-       return string_compose(_("%1: %2 (by %3)"), _route->name(), pi->name(), maker);  
+       return string_compose(_("%1: %2 (by %3)"), _route->name(), pi->name(), maker);
 }