X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=9f2f1ed1e5b6739f14723dbd8e5f918644d2bbc7;hb=0f7e4234225d6b94d13091a53f55e55d1be1df02;hp=964ed9510cd9060bef2efd1329d39c6a273ff5e7;hpb=608d1cc7b02683c387ed960896ecffff3745cd93;p=ardour.git

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 964ed9510c..9f2f1ed1e5 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -37,15 +37,14 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/doi.h>
 
 #include "ardour/amp.h"
 #include "ardour/ardour.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/internal_send.h"
+#include "ardour/internal_return.h"
 #include "ardour/ladspa_plugin.h"
 #include "ardour/meter.h"
 #include "ardour/plugin_insert.h"
@@ -55,6 +54,7 @@
 #include "ardour/route.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
+#include "ardour/dB.h"
 
 #include "actions.h"
 #include "ardour_dialog.h"
@@ -66,6 +66,7 @@
 #include "mixer_strip.h"
 #include "plugin_selector.h"
 #include "plugin_ui.h"
+#include "port_insert_ui.h"
 #include "processor_box.h"
 #include "public_editor.h"
 #include "return_ui.h"
@@ -80,7 +81,6 @@ class AUPluginUI;
 #endif
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
@@ -89,81 +89,402 @@ using namespace Gtkmm2ext;
 
 ProcessorBox* ProcessorBox::_current_processor_box = 0;
 RefPtr<Action> ProcessorBox::paste_action;
-bool ProcessorBox::get_colors = true;
-Gdk::Color* ProcessorBox::active_processor_color;
-Gdk::Color* ProcessorBox::inactive_processor_color;
-
-ProcessorBox::ProcessorBox (ARDOUR::Session& sess, sigc::slot<PluginSelector*> get_plugin_selector,
-			RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer)
-	: _session(sess)
-	, _parent_strip (parent)
+RefPtr<Action> ProcessorBox::cut_action;
+RefPtr<Action> ProcessorBox::rename_action;
+RefPtr<Action> ProcessorBox::edit_action;
+RefPtr<Action> ProcessorBox::controls_action;
+Glib::RefPtr<Gdk::Pixbuf> SendProcessorEntry::_slider;
+
+ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
+	: _position (PreFader)
+	, _processor (p)
+	, _width (w)
+	, _visual_state (Gtk::STATE_NORMAL)
+{
+	_hbox.pack_start (_active, false, false);
+	_event_box.add (_name);
+	_hbox.pack_start (_event_box, true, true);
+	_vbox.pack_start (_hbox);
+	_frame.add (_vbox);
+
+	/* without this, the border is mis-drawn on some systems */
+	_vbox.set_border_width (1);
+
+	_name.set_alignment (0, 0.5);
+	_name.set_text (name ());
+	_name.set_padding (2, 2);
+
+	if (boost::dynamic_pointer_cast<Amp> (p)) {
+		/* Fader processor gets a special look */
+		_event_box.set_name ("ProcessorFader");
+		_frame.set_name ("ProcessorFaderFrame");
+		_name.set_padding (2, 4);
+	}
+
+	_active.set_active (_processor->active ());
+	_active.signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::active_toggled));
+
+	_frame.show ();
+	_vbox.show ();
+	_hbox.show ();
+	_event_box.show ();
+	_name.show ();
+	_active.show ();
+
+	_processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context());
+	_processor->PropertyChanged.connect (name_connection, invalidator (*this), ui_bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context());
+}
+
+EventBox&
+ProcessorEntry::action_widget ()
+{
+	return _event_box;
+}
+
+Gtk::Widget&
+ProcessorEntry::widget ()
+{
+	return _frame;
+}
+
+string
+ProcessorEntry::drag_text () const
+{
+	return name ();
+}
+
+void
+ProcessorEntry::set_visual_state (Gtk::StateType t)
+{
+	_visual_state = t;
+	setup_visuals ();
+}
+
+void
+ProcessorEntry::set_position (Position p)
+{
+	_position = p;
+	setup_visuals ();
+}
+
+void
+ProcessorEntry::setup_visuals ()
+{
+	switch (_position) {
+	case PreFader:
+		_event_box.set_name ("ProcessorPreFader");
+		if (_visual_state == Gtk::STATE_NORMAL) {
+			_frame.set_name ("ProcessorPreFaderFrame");
+		}
+		break;
+
+	case Fader:
+		_event_box.set_name ("ProcessorFader");
+		if (_visual_state == Gtk::STATE_NORMAL) {
+			_frame.set_name ("ProcessorFaderFrame");
+		}
+		break;
+
+	case PostFader:
+		_event_box.set_name ("ProcessorPostFader");
+		if (_visual_state == Gtk::STATE_NORMAL) {
+			_frame.set_name ("ProcessorPostFaderFrame");
+		}
+		break;
+	}
+
+	switch (_visual_state) {
+	case Gtk::STATE_NORMAL:
+		/* _frame has been set up above */
+		_event_box.set_state (Gtk::STATE_NORMAL);
+		break;
+	case Gtk::STATE_SELECTED:
+		_frame.set_name ("ProcessorFrameSelected");
+		/* don't change the background of the box when it is selected */
+		_event_box.set_state (Gtk::STATE_NORMAL);
+		break;
+	case Gtk::STATE_ACTIVE:
+		_frame.set_name ("ProcessorFrameActiveSend");
+		_event_box.set_state (Gtk::STATE_ACTIVE);
+		break;
+	default:
+		break;
+	}
+}
+
+
+boost::shared_ptr<Processor>
+ProcessorEntry::processor () const
+{
+	return _processor;
+}
+
+void
+ProcessorEntry::set_enum_width (Width w)
+{
+	_width = w;
+}
+
+void
+ProcessorEntry::active_toggled ()
+{
+	if (_active.get_active ()) {
+		if (!_processor->active ()) {
+			_processor->activate ();
+		}
+	} else {
+		if (_processor->active ()) {
+			_processor->deactivate ();
+		}
+	}
+}
+
+void
+ProcessorEntry::processor_active_changed ()
+{
+	if (_active.get_active () != _processor->active ()) {
+		_active.set_active (_processor->active ());
+	}
+}
+
+void
+ProcessorEntry::processor_property_changed (const PropertyChange& what_changed)
+{
+	if (what_changed.contains (ARDOUR::Properties::name)) {
+		_name.set_text (name ());
+	}
+}
+
+string
+ProcessorEntry::name () const
+{
+	boost::shared_ptr<Send> send;
+	string name_display;
+
+	if ((send = boost::dynamic_pointer_cast<Send> (_processor)) != 0 &&
+	    !boost::dynamic_pointer_cast<InternalSend>(_processor)) {
+
+		name_display += '>';
+
+		/* grab the send name out of its overall name */
+
+		string::size_type lbracket, rbracket;
+		lbracket = send->name().find ('[');
+		rbracket = send->name().find (']');
+
+		switch (_width) {
+		case Wide:
+			name_display += send->name().substr (lbracket+1, lbracket-rbracket-1);
+			break;
+		case Narrow:
+			name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4);
+			break;
+		}
+
+	} else {
+
+		switch (_width) {
+		case Wide:
+			name_display += _processor->display_name();
+			break;
+		case Narrow:
+			name_display += PBD::short_version (_processor->display_name(), 5);
+			break;
+		}
+
+	}
+
+	return name_display;
+}
+
+SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
+	: ProcessorEntry (s, w),
+	  _send (s),
+	  _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1),
+	  _fader (_slider, &_adjustment, 0, false),
+	  _ignore_gain_change (false)
+{
+	_fader.set_name ("SendFader");
+	_fader.set_controllable (_send->amp()->gain_control ());
+	_vbox.pack_start (_fader);
+
+	_fader.show ();
+
+	_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &SendProcessorEntry::gain_adjusted));
+	_send->amp()->gain_control()->Changed.connect (send_gain_connection, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context());
+	show_gain ();
+}
+
+void
+SendProcessorEntry::setup_slider_pix ()
+{
+	_slider = ::get_icon ("fader_belt_h_thin");
+	assert (_slider);
+}
+
+void
+SendProcessorEntry::show_gain ()
+{
+	float const value = gain_to_slider_position_with_max (_send->amp()->gain (), Config->get_max_gain());
+
+	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 ()) << _("dB");
+		_fader.set_tooltip_text (s.str ());
+	}
+}
+
+void
+SendProcessorEntry::gain_adjusted ()
+{
+	if (_ignore_gain_change) {
+		return;
+	}
+
+	_send->amp()->set_gain (slider_position_to_gain_with_max (_adjustment.get_value(), Config->get_max_gain()), 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)
+	, _plugin_insert (p)
+{
+	p->SplittingChanged.connect (
+		_splitting_connection, invalidator (*this), ui_bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context()
+		);
+
+	_splitting_icon.set_size_request (-1, 12);
+
+	_vbox.pack_start (_splitting_icon);
+	_vbox.reorder_child (_splitting_icon, 0);
+
+	plugin_insert_splitting_changed ();
+}
+
+void
+PluginInsertProcessorEntry::plugin_insert_splitting_changed ()
+{
+	if (_plugin_insert->splitting ()) {
+		_splitting_icon.show ();
+	} else {
+		_splitting_icon.hide ();
+	}
+}
+
+void
+PluginInsertProcessorEntry::hide_things ()
+{
+	plugin_insert_splitting_changed ();
+}
+
+void
+PluginInsertProcessorEntry::setup_visuals ()
+{
+	switch (_position) {
+	case PreFader:
+		_splitting_icon.set_name ("ProcessorPreFader");
+		break;
+
+	case Fader:
+		_splitting_icon.set_name ("ProcessorFader");
+		break;
+
+	case PostFader:
+		_splitting_icon.set_name ("ProcessorPostFader");
+		break;
+	}
+
+	ProcessorEntry::setup_visuals ();
+}
+
+bool
+PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev)
+{
+	cairo_t* cr = gdk_cairo_create (get_window()->gobj());
+
+	cairo_set_line_width (cr, 1);
+
+	double const width = ev->area.width;
+	double const height = ev->area.height;
+
+	Gdk::Color const bg = get_style()->get_bg (STATE_NORMAL);
+	cairo_set_source_rgb (cr, bg.get_red_p (), bg.get_green_p (), bg.get_blue_p ());
+
+	cairo_rectangle (cr, 0, 0, width, height);
+	cairo_fill (cr);
+
+	Gdk::Color const fg = get_style()->get_fg (STATE_NORMAL);
+	cairo_set_source_rgb (cr, fg.get_red_p (), fg.get_green_p (), fg.get_blue_p ());
+
+	cairo_move_to (cr, width * 0.3, height);
+	cairo_line_to (cr, width * 0.3, height * 0.5);
+	cairo_line_to (cr, width * 0.7, height * 0.5);
+	cairo_line_to (cr, width * 0.7, height);
+	cairo_move_to (cr, width * 0.5, height * 0.5);
+	cairo_line_to (cr, width * 0.5, 0);
+	cairo_stroke (cr);
+
+	return true;
+}
+
+ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelector*()> get_plugin_selector,
+			    RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer)
+	: _parent_strip (parent)
 	, _owner_is_mixer (owner_is_mixer)
+	, ab_direction (true)
 	, _get_plugin_selector (get_plugin_selector)
 	, _placement(PreFader)
 	, _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 (
-				"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;
-	}
+	set_session (sess);
 
 	_width = Wide;
 	processor_menu = 0;
 	send_action_menu = 0;
-	processor_drag_in_progress = false;
 	no_processor_redisplay = false;
-	ignore_delete = false;
-
-	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_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+	processor_scroller.add (processor_display);
+	pack_start (processor_scroller, true, true);
 
+	processor_display.set_flags (CAN_FOCUS);
+	processor_display.set_name ("ProcessorList");
+	processor_display.set_size_request (48, -1);
 	processor_display.set_data ("processorbox", this);
-	processor_display.set_model (model);
-	processor_display.append_column (X_("notshown"), columns.text);
-	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(), "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));
-	name_col->add_attribute(renderer->property_foreground_gdk(), columns.color);
+	processor_display.set_spacing (2);
 
-	processor_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+	processor_display.signal_enter_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::enter_notify), false);
+	processor_display.signal_leave_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::leave_notify), false);
 
-	model->signal_row_deleted().connect (mem_fun (*this, &ProcessorBox::row_deleted));
-
-	processor_scroller.add (processor_display);
-	processor_eventbox.add (processor_scroller);
+	processor_display.signal_key_press_event().connect (sigc::mem_fun(*this, &ProcessorBox::processor_key_press_event));
+	processor_display.signal_key_release_event().connect (sigc::mem_fun(*this, &ProcessorBox::processor_key_release_event));
 
-	processor_scroller.set_size_request (-1, 40);
+	processor_display.ButtonPress.connect (sigc::mem_fun (*this, &ProcessorBox::processor_button_press_event));
+	processor_display.ButtonRelease.connect (sigc::mem_fun (*this, &ProcessorBox::processor_button_release_event));
 
-	pack_start (processor_eventbox, true, true);
+	processor_display.Reordered.connect (sigc::mem_fun (*this, &ProcessorBox::reordered));
+	processor_display.DropFromAnotherBox.connect (sigc::mem_fun (*this, &ProcessorBox::object_drop));
+	processor_display.SelectionChanged.connect (sigc::mem_fun (*this, &ProcessorBox::selection_changed));
 
-	processor_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_scroller.show ();
+	processor_display.show ();
 
-	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));
-
-	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));
+	if (parent) {
+		parent->DeliveryChanged.connect (
+			_mixer_strip_connections, invalidator (*this), ui_bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context ()
+			);
+	}
 }
 
 ProcessorBox::~ProcessorBox ()
@@ -173,18 +494,27 @@ ProcessorBox::~ProcessorBox ()
 void
 ProcessorBox::set_route (boost::shared_ptr<Route> r)
 {
-	connections.clear ();
+	if (_route == r) {
+		return;
+	}
+
+	_route_connections.drop_connections();
 
 	/* new route: any existing block on processor redisplay must be meaningless */
 	no_processor_redisplay = false;
 	_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)));
+	_route->processors_changed.connect (
+		_route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_processors_changed, this, _1), gui_context()
+		);
+
+	_route->DropReferences.connect (
+		_route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_going_away, this), gui_context()
+		);
+
+	_route->PropertyChanged.connect (
+		_route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_property_changed, this, _1), gui_context()
+		);
 
 	redisplay_processors ();
 }
@@ -194,23 +524,21 @@ ProcessorBox::route_going_away ()
 {
 	/* don't keep updating display as processors are deleted */
 	no_processor_redisplay = true;
+	_route.reset ();
 }
 
-
 void
-ProcessorBox::object_drop (const list<boost::shared_ptr<Processor> >& procs, Gtk::TreeView* source, int x, int y, Glib::RefPtr<Gdk::DragContext>& context)
+ProcessorBox::object_drop(DnDVBox<ProcessorEntry>* source, ProcessorEntry* position, Glib::RefPtr<Gdk::DragContext> const & context)
 {
-	TreeIter iter;
-	TreeModel::Path path;
-	TreeViewColumn* column;
-	int cellx;
-	int celly;
 	boost::shared_ptr<Processor> p;
+	if (position) {
+		p = position->processor ();
+	}
 
-	if (processor_display.get_path_at_pos (x, y, path, column, cellx, celly)) {
-		if ((iter = model->get_iter (path))) {
-			p = (*iter)[columns.processor];
-		}
+	list<ProcessorEntry*> children = source->selection ();
+	list<boost::shared_ptr<Processor> > procs;
+	for (list<ProcessorEntry*>::const_iterator i = children.begin(); i != children.end(); ++i) {
+		procs.push_back ((*i)->processor ());
 	}
 
 	for (list<boost::shared_ptr<Processor> >::const_iterator i = procs.begin(); i != procs.end(); ++i) {
@@ -221,7 +549,7 @@ ProcessorBox::object_drop (const list<boost::shared_ptr<Processor> >& procs, Gtk
 		delete &state;
 	}
 
-	/* since the treeview doesn't take care of this properly, we have to delete the originals
+	/* since the dndvbox doesn't take care of this properly, we have to delete the originals
 	   ourselves.
 	*/
 
@@ -232,8 +560,6 @@ ProcessorBox::object_drop (const list<boost::shared_ptr<Processor> >& procs, Gtk
 			other->delete_dragged_processors (procs);
 		}
 	}
-
-	context->drag_finish (true, (context->get_suggested_action() == Gdk::ACTION_MOVE), 0);
 }
 
 void
@@ -242,38 +568,21 @@ ProcessorBox::update()
 	redisplay_processors ();
 }
 
-
 void
 ProcessorBox::set_width (Width w)
 {
 	if (_width == w) {
 		return;
 	}
-	_width = w;
 
-	redisplay_processors ();
-}
-
-void
-ProcessorBox::remove_processor_gui (boost::shared_ptr<Processor> processor)
-{
-	boost::shared_ptr<Send> send;
-	boost::shared_ptr<Return> retrn;
-	boost::shared_ptr<PortInsert> port_insert;
+	_width = w;
 
-	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;
+	list<ProcessorEntry*> children = processor_display.children ();
+	for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
+		(*i)->set_enum_width (w);
 	}
+
+	redisplay_processors ();
 }
 
 void
@@ -285,14 +594,14 @@ ProcessorBox::build_send_action_menu ()
 	send_action_menu->set_name ("ArdourContextMenu");
 	MenuList& items = send_action_menu->items();
 
-	items.push_back (MenuElem (_("New send"), mem_fun(*this, &ProcessorBox::new_send)));
-	items.push_back (MenuElem (_("Show send controls"), mem_fun(*this, &ProcessorBox::show_send_controls)));
+	items.push_back (MenuElem (_("New send"), sigc::mem_fun(*this, &ProcessorBox::new_send)));
+	items.push_back (MenuElem (_("Show send controls"), sigc::mem_fun(*this, &ProcessorBox::show_send_controls)));
 }
 
 Gtk::Menu*
 ProcessorBox::build_possible_aux_menu ()
 {
-	boost::shared_ptr<RouteList> rl = _session.get_routes_with_internal_returns();
+	boost::shared_ptr<RouteList> rl = _session->get_routes_with_internal_returns();
 
 	if (rl->empty()) {
 		return 0;
@@ -304,7 +613,7 @@ ProcessorBox::build_possible_aux_menu ()
 
 	for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
 		if (!_route->internal_send_for (*r) && *r != _route) {
-			items.push_back (MenuElem ((*r)->name(), bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr<Route>(*r))));
+			items.push_back (MenuElem ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr<Route>(*r))));
 		}
 	}
 
@@ -328,13 +637,13 @@ 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"));
+	Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newplugin"));
 
 	if (plugin_menu_item) {
 		plugin_menu_item->set_submenu (*_get_plugin_selector()->plugin_menu());
 	}
 
-	Gtk::MenuItem* aux_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/processormenu/newaux"));
+	Gtk::MenuItem* aux_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newaux"));
 
 	if (aux_menu_item) {
 		Menu* m = build_possible_aux_menu();
@@ -348,23 +657,12 @@ ProcessorBox::show_processor_menu (gint arg)
 		}
 	}
 
+        cut_action->set_sensitive (can_cut());
 	paste_action->set_sensitive (!_rr_selection.processors.empty());
 
 	processor_menu->popup (1, arg);
 }
 
-void
-ProcessorBox::processor_drag_begin (GdkDragContext *)
-{
-	processor_drag_in_progress = true;
-}
-
-void
-ProcessorBox::processor_drag_end (GdkDragContext *)
-{
-	processor_drag_in_progress = false;
-}
-
 bool
 ProcessorBox::enter_notify (GdkEventCrossing*)
 {
@@ -406,32 +704,35 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
 	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]);
-			}
+		pair<ProcessorEntry *, double> const pointer = processor_display.get_child_at_position (y);
+
+		if (pointer.first) {
+			targets.push_back (pointer.first->processor ());
 		}
 	}
 
 
 	switch (ev->keyval) {
+	case GDK_a:
+		if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+			processor_display.select_all ();
+			ret = true;
+		}
+		break;
+
 	case GDK_c:
 		if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 			copy_processors (targets);
+			ret = true;
 		}
 		break;
 
 	case GDK_x:
 		if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 			cut_processors (targets);
+			ret = true;
 		}
 		break;
 
@@ -442,16 +743,23 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
 			} else {
 				paste_processors (targets.front());
 			}
+			ret = true;
 		}
 		break;
 
+	case GDK_Up:
+		break;
+
+	case GDK_Down:
+		break;
+
 	case GDK_Delete:
 	case GDK_BackSpace:
 		delete_processors (targets);
 		ret = true;
 		break;
 
-	case GDK_slash:
+	case GDK_Return:
 		for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) {
 			if ((*i)->active()) {
 				(*i)->deactivate ();
@@ -462,6 +770,11 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
 		ret = true;
 		break;
 
+	case GDK_slash:
+		ab_plugins ();
+		ret = true;
+		break;
+
 	default:
 		break;
 	}
@@ -470,30 +783,21 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
 }
 
 bool
-ProcessorBox::processor_button_press_event (GdkEventButton *ev)
+ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child)
 {
-	TreeIter iter;
-	TreeModel::Path path;
-	TreeViewColumn* column;
-	int cellx;
-	int celly;
 	boost::shared_ptr<Processor> processor;
-	int ret = false;
-	bool selected = 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];
-			selected = processor_display.get_selection()->is_selected (iter);
-		}
-
+	if (child) {
+		processor = child->processor ();
 	}
 
+	int ret = false;
+	bool selected = processor_display.selected (child);
+
 	if (processor && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS))) {
 
-		if (_session.engine().connected()) {
+		if (_session->engine().connected()) {
 			/* XXX giving an error message here is hard, because we may be in the midst of a button press */
-			edit_processor (processor);
+			toggle_edit_processor (processor);
 		}
 		ret = true;
 
@@ -508,33 +812,22 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev)
 		_get_plugin_selector()->show_manager ();
 	}
 
-
 	return ret;
 }
 
 bool
-ProcessorBox::processor_button_release_event (GdkEventButton *ev)
+ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry* child)
 {
-	TreeIter iter;
-	TreeModel::Path path;
-	TreeViewColumn* column;
-	int cellx;
-	int celly;
 	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];
-		}
+	if (child) {
+		processor = child->processor ();
 	}
 
 	if (processor && Keyboard::is_delete_event (ev)) {
 
-		Glib::signal_idle().connect (bind (
-				mem_fun(*this, &ProcessorBox::idle_delete_processor),
+		Glib::signal_idle().connect (sigc::bind (
+				sigc::mem_fun(*this, &ProcessorBox::idle_delete_processor),
 				boost::weak_ptr<Processor>(processor)));
-		ret = true;
 
 	} else if (Keyboard::is_context_menu_event (ev)) {
 
@@ -553,7 +846,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev)
 		}
 
 		show_processor_menu (ev->time);
-		ret = true;
 
 	} else if (processor && Keyboard::is_button2_event (ev)
 #ifndef GTKOSX
@@ -568,41 +860,52 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev)
 		} else {
 			processor->activate ();
 		}
-		ret = true;
-
 	}
 
-	return ret;
+	return false;
 }
 
 Menu *
 ProcessorBox::build_processor_menu ()
 {
-	processor_menu = dynamic_cast<Gtk::Menu*>(ActionManager::get_widget("/processormenu") );
+	processor_menu = dynamic_cast<Gtk::Menu*>(ActionManager::get_widget("/ProcessorMenu") );
 	processor_menu->set_name ("ArdourContextMenu");
-
-	show_all_children();
-
 	return processor_menu;
 }
 
 void
 ProcessorBox::selection_changed ()
 {
-	bool sensitive = (processor_display.get_selection()->count_selected_rows()) ? true : false;
-	ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive);
+	const bool sensitive = !processor_display.selection().empty();
+	ActionManager::set_sensitive(ActionManager::plugin_selection_sensitive_actions,
+	                             sensitive);
+	edit_action->set_sensitive(one_processor_can_be_edited());
+
+	const bool single_selection = (processor_display.selection().size() == 1);
+
+	boost::shared_ptr<PluginInsert> pi;
+	if (single_selection) {
+		pi = boost::dynamic_pointer_cast<PluginInsert>(
+			processor_display.selection().front()->processor());
+	}
+
+	/* enable gui for plugin inserts with editors */
+	controls_action->set_sensitive(pi && pi->plugin()->has_editor());
+
+	/* disallow rename for multiple selections and for plugin inserts */
+	rename_action->set_sensitive(single_selection && pi);
 }
 
 void
 ProcessorBox::select_all_processors ()
 {
-	processor_display.get_selection()->select_all();
+	processor_display.select_all ();
 }
 
 void
 ProcessorBox::deselect_all_processors ()
 {
-	processor_display.get_selection()->unselect_all();
+	processor_display.select_none ();
 }
 
 void
@@ -611,41 +914,38 @@ ProcessorBox::choose_plugin ()
 	_get_plugin_selector()->set_interested_object (*this);
 }
 
-void
+/** @return true if an error occurred, otherwise false */
+bool
 ProcessorBox::use_plugins (const SelectedPlugins& plugins)
 {
 	for (SelectedPlugins::const_iterator p = plugins.begin(); p != plugins.end(); ++p) {
 
-		boost::shared_ptr<Processor> processor (new PluginInsert (_session, *p));
+		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, _placement, &err_streams)) {
+		if (_route->add_processor (processor, _placement, &err_streams, Config->get_new_plugins_active ())) {
 			weird_plugin_dialog (**p, err_streams);
+			return true;
 			// XXX SHAREDPTR delete plugin here .. do we even need to care?
 		} else {
 
 			if (Profile->get_sae()) {
 				processor->activate ();
 			}
-			processor->ActiveChanged.connect (bind (
-					mem_fun (*this, &ProcessorBox::show_processor_active),
-					boost::weak_ptr<Processor>(processor)));
 		}
 	}
+
+	return false;
 }
 
 void
 ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 {
-	ArdourDialog dialog (_("ardour: weird plugin dialog"));
+	ArdourDialog dialog (_("Plugin Incompatibility"));
 	Label label;
 
-	string text = string_compose(_("You attempted to add the plugin \"%1\" at index %2.\n"),
+	string text = string_compose(_("You attempted to add the plugin \"%1\" in slot %2.\n"),
 			p.name(), streams.index);
 
 	bool has_midi  = streams.count.n_midi() > 0 || p.get_info()->n_inputs.n_midi() > 0;
@@ -653,21 +953,25 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 
 	text += _("\nThis plugin has:\n");
 	if (has_midi) {
-		text += string_compose("\t%1 ", p.get_info()->n_inputs.n_midi()) + _("MIDI input(s)\n");
+		uint32_t const n = p.get_info()->n_inputs.n_midi ();
+		text += string_compose (ngettext ("\t%1 MIDI input\n", "\t%1 MIDI inputs\n", n), n);
 	}
 	if (has_audio) {
-		text += string_compose("\t%1 ", p.get_info()->n_inputs.n_audio()) + _("audio input(s)\n");
+		uint32_t const n = p.get_info()->n_inputs.n_audio ();
+		text += string_compose (ngettext ("\t%1 audio input\n", "\t%1 audio inputs\n", n), n);
 	}
 
-	text += _("\nBut at the insertion point, there are:\n");
+	text += _("\nbut at the insertion point, there are:\n");
 	if (has_midi) {
-		text += string_compose("\t%1 ", streams.count.n_midi()) + _("MIDI channel(s)\n");
+		uint32_t const n = streams.count.n_midi ();
+		text += string_compose (ngettext ("\t%1 MIDI channel\n", "\t%1 MIDI channels\n", n), n);
 	}
 	if (has_audio) {
-		text += string_compose("\t%1 ", streams.count.n_audio()) + _("audio channel(s)\n");
+		uint32_t const n = streams.count.n_audio ();
+		text += string_compose (ngettext ("\t%1 audio channel\n", "\t%1 audio channels\n", n), n);
 	}
 
-	text += _("\nArdour is unable to insert this plugin here.\n");
+	text += string_compose (_("\n%1 is unable to insert this plugin here.\n"), PROGRAM_NAME);
 	label.set_text(text);
 
 	dialog.get_vbox()->pack_start (label);
@@ -684,25 +988,24 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
 void
 ProcessorBox::choose_insert ()
 {
-	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)));
-
+	boost::shared_ptr<Processor> processor (new PortInsert (*_session, _route->pannable(), _route->mute_master()));
 	_route->add_processor (processor, _placement);
 }
 
+/* Caller must not hold process lock */
 void
 ProcessorBox::choose_send ()
 {
-	boost::shared_ptr<Send> send (new Send (_session, _route->mute_master()));
+	boost::shared_ptr<Send> send (new Send (*_session, _route->pannable(), _route->mute_master()));
 
 	/* make an educated guess at the initial number of outputs for the send */
-	ChanCount outs = (_session.master_out())
-			? _session.master_out()->n_outputs()
+	ChanCount outs = (_session->master_out())
+			? _session->master_out()->n_outputs()
 			: _route->n_outputs();
 
 	/* XXX need processor lock on route */
 	try {
+		Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
 		send->output()->ensure_io (outs, false, this);
 	} catch (AudioEngine::PortRegistrationFailure& err) {
 		error << string_compose (_("Cannot set up new send: %1"), err.what()) << endmsg;
@@ -717,15 +1020,15 @@ ProcessorBox::choose_send ()
 	 */
 
 	IOSelectorWindow *ios = new IOSelectorWindow (_session, send->output(), true);
-	ios->show_all ();
+	ios->show ();
 
 	/* keep a reference to the send so it doesn't get deleted while
 	   the IOSelectorWindow is doing its stuff
 	*/
 	_processor_being_created = send;
 
-	ios->selector().Finished.connect (bind (
-			mem_fun(*this, &ProcessorBox::send_io_finished),
+	ios->selector().Finished.connect (sigc::bind (
+			sigc::mem_fun(*this, &ProcessorBox::send_io_finished),
 			boost::weak_ptr<Processor>(send), ios));
 
 }
@@ -758,35 +1061,6 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr<Processor>
 	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;
-	}
-
-	/* let the user adjust the IO setup before creation */
-	IOSelectorWindow *ios = new IOSelectorWindow (_session, retrn->input(), true);
-	ios->show_all ();
-
-	/* keep a reference to the return 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));
-}
-
 void
 ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptr<Processor> weak_processor, IOSelectorWindow* ios)
 {
@@ -828,211 +1102,234 @@ 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);
+	boost::shared_ptr<RouteList> rlist (new RouteList);
+	rlist->push_back (_route);
+
+	_session->add_internal_sends (target, PreFader, rlist);
+}
+
+void
+ProcessorBox::route_processors_changed (RouteProcessorChange c)
+{
+	if (c.type == RouteProcessorChange::MeterPointChange && c.meter_visibly_changed == false) {
+		/* the meter has moved, but it was and still is invisible to the user, so nothing to do */
+		return;
+	}
+
+	redisplay_processors ();
 }
 
 void
 ProcessorBox::redisplay_processors ()
 {
-	ENSURE_GUI_THREAD (mem_fun(*this, &ProcessorBox::redisplay_processors));
+	ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors)
 
 	if (no_processor_redisplay) {
 		return;
 	}
 
-	ignore_delete = true;
-	model->clear ();
-	ignore_delete = false;
+	processor_display.clear ();
+
+	_route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display));
+
+	for (list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin(); i != _processor_window_proxies.end(); ++i) {
+		(*i)->marked = false;
+	}
+
+	_route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::maybe_add_processor_to_ui_list));
+
+	/* trim dead wood from the processor window proxy list */
+
+	list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin();
+	while (i != _processor_window_proxies.end()) {
+		list<ProcessorWindowProxy*>::iterator j = i;
+		++j;
 
-	processor_active_connections.clear ();
-	processor_name_connections.clear ();
+		if (!(*i)->marked) {
+			ARDOUR_UI::instance()->remove_window_proxy (*i);
+			delete *i;
+			_processor_window_proxies.erase (i);
+		}
 
-	_route->foreach_processor (mem_fun (*this, &ProcessorBox::add_processor_to_display));
+		i = j;
+	}
 
-	build_processor_tooltip (processor_eventbox, _("Inserts, sends & plugins:"));
+	setup_entry_positions ();
 }
 
+/** Add a ProcessorWindowProxy for a processor to our list, if that processor does
+ *  not already have one.
+ */
 void
-ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
+ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
 {
-	boost::shared_ptr<Processor> processor (p.lock ());
-
-	if (!processor || !processor->display_to_user()) {
+	boost::shared_ptr<Processor> p = w.lock ();
+	if (!p) {
 		return;
 	}
 
-	Gtk::TreeModel::Row row = *(model->append());
-	row[columns.text] = processor_name (processor);
-	row[columns.processor] = processor;
+	list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin ();
+	while (i != _processor_window_proxies.end()) {
 
-	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))));
-}
+		boost::shared_ptr<Processor> t = (*i)->processor().lock ();
 
-string
-ProcessorBox::processor_name (boost::weak_ptr<Processor> weak_processor)
-{
-	boost::shared_ptr<Processor> processor (weak_processor.lock());
+		if (p == t) {
+			/* this processor is already on the list; done */
+			(*i)->marked = true;
+			return;
+		}
 
-	if (!processor) {
-		return string();
+		++i;
 	}
 
-	boost::shared_ptr<Send> send;
-	string name_display;
+	/* not on the list; add it */
 
-	if (!processor->active()) {
-		name_display = " (";
+	string loc;
+	if (_parent_strip) {
+		if (_parent_strip->mixer_owned()) {
+			loc = X_("M");
+		} else {
+			loc = X_("R");
+		}
+	} else {
+		loc = X_("P");
 	}
 
-	if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0 &&
-	    !boost::dynamic_pointer_cast<InternalSend>(processor)) {
+	ProcessorWindowProxy* wp = new ProcessorWindowProxy (
+		string_compose ("%1-%2-%3", loc, _route->id(), p->id()),
+		_session->extra_xml (X_("UI")),
+		this,
+		w);
 
-		name_display += '>';
+	wp->marked = true;
 
-		/* grab the send name out of its overall name */
+        /* if the processor already has an existing UI,
+           note that so that we don't recreate it
+        */
 
-		string::size_type lbracket, rbracket;
-		lbracket = send->name().find ('[');
-		rbracket = send->name().find (']');
+        void* existing_ui = p->get_ui ();
 
-		switch (_width) {
-		case Wide:
-			name_display += send->name().substr (lbracket+1, lbracket-rbracket-1);
-			break;
-		case Narrow:
-			name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4);
-			break;
-		}
+        if (existing_ui) {
+                wp->set (static_cast<Gtk::Window*>(existing_ui));
+        }
 
-	} else {
+	_processor_window_proxies.push_back (wp);
+	ARDOUR_UI::instance()->add_window_proxy (wp);
+}
 
-		switch (_width) {
-		case Wide:
-			name_display += processor->display_name();
-			break;
-		case Narrow:
-			name_display += PBD::short_version (processor->display_name(), 5);
-			break;
-		}
+void
+ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
+{
+	boost::shared_ptr<Processor> processor (p.lock ());
 
+	if (!processor || !processor->display_to_user()) {
+		return;
 	}
 
-	if (!processor->active()) {
-		name_display += ')';
+	boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
+	boost::shared_ptr<PluginInsert> plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor);
+	ProcessorEntry* e = 0;
+	if (send) {
+		e = new SendProcessorEntry (send, _width);
+	} else if (plugin_insert) {
+		e = new PluginInsertProcessorEntry (plugin_insert, _width);
+	} else {
+		e = new ProcessorEntry (processor, _width);
 	}
 
-	return name_display;
+	e->set_pixel_width (get_allocation().get_width());
+	processor_display.add_child (e);
 }
 
+
 void
 ProcessorBox::build_processor_tooltip (EventBox& box, string start)
 {
 	string tip(start);
 
-	Gtk::TreeModel::Children children = model->children();
-	for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
-  		Gtk::TreeModel::Row row = *iter;
+	list<ProcessorEntry*> children = processor_display.children ();
+	for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
 		tip += '\n';
-  		tip += row[columns.text];
+  		tip += (*i)->processor()->name();
 	}
-	ARDOUR_UI::instance()->tooltips().set_tip (box, tip);
+
+	ARDOUR_UI::instance()->set_tip (box, tip);
 }
 
 void
-ProcessorBox::show_processor_name (boost::weak_ptr<Processor> processor)
+ProcessorBox::reordered ()
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &ProcessorBox::show_processor_name), processor));
-	show_processor_active (processor);
+	compute_processor_sort_keys ();
+	setup_entry_positions ();
 }
 
 void
-ProcessorBox::show_processor_active (boost::weak_ptr<Processor> weak_processor)
+ProcessorBox::setup_entry_positions ()
 {
-	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();
-
-	while (iter != children.end()) {
-
-		boost::shared_ptr<Processor> r = (*iter)[columns.processor];
-
-		if (r == processor) {
-			(*iter)[columns.text] = processor_name (r);
+	list<ProcessorEntry*> children = processor_display.children ();
+	bool pre_fader = true;
 
-			if (processor->active()) {
-				(*iter)[columns.color] = *active_processor_color;
+	for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
+		if (boost::dynamic_pointer_cast<Amp>((*i)->processor())) {
+			pre_fader = false;
+			(*i)->set_position (ProcessorEntry::Fader);
+		} else {
+			if (pre_fader) {
+				(*i)->set_position (ProcessorEntry::PreFader);
 			} else {
-				(*iter)[columns.color] = *inactive_processor_color;
+				(*i)->set_position (ProcessorEntry::PostFader);
 			}
-			break;
 		}
-
-		iter++;
-	}
-}
-
-void
-ProcessorBox::row_deleted (const Gtk::TreeModel::Path &)
-{
-	if (!ignore_delete) {
-		compute_processor_sort_keys ();
 	}
 }
 
 void
 ProcessorBox::compute_processor_sort_keys ()
 {
-	Gtk::TreeModel::Children children = model->children();
+	list<ProcessorEntry*> children = processor_display.children ();
 	Route::ProcessorList our_processors;
 
-	for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
-		boost::shared_ptr<Processor> p = (*iter)[columns.processor];
-		our_processors.push_back ((*iter)[columns.processor]);
+	for (list<ProcessorEntry*>::iterator iter = children.begin(); iter != children.end(); ++iter) {
+		our_processors.push_back ((*iter)->processor ());
 	}
 
 	if (_route->reorder_processors (our_processors)) {
+		/* Reorder failed, so report this to the user.  As far as I can see this must be done
+		   in an idle handler: it seems that the redisplay_processors() that happens below destroys
+		   widgets that were involved in the drag-and-drop on the processor list, which causes problems
+		   when the drag is torn down after this handler function is finished.
+		*/
+		Glib::signal_idle().connect_once (sigc::mem_fun (*this, &ProcessorBox::report_failed_reorder));
+	}
+}
 
-		/* reorder failed, so redisplay */
+void
+ProcessorBox::report_failed_reorder ()
+{
+	/* reorder failed, so redisplay */
 
-		redisplay_processors ();
+	redisplay_processors ();
 
-		/* now tell them about the problem */
+	/* now tell them about the problem */
 
-		ArdourDialog dialog (_("ardour: weird plugin dialog"));
-		Label label;
+	ArdourDialog dialog (_("Plugin Incompatibility"));
+	Label label;
 
-		label.set_text (_("\
-You cannot reorder this set of processors\n\
+	label.set_text (_("\
+You cannot reorder these plugins/sends/inserts\n\
 in that way because the inputs and\n\
-outputs do not work correctly."));
+outputs will not work correctly."));
 
-		dialog.get_vbox()->pack_start (label);
-		dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
+	dialog.get_vbox()->set_border_width (12);
+	dialog.get_vbox()->pack_start (label);
+	dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
 
-		dialog.set_name (X_("PluginIODialog"));
-		dialog.set_position (Gtk::WIN_POS_MOUSE);
-		dialog.set_modal (true);
-		dialog.show_all ();
+	dialog.set_name (X_("PluginIODialog"));
+	dialog.set_position (Gtk::WIN_POS_MOUSE);
+	dialog.set_modal (true);
+	dialog.show_all ();
 
-		dialog.run ();
-	}
+	dialog.run ();
 }
 
 void
@@ -1051,6 +1348,27 @@ ProcessorBox::rename_processors ()
 	}
 }
 
+bool
+ProcessorBox::can_cut () const
+{
+        vector<boost::shared_ptr<Processor> > sel;
+
+        get_selected_processors (sel);
+
+        /* cut_processors () does not cut inserts */
+
+        for (vector<boost::shared_ptr<Processor> >::const_iterator i = sel.begin (); i != sel.end (); ++i) {
+
+		if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0 ||
+		    (boost::dynamic_pointer_cast<Send>((*i)) != 0) ||
+		    (boost::dynamic_pointer_cast<Return>((*i)) != 0)) {
+                        return true;
+                }
+        }
+
+        return false;
+}
+
 void
 ProcessorBox::cut_processors ()
 {
@@ -1076,10 +1394,10 @@ ProcessorBox::cut_processors (const ProcSelection& to_be_removed)
 		    (boost::dynamic_pointer_cast<Send>((*i)) != 0) ||
 		    (boost::dynamic_pointer_cast<Return>((*i)) != 0)) {
 
-			void* gui = (*i)->get_gui ();
+			Window* w = get_processor_ui (*i);
 
-			if (gui) {
-				static_cast<Gtk::Widget*>(gui)->hide ();
+			if (w) {
+				w->hide ();
 			}
 
 			XMLNode& child ((*i)->get_state());
@@ -1148,10 +1466,10 @@ ProcessorBox::delete_processors (const ProcSelection& targets)
 
 	for (ProcSelection::const_iterator i = targets.begin(); i != targets.end(); ++i) {
 
-		void* gui = (*i)->get_gui ();
+		Window* w = get_processor_ui (*i);
 
-		if (gui) {
-			static_cast<Gtk::Widget*>(gui)->hide ();
+		if (w) {
+			w->hide ();
 		}
 
 		_route->remove_processor(*i);
@@ -1169,10 +1487,10 @@ ProcessorBox::delete_dragged_processors (const list<boost::shared_ptr<Processor>
 	no_processor_redisplay = true;
 	for (x = procs.begin(); x != procs.end(); ++x) {
 
-		void* gui = (*x)->get_gui ();
+		Window* w = get_processor_ui (*x);
 
-		if (gui) {
-			static_cast<Gtk::Widget*>(gui)->hide ();
+		if (w) {
+			w->hide ();
 		}
 
 		_route->remove_processor(*x);
@@ -1218,11 +1536,27 @@ ProcessorBox::rename_processor (boost::shared_ptr<Processor> processor)
 	case Gtk::RESPONSE_ACCEPT:
 		name_prompter.get_result (result);
 		if (result.length()) {
-			if (_session.route_by_name (result)) {
-				ARDOUR_UI::instance()->popup_error (_("A track already exists with that name."));
-				return;
-			}
-			processor->set_name (result);
+
+                       int tries = 0;
+                       string test = result;
+
+                       while (tries < 100) {
+                               if (_session->io_name_is_legal (test)) {
+                                       result = test;
+                                       break;
+                               }
+                               tries++;
+
+                               test = string_compose ("%1-%2", result, tries);
+                       }
+
+                       if (tries < 100) {
+                               processor->set_name (result);
+                       } else {
+                               /* unlikely! */
+                               ARDOUR_UI::instance()->popup_error
+                                       (string_compose (_("At least 100 IO objects exist with a name like %1 - name not changed"), result));
+                       }
 		}
 		break;
 	}
@@ -1278,20 +1612,44 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
 			} else if (type->value() == "send") {
 
 				XMLNode n (**niter);
-				Send::make_unique (n, _session);
-				p.reset (new Send (_session, _route->mute_master(), n));
+				Send::make_unique (n, *_session);
+                                Send* s = new Send (*_session, _route->pannable(), _route->mute_master());
+                                if (s->set_state (n, Stateful::loading_state_version)) {
+                                        delete s;
+                                        return;
+                                }
+
+				p.reset (s);
+
 
 			} else if (type->value() == "return") {
 
 				XMLNode n (**niter);
-				Return::make_unique (n, _session);
-				p.reset (new Return (_session, **niter));
+				Return::make_unique (n, *_session);
+                                Return* r = new Return (*_session);
+
+                                if (r->set_state (n, Stateful::loading_state_version)) {
+                                        delete r;
+                                        return;
+                                }
+
+				p.reset (r);
+
+			} else if (type->value() == "port") {
+
+				XMLNode n (**niter);
+				p.reset (new PortInsert (*_session, _route->pannable (), _route->mute_master ()));
+				if (p->set_state (n, Stateful::loading_state_version)) {
+					return;
+				}
 
 			} else {
 				/* XXX its a bit limiting to assume that everything else
 				   is a plugin.
 				*/
-				p.reset (new PluginInsert (_session, **niter));
+
+				p.reset (new PluginInsert (*_session));
+                                p->set_state (**niter, Stateful::current_state_version);
 			}
 
 			copies.push_back (p);
@@ -1330,23 +1688,20 @@ ProcessorBox::deactivate_processor (boost::shared_ptr<Processor> r)
 }
 
 void
-ProcessorBox::get_selected_processors (ProcSelection& processors)
+ProcessorBox::get_selected_processors (ProcSelection& processors) const
 {
-    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]);
-    }
+	const list<ProcessorEntry*> selection = processor_display.selection ();
+	for (list<ProcessorEntry*>::const_iterator i = selection.begin(); i != selection.end(); ++i) {
+		processors.push_back ((*i)->processor ());
+	}
 }
 
 void
 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->*method)(processor);
+	list<ProcessorEntry*> selection = processor_display.selection ();
+	for (list<ProcessorEntry*>::iterator i = selection.begin(); i != selection.end(); ++i) {
+		(this->*method) ((*i)->processor ());
 	}
 }
 
@@ -1376,7 +1731,7 @@ ProcessorBox::clear_processors ()
 	choices.push_back (_("Cancel"));
 	choices.push_back (_("Yes, remove them all"));
 
-	Gtkmm2ext::Choice prompter (prompt, choices);
+	Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices);
 
 	if (prompter.run () == 1) {
 		_route->clear_processors (PreFader);
@@ -1401,17 +1756,50 @@ ProcessorBox::clear_processors (Placement p)
 	choices.push_back (_("Cancel"));
 	choices.push_back (_("Yes, remove them all"));
 
-	Gtkmm2ext::Choice prompter (prompt, choices);
+	Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices);
 
 	if (prompter.run () == 1) {
 		_route->clear_processors (p);
 	}
 }
 
+bool
+ProcessorBox::processor_can_be_edited (boost::shared_ptr<Processor> processor)
+{
+	boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack> (_route);
+	if (at && at->freeze_state() == AudioTrack::Frozen) {
+		return false;
+	}
+
+	if (
+		boost::dynamic_pointer_cast<Send> (processor) ||
+		boost::dynamic_pointer_cast<Return> (processor) ||
+		boost::dynamic_pointer_cast<PluginInsert> (processor) ||
+		boost::dynamic_pointer_cast<PortInsert> (processor)
+		) {
+		return true;
+	}
+
+	return false;
+}
+
+bool
+ProcessorBox::one_processor_can_be_edited ()
+{
+	list<ProcessorEntry*> selection = processor_display.selection ();
+	list<ProcessorEntry*>::iterator i = selection.begin();
+	while (i != selection.end() && processor_can_be_edited ((*i)->processor()) == false) {
+		++i;
+	}
+
+	return (i != selection.end());
+}
+
 void
-ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
+ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
 {
 	boost::shared_ptr<Send> send;
+	boost::shared_ptr<InternalSend> internal_send;
 	boost::shared_ptr<Return> retrn;
 	boost::shared_ptr<PluginInsert> plugin_insert;
 	boost::shared_ptr<PortInsert> port_insert;
@@ -1424,49 +1812,59 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 		}
 	}
 
-	if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
+	if (boost::dynamic_pointer_cast<Amp> (processor)) {
 
-		if (!_session.engine().connected()) {
-			return;
+		if (_parent_strip) {
+			_parent_strip->revert_to_default_display ();
 		}
 
-#ifdef OLD_SEND_EDITING
-		SendUIWindow *send_ui;
-
-		if (send->get_gui() == 0) {
-			send_ui = new SendUIWindow (send, _session);
-			send_ui->set_title (send->name());
-			send->set_gui (send_ui);
+	} else if ((internal_send = boost::dynamic_pointer_cast<InternalSend> (processor)) != 0) {
 
-		} else {
-			send_ui = reinterpret_cast<SendUIWindow *> (send->get_gui());
+		if (!_session->engine().connected()) {
+			return;
 		}
 
-		gidget = send_ui;
-#else
 		if (_parent_strip) {
-			_parent_strip->show_send (send);
+			if (boost::dynamic_pointer_cast<Send> (_parent_strip->current_delivery()) == internal_send) {
+				_parent_strip->revert_to_default_display ();
+			} else {
+				_parent_strip->show_send (internal_send);
+			}
+		}
+
+	} else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
+
+		if (!_session->engine().connected()) {
+			return;
 		}
-#endif
+
+		SendUIWindow* w = new SendUIWindow (send, _session);
+		w->show ();
 
 	} else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {
 
-		if (!_session.engine().connected()) {
+		if (boost::dynamic_pointer_cast<InternalReturn> (retrn)) {
+			/* no GUI for these */
+			return;
+		}
+
+		if (!_session->engine().connected()) {
 			return;
 		}
 
 		boost::shared_ptr<Return> retrn = boost::dynamic_pointer_cast<Return> (processor);
 
 		ReturnUIWindow *return_ui;
+		Window* w = get_processor_ui (retrn);
 
-		if (retrn->get_gui() == 0) {
+		if (w == 0) {
 
 			return_ui = new ReturnUIWindow (retrn, _session);
 			return_ui->set_title (retrn->name ());
-			send->set_gui (return_ui);
+			set_processor_ui (send, return_ui);
 
 		} else {
-			return_ui = reinterpret_cast<ReturnUIWindow *> (retrn->get_gui());
+			return_ui = dynamic_cast<ReturnUIWindow *> (w);
 		}
 
 		gidget = return_ui;
@@ -1480,14 +1878,16 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 		Container* toplevel = get_toplevel();
 		Window* win = dynamic_cast<Gtk::Window*>(toplevel);
 
-		if (plugin_insert->get_gui() == 0) {
+		Window* w = get_processor_ui (plugin_insert);
+
+		if (w == 0) {
 
 			plugin_ui = new PluginUIWindow (win, plugin_insert);
 			plugin_ui->set_title (generate_processor_title (plugin_insert));
-			plugin_insert->set_gui (plugin_ui);
+			set_processor_ui (plugin_insert, plugin_ui);
 
 		} else {
-			plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_insert->get_gui());
+			plugin_ui = dynamic_cast<PluginUIWindow *> (w);
 			plugin_ui->set_parent (win);
 		}
 
@@ -1495,7 +1895,7 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 
 	} else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
 
-		if (!_session.engine().connected()) {
+		if (!_session->engine().connected()) {
 			MessageDialog msg ( _("Not connected to JACK - no I/O changes are possible"));
 			msg.run ();
 			return;
@@ -1503,12 +1903,14 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 
 		PortInsertWindow *io_selector;
 
-		if (port_insert->get_gui() == 0) {
+		Window* w = get_processor_ui (port_insert);
+
+		if (w == 0) {
 			io_selector = new PortInsertWindow (_session, port_insert);
-			port_insert->set_gui (io_selector);
+			set_processor_ui (port_insert, io_selector);
 
 		} else {
-			io_selector = reinterpret_cast<PortInsertWindow *> (port_insert->get_gui());
+			io_selector = dynamic_cast<PortInsertWindow *> (w);
 		}
 
 		gidget = io_selector;
@@ -1516,7 +1918,7 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 
 	if (gidget) {
 		if (gidget->is_visible()) {
-			gidget->get_window()->raise ();
+			gidget->hide ();
 		} else {
 			gidget->show_all ();
 			gidget->present ();
@@ -1524,10 +1926,32 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 	}
 }
 
+void
+ProcessorBox::toggle_processor_controls (boost::shared_ptr<Processor> processor)
+{
+	boost::shared_ptr<PluginInsert> plugin_insert
+		= boost::dynamic_pointer_cast<PluginInsert>(processor);
+	if (!plugin_insert) {
+		return;
+	}
+
+	Container*      toplevel  = get_toplevel();
+	Window*         win       = dynamic_cast<Gtk::Window*>(toplevel);
+	PluginUIWindow* plugin_ui = new PluginUIWindow(win, plugin_insert, true, false);
+	plugin_ui->set_title(generate_processor_title (plugin_insert));
+
+	if (plugin_ui->is_visible()) {
+		plugin_ui->hide();
+	} else {
+		plugin_ui->show_all();
+		plugin_ui->present();
+	}
+}
+
 void
 ProcessorBox::register_actions ()
 {
-	Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("processormenu"));
+	Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("ProcessorMenu"));
 	Glib::RefPtr<Action> act;
 
 	/* new stuff */
@@ -1542,8 +1966,6 @@ ProcessorBox::register_actions ()
 	ActionManager::jack_sensitive_actions.push_back (act);
 
 	ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ..."));
-	ActionManager::register_action (popup_act_grp, X_("newreturn"), _("New Return ..."),
-					sigc::ptr_fun (ProcessorBox::rb_choose_return));
 
 	ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear (all)"),
 			sigc::ptr_fun (ProcessorBox::rb_clear));
@@ -1553,9 +1975,9 @@ ProcessorBox::register_actions ()
 			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));
-	ActionManager::plugin_selection_sensitive_actions.push_back(act);
+	cut_action = ActionManager::register_action (popup_act_grp, X_("cut"), _("Cut"),
+                                                     sigc::ptr_fun (ProcessorBox::rb_cut));
+	ActionManager::plugin_selection_sensitive_actions.push_back(cut_action);
 	act = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"),
 			sigc::ptr_fun (ProcessorBox::rb_copy));
 	ActionManager::plugin_selection_sensitive_actions.push_back(act);
@@ -1566,68 +1988,70 @@ ProcessorBox::register_actions ()
 
 	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"),
+	rename_action = 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));
 
-	/* activation */
-	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));
-	ActionManager::plugin_selection_sensitive_actions.push_back(act);
+	/* activation etc. */
+
 	ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"),
 			sigc::ptr_fun (ProcessorBox::rb_activate_all));
 	ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate all"),
 			sigc::ptr_fun (ProcessorBox::rb_deactivate_all));
+	ActionManager::register_action (popup_act_grp, X_("ab_plugins"), _("A/B Plugins"),
+			sigc::ptr_fun (ProcessorBox::rb_ab_plugins));
 
 	/* show editors */
-	act = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit"),
-			sigc::ptr_fun (ProcessorBox::rb_edit));
-	ActionManager::plugin_selection_sensitive_actions.push_back(act);
+	edit_action = ActionManager::register_action (
+		popup_act_grp, X_("edit"), _("Edit..."),
+		sigc::ptr_fun (ProcessorBox::rb_edit));
+
+	/* show plugin GUI */
+	controls_action = ActionManager::register_action (
+			popup_act_grp, X_("controls"), _("Controls..."),
+			sigc::ptr_fun (ProcessorBox::rb_controls));
 
 	ActionManager::add_action_group (popup_act_grp);
 }
 
 void
-ProcessorBox::rb_choose_plugin ()
+ProcessorBox::rb_ab_plugins ()
 {
 	if (_current_processor_box == 0) {
 		return;
 	}
-	_current_processor_box->choose_plugin ();
+
+	_current_processor_box->ab_plugins ();
 }
 
 void
-ProcessorBox::rb_choose_insert ()
+ProcessorBox::rb_choose_plugin ()
 {
 	if (_current_processor_box == 0) {
 		return;
 	}
-	_current_processor_box->choose_insert ();
+	_current_processor_box->choose_plugin ();
 }
 
 void
-ProcessorBox::rb_choose_send ()
+ProcessorBox::rb_choose_insert ()
 {
 	if (_current_processor_box == 0) {
 		return;
 	}
-	_current_processor_box->choose_send ();
+	_current_processor_box->choose_insert ();
 }
 
 void
-ProcessorBox::rb_choose_return ()
+ProcessorBox::rb_choose_send ()
 {
 	if (_current_processor_box == 0) {
 		return;
 	}
-	_current_processor_box->choose_return ();
+	_current_processor_box->choose_send ();
 }
 
 void
@@ -1741,81 +2165,75 @@ ProcessorBox::rb_deselect_all ()
 }
 
 void
-ProcessorBox::rb_activate ()
+ProcessorBox::rb_activate_all ()
 {
 	if (_current_processor_box == 0) {
 		return;
 	}
 
-	_current_processor_box->for_selected_processors (&ProcessorBox::activate_processor);
+	_current_processor_box->all_processors_active (true);
 }
 
 void
-ProcessorBox::rb_deactivate ()
+ProcessorBox::rb_deactivate_all ()
 {
 	if (_current_processor_box == 0) {
 		return;
 	}
-	_current_processor_box->for_selected_processors (&ProcessorBox::deactivate_processor);
+	_current_processor_box->all_processors_active (false);
 }
 
 void
-ProcessorBox::rb_activate_all ()
+ProcessorBox::rb_edit ()
 {
 	if (_current_processor_box == 0) {
 		return;
 	}
 
-	_current_processor_box->all_processors_active (true);
+	_current_processor_box->for_selected_processors (&ProcessorBox::toggle_edit_processor);
 }
 
 void
-ProcessorBox::rb_deactivate_all ()
+ProcessorBox::rb_controls ()
 {
 	if (_current_processor_box == 0) {
 		return;
 	}
-	_current_processor_box->all_processors_active (false);
+
+	_current_processor_box->for_selected_processors (&ProcessorBox::toggle_processor_controls);
 }
 
 void
-ProcessorBox::rb_edit ()
+ProcessorBox::route_property_changed (const PropertyChange& what_changed)
 {
-	if (_current_processor_box == 0) {
+	if (!what_changed.contains (ARDOUR::Properties::name)) {
 		return;
 	}
 
-	_current_processor_box->for_selected_processors (&ProcessorBox::edit_processor);
-}
-
-void
-ProcessorBox::route_name_changed ()
-{
-	ENSURE_GUI_THREAD (mem_fun (*this, &ProcessorBox::route_name_changed));
+	ENSURE_GUI_THREAD (*this, &ProcessorBox::route_property_changed, what_changed);
 
 	boost::shared_ptr<Processor> processor;
 	boost::shared_ptr<PluginInsert> plugin_insert;
 	boost::shared_ptr<Send> send;
 
-	Gtk::TreeModel::Children children = model->children();
+	list<ProcessorEntry*> children = processor_display.children();
 
-	for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
-  		Gtk::TreeModel::Row row = *iter;
+	for (list<ProcessorEntry*>::iterator iter = children.begin(); iter != children.end(); ++iter) {
 
-  		processor= row[columns.processor];
+  		processor = (*iter)->processor ();
 
-		void* gui = processor->get_gui();
+		Window* w = get_processor_ui (processor);
 
-		if (!gui) {
+		if (!w) {
 			continue;
 		}
 
 		/* rename editor windows for sends and plugins */
 
 		if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
-			static_cast<Window*>(gui)->set_title (send->name ());
+			w->set_title (send->name ());
 		} else if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor)) != 0) {
-			static_cast<Window*>(gui)->set_title (generate_processor_title (plugin_insert));
+			w->set_title (generate_processor_title (plugin_insert));
 		}
 	}
 }
@@ -1838,3 +2256,120 @@ ProcessorBox::generate_processor_title (boost::shared_ptr<PluginInsert> pi)
 	return string_compose(_("%1: %2 (by %3)"), _route->name(), pi->name(), maker);
 }
 
+void
+ProcessorBox::on_size_allocate (Allocation& a)
+{
+	HBox::on_size_allocate (a);
+
+	list<ProcessorEntry*> children = processor_display.children ();
+	for (list<ProcessorEntry*>::const_iterator i = children.begin(); i != children.end(); ++i) {
+		(*i)->set_pixel_width (a.get_width ());
+	}
+}
+
+/** @param p Processor.
+ *  @return the UI window for \a p.
+ */
+Window *
+ProcessorBox::get_processor_ui (boost::shared_ptr<Processor> p) const
+{
+	list<ProcessorWindowProxy*>::const_iterator i = _processor_window_proxies.begin ();
+	while (i != _processor_window_proxies.end()) {
+		boost::shared_ptr<Processor> t = (*i)->processor().lock ();
+		if (t && t == p) {
+			return (*i)->get ();
+		}
+
+		++i;
+	}
+
+	/* we shouldn't get here, because the ProcessorUIList should always contain
+	   an entry for each processor.
+	*/
+	assert (false);
+	return 0;
+}
+
+/** Make a note of the UI window that a processor is using.
+ *  @param p Processor.
+ *  @param w UI window.
+ */
+void
+ProcessorBox::set_processor_ui (boost::shared_ptr<Processor> p, Gtk::Window* w)
+{
+ 	list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin ();
+
+	p->set_ui (w);
+
+	while (i != _processor_window_proxies.end()) {
+		boost::shared_ptr<Processor> t = (*i)->processor().lock ();
+		if (t && t == p) {
+			(*i)->set (w);
+			return;
+		}
+
+		++i;
+	}
+
+	/* we shouldn't get here, because the ProcessorUIList should always contain
+	   an entry for each processor.
+	*/
+	assert (false);
+}
+
+void
+ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr<Delivery> w)
+{
+	boost::shared_ptr<Delivery> d = w.lock ();
+	if (!d) {
+		return;
+	}
+
+	list<ProcessorEntry*> children = processor_display.children ();
+	list<ProcessorEntry*>::const_iterator i = children.begin();
+	while (i != children.end() && (*i)->processor() != d) {
+		++i;
+	}
+
+	if (i == children.end()) {
+		processor_display.set_active (0);
+	} else {
+		processor_display.set_active (*i);
+	}
+}
+
+void
+ProcessorBox::hide_things ()
+{
+	list<ProcessorEntry*> c = processor_display.children ();
+	for (list<ProcessorEntry*>::iterator i = c.begin(); i != c.end(); ++i) {
+		(*i)->hide_things ();
+	}
+}
+
+ProcessorWindowProxy::ProcessorWindowProxy (
+	string const & name,
+	XMLNode const * node,
+	ProcessorBox* box,
+	boost::weak_ptr<Processor> processor
+	)
+	: WindowProxy<Gtk::Window> (name, node)
+	, marked (false)
+	, _processor_box (box)
+	, _processor (processor)
+{
+
+}
+
+
+void
+ProcessorWindowProxy::show ()
+{
+	boost::shared_ptr<Processor> p = _processor.lock ();
+	if (!p) {
+		return;
+	}
+
+	_processor_box->toggle_edit_processor (p);
+}
+