The great audio processing overhaul.

The vast majority of Route signal processing is now simply in the list of
processors.  There are definitely regressions here, but there's also
a lot of things fixed.  It's far too much work to let diverge anymore
regardless, so here it is.

The basic model is: A route has a fixed set of input channels (matching
its JACK input ports and diskstream).  The first processor takes this
as input.  The next processor is configured using the first processor's
output as input, and is allowed to choose whatever output it wants
given that input... and so on, and so on.  Finally, the last processor's
requested output is used to set up the panner and create whatever Jack
ports are needed to output the data.

All 'special' internal processors (meter, fader, amp, insert, send) are
currently transparent: they read any input, and return the same set
of channels back (unmodified, except for amp).

User visible changes:
 * LV2 Instrument support (tracks with both MIDI and audio channels)
 * MIDI in/out plugin support
 * Generic plugin replication (for MIDI plugins, MIDI/audio plugins)
 * Movable meter point

Known Bugs:
 * Things seem to get weird on loaded sessions
 * Output delivery is sketchy
 * 2.0 session loading was probably already broken...
   but it's definitely broken now :)

Please test this and file bugs if you have any time...



git-svn-id: svn://localhost/ardour2/branches/3.0@5055 d708f5d6-7413-0410-9779-e7cbd77b26cf

21 files changed, 347 insertions, 266 deletions

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index b774182a88..6f8acc9651 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -106,7 +106,11 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 		create_automation_child (GainAutomation, false);
 	}
 	
-	_route->panner().Changed.connect (bind (mem_fun(*this, &AudioTimeAxisView::ensure_pan_views), false));
+	if (_route->panner()) {
+		_route->panner()->Changed.connect (bind (
+				mem_fun(*this, &AudioTimeAxisView::ensure_pan_views),
+				false));
+	}
 
 	/* map current state of the route */
 
@@ -370,13 +374,17 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
 void
 AudioTimeAxisView::ensure_pan_views (bool show)
 {
-	const set<Evoral::Parameter>& params = _route->panner().what_can_be_automated();
+	if (!_route->panner()) {
+		return;
+	}
+
+	const set<Evoral::Parameter>& params = _route->panner()->what_can_be_automated();
 	set<Evoral::Parameter>::iterator p;
 
 	for (p = params.begin(); p != params.end(); ++p) {
 		boost::shared_ptr<ARDOUR::AutomationControl> pan_control
 			= boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
-				_route->panner().data().control(*p));
+				_route->panner()->data().control(*p));
 		
 		if (pan_control->parameter().type() == NullAutomation) {
 			error << "Pan control has NULL automation type!" << endmsg;
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index ad8b02ab53..2e29c9c1c5 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -617,7 +617,7 @@ bool
 Keyboard::load_keybindings (string path)
 {
 	try {
-		cerr << "loading bindings from " << path << endl;
+		cerr << "Loading bindings from " << path << endl;
 
 		Gtk::AccelMap::load (path);
 
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 32454d69d5..0a95b9a94b 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -344,7 +344,7 @@ int main (int argc, char *argv[])
 	
 	cout << _("Ardour/GTK ") 
 	     << VERSIONSTRING
-	     << _("\n   (built using ")
+	     << _(" (built using ")
 	     << svn_revision
 #ifdef __GNUC__
 	     << _(" and GCC version ") << __VERSION__ 
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index fc358b8f7b..8a00eb88a2 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -413,20 +413,33 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 						   _("Click to Add/Edit Comments"):
 						   _route->comment());
 
-	connections.push_back (_route->meter_change.connect (mem_fun(*this, &MixerStrip::meter_changed)));
-	connections.push_back (_route->input_changed.connect (mem_fun(*this, &MixerStrip::input_changed)));
-	connections.push_back (_route->output_changed.connect (mem_fun(*this, &MixerStrip::output_changed)));
-	connections.push_back (_route->mix_group_changed.connect (mem_fun(*this, &MixerStrip::mix_group_changed)));
-	connections.push_back (_route->panner().Changed.connect (mem_fun(*this, &MixerStrip::connect_to_pan)));
+	connections.push_back (_route->meter_change.connect (
+			mem_fun(*this, &MixerStrip::meter_changed)));
+	connections.push_back (_route->input_changed.connect (
+			mem_fun(*this, &MixerStrip::input_changed)));
+	connections.push_back (_route->output_changed.connect (
+			mem_fun(*this, &MixerStrip::output_changed)));
+	connections.push_back (_route->mix_group_changed.connect (
+			mem_fun(*this, &MixerStrip::mix_group_changed)));
+
+	if (_route->panner()) {
+		connections.push_back (_route->panner()->Changed.connect (
+			mem_fun(*this, &MixerStrip::connect_to_pan)));
+	}
 
 	if (is_audio_track()) {
-		connections.push_back (audio_track()->DiskstreamChanged.connect (mem_fun(*this, &MixerStrip::diskstream_changed)));
-		connections.push_back (get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed)));
+		connections.push_back (audio_track()->DiskstreamChanged.connect (
+			mem_fun(*this, &MixerStrip::diskstream_changed)));
+		connections.push_back (get_diskstream()->SpeedChanged.connect (
+			mem_fun(*this, &MixerStrip::speed_changed)));
 	}
 
-	connections.push_back (_route->NameChanged.connect (mem_fun(*this, &RouteUI::name_changed)));
-	connections.push_back (_route->comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed)));
-	connections.push_back (_route->gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed)));
+	connections.push_back (_route->NameChanged.connect (
+			mem_fun(*this, &RouteUI::name_changed)));
+	connections.push_back (_route->comment_changed.connect (
+			mem_fun(*this, &MixerStrip::comment_changed)));
+	connections.push_back (_route->gui_changed.connect (
+			mem_fun(*this, &MixerStrip::route_gui_changed)));
 
 	set_stuff_from_route ();
 
@@ -553,17 +566,25 @@ MixerStrip::set_width (Width w, void* owner)
 		((Gtk::Label*)solo_button->get_child())->set_text (_("Solo"));
 
 		if (_route->comment() == "") {
-		       comment_button.unset_bg (STATE_NORMAL);
-		       ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
+			comment_button.unset_bg (STATE_NORMAL);
+			((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
 		} else {
-		       comment_button.modify_bg (STATE_NORMAL, color());
-		       ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
+			comment_button.modify_bg (STATE_NORMAL, color());
+			((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
+		}
+
+		((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
+				gpm.astyle_string(gain_automation->automation_style()));
+		((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
+				gpm.astate_string(gain_automation->automation_state()));
+
+		if (_route->panner()) {
+			((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (
+					panners.astyle_string(_route->panner()->automation_style()));
+			((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (
+					panners.astate_string(_route->panner()->automation_state()));
 		}
 
-		((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(gain_automation->automation_style()));
-		((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(gain_automation->automation_state()));
-		((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.astyle_string(_route->panner().automation_style()));
-		((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.astate_string(_route->panner().automation_state()));
 		Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
 		set_size_request (-1, -1);
 		break;
@@ -583,10 +604,18 @@ MixerStrip::set_width (Width w, void* owner)
 		       ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
 		}
 
-		((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(gain_automation->automation_style()));
-		((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(gain_automation->automation_state()));
-		((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style()));
-		((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state()));
+		((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
+				gpm.short_astyle_string(gain_automation->automation_style()));
+		((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
+				gpm.short_astate_string(gain_automation->automation_state()));
+		
+		if (_route->panner()) {
+			((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (
+			panners.short_astyle_string(_route->panner()->automation_style()));
+			((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (
+			panners.short_astate_string(_route->panner()->automation_state()));
+		}
+
 		Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
 		set_size_request (max (50, gpm.get_gm_width()), -1);
 		break;
@@ -856,9 +885,13 @@ MixerStrip::connect_to_pan ()
 	panstate_connection.disconnect ();
 	panstyle_connection.disconnect ();
 
-		boost::shared_ptr<ARDOUR::AutomationControl> pan_control
-			= boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
-				_route->panner().data().control(Evoral::Parameter( PanAutomation ) ));
+	if (!_route->panner()) {
+		return;
+	}
+
+	boost::shared_ptr<ARDOUR::AutomationControl> pan_control
+		= boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
+				_route->panner()->data().control(Evoral::Parameter(PanAutomation)));
 
 	if (pan_control) {
 		panstate_connection = pan_control->alist()->automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
@@ -1407,7 +1440,6 @@ MixerStrip::engine_running ()
 void
 MixerStrip::meter_changed (void *src)
 {
-
 	ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src));
 
 	switch (_route->meter_point()) {
diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index 0216e76c27..b6c601cdef 100644
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -65,15 +65,15 @@ Panner2d::Target::set_text (const char* txt)
 	text = strdup (txt);
 }
 
-Panner2d::Panner2d (Panner& p, int32_t h)
+Panner2d::Panner2d (boost::shared_ptr<Panner> p, int32_t h)
 	: panner (p), width (0), height (h)
 {
 	allow_x = false;
 	allow_y = false;
 	allow_target = false;
 
-	panner.StateChanged.connect (mem_fun(*this, &Panner2d::handle_state_change));
-	panner.Changed.connect (mem_fun(*this, &Panner2d::handle_position_change));
+	panner->StateChanged.connect (mem_fun(*this, &Panner2d::handle_state_change));
+	panner->Changed.connect (mem_fun(*this, &Panner2d::handle_position_change));
 	
 	drag_target = 0;
 	set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
@@ -135,7 +135,7 @@ Panner2d::reset (uint32_t n_inputs)
 			
 			if (existing_pucks < i) {
 				float x, y;
-				panner.streampanner (i).get_position (x, y);
+				panner->streampanner (i).get_position (x, y);
 				pucks[i]->x.set_value (x);
 				pucks[i]->y.set_value (y);
 			}
@@ -147,11 +147,11 @@ Panner2d::reset (uint32_t n_inputs)
 	
 	/* add all outputs */
 	
-	while (targets.size() < panner.nouts()) {
+	while (targets.size() < panner->nouts()) {
 		add_target (0.0, 0.0);
 	}
 	
-	while (targets.size() > panner.nouts()) {
+	while (targets.size() > panner->nouts()) {
 		targets.erase (targets.begin());
 	}
 
@@ -159,13 +159,13 @@ Panner2d::reset (uint32_t n_inputs)
 		(*x).second->visible = false;
 	}
 
-	for (uint32_t n = 0; n < panner.nouts(); ++n) {
+	for (uint32_t n = 0; n < panner->nouts(); ++n) {
 		char buf[16];
 
 		snprintf (buf, sizeof (buf), "%d", n+1);
 		targets[n]->set_text (buf);
-		targets[n]->x.set_value (panner.output(n).x);
-		targets[n]->y.set_value (panner.output(n).y);
+		targets[n]->x.set_value (panner->output(n).x);
+		targets[n]->y.set_value (panner->output(n).y);
 		targets[n]->visible = true;
 	}
 	
@@ -275,14 +275,14 @@ Panner2d::handle_position_change ()
 
 	for (n = 0; n < pucks.size(); ++n) {
 		float x, y;
-		panner.streampanner(n).get_position (x, y);
+		panner->streampanner(n).get_position (x, y);
 		pucks[n]->x.set_value (x);
 		pucks[n]->y.set_value (y);
 	}
 
 	for (n = 0; n < targets.size(); ++n) {
-		targets[n]->x.set_value (panner.output(n).x);
-		targets[n]->y.set_value (panner.output(n).y);
+		targets[n]->x.set_value (panner->output(n).x);
+		targets[n]->y.set_value (panner->output(n).y);
 	}
 
 	queue_draw ();
@@ -454,7 +454,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
 	cairo_set_line_width (cr, 1.0);
 
 	cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height);
-	if (!panner.bypassed()) {
+	if (!panner->bypassed()) {
 		cairo_set_source_rgba (cr, 0.1, 0.1, 0.1, 1.0);
 	} else {
 		cairo_set_source_rgba (cr, 0.1, 0.1, 0.1, 0.2);
@@ -478,7 +478,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
 	cairo_arc (cr, height/2, height/2, height/2, 0, 2.0 * M_PI);
 	cairo_stroke (cr);
 
-	if (!panner.bypassed()) {
+	if (!panner->bypassed()) {
 		float arc_radius;
 
 		cairo_select_font_face (cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
@@ -715,7 +715,8 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state)
 			
 			if (drag_is_puck) {
 				
-				panner.streampanner(drag_index).set_position (drag_target->x.get_value(), drag_target->y.get_value(), false);
+				panner->streampanner(drag_index).set_position (
+						drag_target->x.get_value(), drag_target->y.get_value(), false);
 				
 			} else {
 				
@@ -745,7 +746,7 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state)
 void
 Panner2d::toggle_bypass ()
 {
-	panner.set_bypassed (!panner.bypassed());
+	panner->set_bypassed (!panner->bypassed());
 }
 
 void
@@ -766,7 +767,7 @@ Panner2d::allow_y_motion (bool yn)
 	allow_y = yn;
 }
 
-Panner2dWindow::Panner2dWindow (Panner&p, int32_t h, uint32_t inputs)
+Panner2dWindow::Panner2dWindow (boost::shared_ptr<Panner> p, int32_t h, uint32_t inputs)
 	: widget (p, h)
 	, reset_button (_("Reset"))
 	, bypass_button (_("Bypass"))
diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h
index 2bf57f2627..1abac7fe5a 100644
--- a/gtk2_ardour/panner2d.h
+++ b/gtk2_ardour/panner2d.h
@@ -54,7 +54,7 @@ class Panner2dWindow;
 class Panner2d : public Gtk::DrawingArea
 {
   public:
-	Panner2d (ARDOUR::Panner&, int32_t height);
+	Panner2d (boost::shared_ptr<ARDOUR::Panner>, int32_t height);
 	~Panner2d ();
 	
 	void allow_x_motion(bool);
@@ -76,7 +76,7 @@ class Panner2d : public Gtk::DrawingArea
 
 	Gtk::Adjustment& azimuth (uint32_t which);
 
-	ARDOUR::Panner& get_panner() const { return panner; }
+	boost::shared_ptr<ARDOUR::Panner> get_panner() const { return panner; }
 	
 	sigc::signal<void,int> PuckMoved;
 	sigc::signal<void,int> TargetMoved;
@@ -102,7 +102,7 @@ class Panner2d : public Gtk::DrawingArea
 	    void set_text (const char*);
 	};
 
-	ARDOUR::Panner& panner;
+	boost::shared_ptr<ARDOUR::Panner> panner;
 	Glib::RefPtr<Pango::Layout> layout;
 
 	typedef std::map<int,Target *> Targets;
@@ -137,7 +137,7 @@ class Panner2d : public Gtk::DrawingArea
 class Panner2dWindow : public Gtk::Window
 {
   public:
-	Panner2dWindow (ARDOUR::Panner&, int32_t height, uint32_t inputs);
+	Panner2dWindow (boost::shared_ptr<ARDOUR::Panner>, int32_t height, uint32_t inputs);
 	
 	void reset (uint32_t n_inputs);
 
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 2df79d2c39..4777c82479 100644
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -132,6 +132,11 @@ PannerUI::PannerUI (Session& s)
 void
 PannerUI::set_io (boost::shared_ptr<IO> io)
 {
+	if (!io->panner()) {
+		cerr << "PannerUI::set_io IO has no panners" << endl;
+		return;
+	}
+
  	connections.clear ();
 	
 	delete pan_astyle_menu;
@@ -142,9 +147,12 @@ PannerUI::set_io (boost::shared_ptr<IO> io)
  			
  	_io = io;
  
- 	connections.push_back (_io->panner().Changed.connect (mem_fun(*this, &PannerUI::panner_changed)));
- 	connections.push_back (_io->panner().LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage)));
- 	connections.push_back (_io->panner().StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state)));
+ 	connections.push_back (_io->panner()->Changed.connect (
+			mem_fun(*this, &PannerUI::panner_changed)));
+ 	connections.push_back (_io->panner()->LinkStateChanged.connect (
+			mem_fun(*this, &PannerUI::update_pan_linkage)));
+ 	connections.push_back (_io->panner()->StateChanged.connect (
+			mem_fun(*this, &PannerUI::update_pan_state)));
  
 	delete panner;
 	panner = 0;
@@ -185,14 +193,18 @@ PannerUI::build_astate_menu ()
 		pan_astate_menu->items().clear ();
 	}
 
-	pan_astate_menu->items().push_back (MenuElem (_("Manual"), 
-						     bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Off)));
-	pan_astate_menu->items().push_back (MenuElem (_("Play"),
-						     bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Play)));
-	pan_astate_menu->items().push_back (MenuElem (_("Write"),
-						     bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Write)));
-	pan_astate_menu->items().push_back (MenuElem (_("Touch"),
-						     bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Touch)));
+	pan_astate_menu->items().push_back (MenuElem (_("Manual"), bind (
+			mem_fun (_io->panner().get(), &Panner::set_automation_state),
+			(AutoState) Off)));
+	pan_astate_menu->items().push_back (MenuElem (_("Play"), bind (
+			mem_fun (_io->panner().get(), &Panner::set_automation_state),
+			(AutoState) Play)));
+	pan_astate_menu->items().push_back (MenuElem (_("Write"), bind (
+			mem_fun (_io->panner().get(), &Panner::set_automation_state),
+			(AutoState) Write)));
+	pan_astate_menu->items().push_back (MenuElem (_("Touch"), bind (
+			mem_fun (_io->panner().get(), &Panner::set_automation_state),
+			(AutoState) Touch)));
 
 }
 
@@ -228,7 +240,7 @@ bool
 PannerUI::panning_link_button_release (GdkEventButton* ev)
 {
 	if (!ignore_toggle) {
-		_io->panner().set_linked (!_io->panner().linked());
+		_io->panner()->set_linked (!_io->panner()->linked());
 	}
 	return true;
 }
@@ -236,12 +248,12 @@ PannerUI::panning_link_button_release (GdkEventButton* ev)
 void
 PannerUI::panning_link_direction_clicked()
 {
-	switch (_io->panner().link_direction()) {
+	switch (_io->panner()->link_direction()) {
 	case Panner::SameDirection:
-		_io->panner().set_link_direction (Panner::OppositeDirection);
+		_io->panner()->set_link_direction (Panner::OppositeDirection);
 		break;
 	default:
-		_io->panner().set_link_direction (Panner::SameDirection);
+		_io->panner()->set_link_direction (Panner::SameDirection);
 		break;
 	}
 }
@@ -251,7 +263,7 @@ PannerUI::update_pan_linkage ()
 {
 	ENSURE_GUI_THREAD(mem_fun(*this, &PannerUI::update_pan_linkage));
 	
-	bool x = _io->panner().linked();
+	bool x = _io->panner()->linked();
 	bool bx = panning_link_button.get_active();
 
 	if (x != bx) {
@@ -263,7 +275,7 @@ PannerUI::update_pan_linkage ()
 
 	panning_link_direction_button.set_sensitive (x);
 
-	switch (_io->panner().link_direction()) {
+	switch (_io->panner()->link_direction()) {
 	case Panner::SameDirection:
 	        panning_link_direction_button.set_image (*(manage (new Image (get_xpm ("forwardblarrow.xpm")))));
 		break;
@@ -325,6 +337,10 @@ PannerUI::update_pan_state ()
 void
 PannerUI::setup_pan ()
 {
+	if (!_io->panner()) {
+		return;
+	}
+
 	uint32_t nouts = _io->n_outputs ().n_audio();
 
 	if (nouts == 0 || nouts == 1) {
@@ -346,7 +362,7 @@ PannerUI::setup_pan ()
 	} else if (nouts == 2) {
 
 		vector<Adjustment*>::size_type asz;
-		uint32_t npans = _io->panner().npanners();
+		uint32_t npans = _io->panner()->npanners();
 
 		while (!pan_adjustments.empty()) {
 			delete pan_bars.back();
@@ -363,7 +379,7 @@ PannerUI::setup_pan ()
 			/* initialize adjustment with 0.0 (L) or 1.0 (R) for the first and second panners,
 			   which serves as a default, otherwise use current value */
 
-			rx = _io->panner().pan_control( asz)->get_value();
+			rx = _io->panner()->pan_control( asz)->get_value();
 
 			if (npans == 1) {
 				x = 0.5;
@@ -377,13 +393,13 @@ PannerUI::setup_pan ()
 
 			pan_adjustments.push_back (new Adjustment (x, 0, 1.0, 0.05, 0.1));
 			bc = new PannerBar (*pan_adjustments[asz],
-				boost::static_pointer_cast<PBD::Controllable>( _io->panner().pan_control( asz )) );
+				boost::static_pointer_cast<PBD::Controllable>( _io->panner()->pan_control( asz )) );
 
 			/* now set adjustment with current value of panner, then connect the signals */
 			pan_adjustments.back()->set_value(rx);
 			pan_adjustments.back()->signal_value_changed().connect (bind (mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz));
 
-			_io->panner().pan_control( asz )->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz));
+			_io->panner()->pan_control( asz )->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz));
 
 			
 			bc->set_name ("PanSlider");
@@ -418,11 +434,10 @@ PannerUI::setup_pan ()
 
 	} else {
 
-		if (panner == 0) {
+		if (!panner) {
 			panner = new Panner2d (_io->panner(), 61);
 			panner->set_name ("MixerPanZone");
 			panner->show ();
-
  
  			panner->signal_button_press_event().connect
  				(bind (mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) 0), false);
@@ -485,7 +500,7 @@ PannerUI::build_pan_menu (uint32_t which)
 	
 	/* set state first, connect second */
 
-	(dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_io->panner().streampanner(which).muted());
+	(dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_io->panner()->streampanner(which).muted());
 	(dynamic_cast<CheckMenuItem*> (&items.back()))->signal_toggled().connect
 		(bind (mem_fun(*this, &PannerUI::pan_mute), which));
 
@@ -494,7 +509,7 @@ PannerUI::build_pan_menu (uint32_t which)
 
 	/* set state first, connect second */
 
-	bypass_menu_item->set_active (_io->panner().bypassed());
+	bypass_menu_item->set_active (_io->panner()->bypassed());
 	bypass_menu_item->signal_toggled().connect (mem_fun(*this, &PannerUI::pan_bypass_toggle));
 
 	items.push_back (MenuElem (_("Reset"), bind (mem_fun (*this, &PannerUI::pan_reset), which)));
@@ -505,34 +520,34 @@ PannerUI::build_pan_menu (uint32_t which)
 void
 PannerUI::pan_mute (uint32_t which)
 {
-	StreamPanner& sp = _io->panner().streampanner(which);
+	StreamPanner& sp = _io->panner()->streampanner(which);
 	sp.set_muted (!sp.muted());
 }
 
 void
 PannerUI::pan_bypass_toggle ()
 {
-	if (bypass_menu_item && (_io->panner().bypassed() != bypass_menu_item->get_active())) {
-		_io->panner().set_bypassed (!_io->panner().bypassed());
+	if (bypass_menu_item && (_io->panner()->bypassed() != bypass_menu_item->get_active())) {
+		_io->panner()->set_bypassed (!_io->panner()->bypassed());
 	}
 }
 
 void
 PannerUI::pan_reset (uint32_t which)
 {
-	_io->panner().reset_streampanner (which);
+	_io->panner()->reset_streampanner (which);
 }
 
 void
 PannerUI::pan_reset_all ()
 {
-	_io->panner().reset_to_default ();
+	_io->panner()->reset_to_default ();
 }
 
 void
 PannerUI::effective_pan_display ()
 {
-	if (_io->panner().empty()) {
+	if (_io->panner()->empty()) {
 		return;
 	}
 
@@ -559,7 +574,7 @@ PannerUI::pan_changed (void *src)
 		return;
 	}
 
-	switch (_io->panner().npanners()) {
+	switch (_io->panner()->npanners()) {
 	case 0:
 		panning_link_direction_button.set_sensitive (false);
 		panning_link_button.set_sensitive (false);
@@ -595,11 +610,11 @@ PannerUI::pan_changed (void *src)
 void
 PannerUI::pan_adjustment_changed (uint32_t which)
 {
-	if (!in_pan_update && which < _io->panner().npanners()) {
+	if (!in_pan_update && which < _io->panner()->npanners()) {
 
 		float xpos;
 		float val = pan_adjustments[which]->get_value ();
-		xpos = _io->panner().pan_control( which )->get_value();
+		xpos = _io->panner()->pan_control( which )->get_value();
 
 		/* add a kinda-sorta detent for the middle */
 		
@@ -616,7 +631,7 @@ PannerUI::pan_adjustment_changed (uint32_t which)
 		
 		if (!Panner::equivalent (val, xpos)) {
 
-			_io->panner().streampanner(which).set_position (val);
+			_io->panner()->streampanner(which).set_position (val);
 			/* XXX 
 			   the panner objects have no access to the session,
 			   so do this here. ick.
@@ -631,11 +646,11 @@ PannerUI::pan_value_changed (uint32_t which)
 {
 	ENSURE_GUI_THREAD (bind (mem_fun(*this, &PannerUI::pan_value_changed), which));
 							   
-	if (_io->n_outputs().n_audio() > 1 && which < _io->panner().npanners()) {
+	if (_io->n_outputs().n_audio() > 1 && which < _io->panner()->npanners()) {
 		float xpos;
 		float val = pan_adjustments[which]->get_value ();
 
-		_io->panner().streampanner(which).get_position (xpos);
+		_io->panner()->streampanner(which).get_position (xpos);
 
 		if (!Panner::equivalent (val, xpos)) {
 			in_pan_update = true;
@@ -661,14 +676,14 @@ PannerUI::update_pan_bars (bool only_if_aplay)
 		float xpos, val;
 
 		if (only_if_aplay) {
-			boost::shared_ptr<AutomationList> alist (_io->panner().streampanner(n).pan_control()->alist());
+			boost::shared_ptr<AutomationList> alist (_io->panner()->streampanner(n).pan_control()->alist());
 			
 			if (!alist->automation_playback()) {
 				continue;
 			}
 		}
 
-		_io->panner().streampanner(n).get_effective_position (xpos);
+		_io->panner()->streampanner(n).get_effective_position (xpos);
 		val = (*i)->get_value ();
 		
 		if (!Panner::equivalent (val, xpos)) {
@@ -699,7 +714,7 @@ PannerUI::pan_printer (char *buf, uint32_t len, Adjustment* adj)
 void
 PannerUI::update_pan_sensitive () 
 {
-	bool sensitive = !(_io->panner().automation_state() & Play);
+	bool sensitive = !(_io->panner()->automation_state() & Play);
 
 	switch (_io->n_outputs().n_audio()) {
 	case 0:
@@ -771,10 +786,10 @@ PannerUI::pan_automation_style_changed ()
 	
 	switch (_width) {
 	case Wide:
-	        pan_automation_style_button.set_label (astyle_string(_io->panner().automation_style()));
+	        pan_automation_style_button.set_label (astyle_string(_io->panner()->automation_style()));
 		break;
 	case Narrow:
-	  	pan_automation_style_button.set_label (short_astyle_string(_io->panner().automation_style()));
+	  	pan_automation_style_button.set_label (short_astyle_string(_io->panner()->automation_style()));
 		break;
 	}
 }
@@ -788,10 +803,10 @@ PannerUI::pan_automation_state_changed ()
 
 	switch (_width) {
 	case Wide:
-	  pan_automation_state_button.set_label (astate_string(_io->panner().automation_state()));
+	  pan_automation_state_button.set_label (astate_string(_io->panner()->automation_state()));
 		break;
 	case Narrow:
-	  pan_automation_state_button.set_label (short_astate_string(_io->panner().automation_state()));
+	  pan_automation_state_button.set_label (short_astate_string(_io->panner()->automation_state()));
 		break;
 	}
 
@@ -800,11 +815,11 @@ PannerUI::pan_automation_state_changed ()
 	   here.
 	*/
 
-	if (_io->panner().empty()) {
+	if (_io->panner()->empty()) {
 		return;
 	}
 
-	x = (_io->panner().streampanner(0).pan_control()->alist()->automation_state() != Off);
+	x = (_io->panner()->streampanner(0).pan_control()->alist()->automation_state() != Off);
 
 	if (pan_automation_state_button.get_active() != x) {
 	ignore_toggle = true;
diff --git a/gtk2_ardour/po/de_DE.po b/gtk2_ardour/po/de_DE.po
index 7087f0c278..4fc76bc7da 100644
--- a/gtk2_ardour/po/de_DE.po
+++ b/gtk2_ardour/po/de_DE.po
@@ -7312,8 +7312,7 @@ msgstr "Ardour/GTK "
 
 #: gtk2_ardour/main.cc:294
 msgid ""
-"\n"
-"   (built using "
+" (built using "
 msgstr ""
 "\n"
 "   (kompiliert mit Version "
@@ -7355,7 +7354,7 @@ msgid "could not create ARDOUR GUI"
 msgstr "konnte das grafische Ardour User Interface nicht erstellen"
 
 #: gtk2_ardour/ui_config.cc:78
-msgid "loading default ui configuration file %1"
+msgid "Loading default ui configuration file %1"
 msgstr "lade voreingestellte UI-Konfigurationsdatei %1"
 
 #: gtk2_ardour/ui_config.cc:81
@@ -7367,8 +7366,8 @@ msgid "Ardour: default ui configuration file \"%1\" not loaded successfully."
 msgstr "Ardour: Die voreingestellte UI-Konfigurationsdatei \"%1\" konnte nicht geladen werden."
 
 #: gtk2_ardour/ui_config.cc:104
-msgid "loading user ui configuration file %1"
-msgstr "lade benutzerdefinierte UI-Konfigurationsdatei %1"
+msgid "Loading user ui configuration file %1"
+msgstr "Lade benutzerdefinierte UI-Konfigurationsdatei %1"
 
 #: gtk2_ardour/ui_config.cc:107
 msgid "Ardour: cannot read ui configuration file \"%1\""
diff --git a/gtk2_ardour/po/el_GR.po b/gtk2_ardour/po/el_GR.po
index fdbe8f0673..c34906e607 100644
--- a/gtk2_ardour/po/el_GR.po
+++ b/gtk2_ardour/po/el_GR.po
@@ -4931,8 +4931,7 @@ msgstr "Ardour/GTK "
 
 #: main.cc:401
 msgid ""
-"\n"
-"   (built using "
+" (built using "
 msgstr ""
 
 #: main.cc:405
diff --git a/gtk2_ardour/po/es_ES.po b/gtk2_ardour/po/es_ES.po
index c6c0c7415e..682e85199b 100644
--- a/gtk2_ardour/po/es_ES.po
+++ b/gtk2_ardour/po/es_ES.po
@@ -4900,8 +4900,7 @@ msgstr ""
 
 #: main.cc:401
 msgid ""
-"\n"
-"   (built using "
+" (built using "
 msgstr ""
 
 #: main.cc:405
diff --git a/gtk2_ardour/po/fr_FR.po b/gtk2_ardour/po/fr_FR.po
index 100e2dbedf..7ae67b2df7 100644
--- a/gtk2_ardour/po/fr_FR.po
+++ b/gtk2_ardour/po/fr_FR.po
@@ -5528,8 +5528,7 @@ msgstr "Ardour/GTK"
 
 #: gtk2_ardour/main.cc:314
 msgid ""
-"\n"
-"   (built using "
+" (built using "
 msgstr ""
 "\n"
 "   (construit avec "
@@ -7004,7 +7003,7 @@ msgid "programming error: request for non-existent audio range (%1)!"
 msgstr "programming error: request for non-existent audio range (%1)!"
 
 #: gtk2_ardour/ui_config.cc:67
-msgid "loading default ui configuration file %1"
+msgid "Loading default ui configuration file %1"
 msgstr ""
 "Chargement du fichier de style par défaut (%1) pour l'interface graphique"
 
@@ -7021,9 +7020,9 @@ msgstr ""
 "graphique n'a pas pu être chargé correctement."
 
 #: gtk2_ardour/ui_config.cc:93
-msgid "loading user ui configuration file %1"
+msgid "Loading user ui configuration file %1"
 msgstr ""
-"chargement du fichier utilisateur (%1) pour la configuration de l'interface "
+"Chargement du fichier utilisateur (%1) pour la configuration de l'interface "
 "graphique"
 
 #: gtk2_ardour/ui_config.cc:96
diff --git a/gtk2_ardour/po/it_IT.po b/gtk2_ardour/po/it_IT.po
index 018bce6576..c550eb5132 100644
--- a/gtk2_ardour/po/it_IT.po
+++ b/gtk2_ardour/po/it_IT.po
@@ -4790,8 +4790,7 @@ msgstr ""
 
 #: main.cc:401
 msgid ""
-"\n"
-"   (built using "
+" (built using "
 msgstr ""
 
 #: main.cc:405
diff --git a/gtk2_ardour/po/pl_PL.po b/gtk2_ardour/po/pl_PL.po
index b01253b6e5..2e19de45d2 100644
--- a/gtk2_ardour/po/pl_PL.po
+++ b/gtk2_ardour/po/pl_PL.po
@@ -6147,8 +6147,7 @@ msgstr "Ardour/GTK "
 
 #: gtk2_ardour/main.cc:272
 msgid ""
-"\n"
-"   (built using "
+" (built using "
 msgstr ""
 "\n"
 "   (skompilowany przy użyciu "
@@ -7636,7 +7635,7 @@ msgid "programming error: request for non-existent audio range (%1)!"
 msgstr ""
 
 #: gtk2_ardour/ui_config.cc:76
-msgid "loading default ui configuration file %1"
+msgid "Loading default ui configuration file %1"
 msgstr ""
 
 #: gtk2_ardour/ui_config.cc:79
@@ -7648,7 +7647,7 @@ msgid "Ardour: default ui configuration file \"%1\" not loaded successfully."
 msgstr ""
 
 #: gtk2_ardour/ui_config.cc:102
-msgid "loading user ui configuration file %1"
+msgid "Loading user ui configuration file %1"
 msgstr ""
 
 #: gtk2_ardour/ui_config.cc:105
diff --git a/gtk2_ardour/po/pt_BR.po b/gtk2_ardour/po/pt_BR.po
index e327dd1549..4de77b1748 100644
--- a/gtk2_ardour/po/pt_BR.po
+++ b/gtk2_ardour/po/pt_BR.po
@@ -4852,8 +4852,7 @@ msgstr ""
 
 #: main.cc:401
 msgid ""
-"\n"
-"   (built using "
+" (built using "
 msgstr ""
 
 #: main.cc:405
diff --git a/gtk2_ardour/po/pt_PT.po b/gtk2_ardour/po/pt_PT.po
index 7af0a59254..253628e405 100644
--- a/gtk2_ardour/po/pt_PT.po
+++ b/gtk2_ardour/po/pt_PT.po
@@ -4529,8 +4529,7 @@ msgstr ""
 
 #: main.cc:401
 msgid ""
-"\n"
-"   (built using "
+" (built using "
 msgstr ""
 "\n"
 "   (compilado "
diff --git a/gtk2_ardour/po/ru_RU.po b/gtk2_ardour/po/ru_RU.po
index 6ef4bf5878..dc97ef025e 100644
--- a/gtk2_ardour/po/ru_RU.po
+++ b/gtk2_ardour/po/ru_RU.po
@@ -4761,8 +4761,7 @@ msgstr "Ardour/GTK "
 
 #: gtk2_ardour/main.cc:388
 msgid ""
-"\n"
-"   (built using "
+" (built using "
 msgstr ""
 "\n"
 "   (собран с использованием "
diff --git a/gtk2_ardour/po/sv_SE.po b/gtk2_ardour/po/sv_SE.po
index 66edd56dcc..dba2d07134 100644
--- a/gtk2_ardour/po/sv_SE.po
+++ b/gtk2_ardour/po/sv_SE.po
@@ -4797,8 +4797,7 @@ msgstr ""
 
 #: ../main.cc:397
 msgid ""
-"\n"
-"   (built using "
+" (built using "
 msgstr ""
 "\n"
 "   (kompilerat med "
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 75d9281a94..2bf988aad9 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -37,17 +37,19 @@
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/window_title.h>
 
+#include "ardour/amp.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/audio_track.h"
+#include "ardour/audioengine.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/meter.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/port_insert.h"
-#include "ardour/ladspa_plugin.h"
 #include "ardour/profile.h"
+#include "ardour/route.h"
+#include "ardour/send.h"
+#include "ardour/session.h"
 
 #include "ardour_ui.h"
 #include "ardour_dialog.h"
@@ -82,19 +84,21 @@ bool ProcessorBox::get_colors = true;
 Gdk::Color* ProcessorBox::active_processor_color;
 Gdk::Color* ProcessorBox::inactive_processor_color;
 
-ProcessorBox::ProcessorBox (Placement pcmnt, Session& sess, PluginSelector &plugsel, 
+ProcessorBox::ProcessorBox (Placement pcmnt, Session& sess, PluginSelector &plugsel,
 			    RouteRedirectSelection & rsel, bool owner_is_mixer)
-	: _session(sess), 
-	  _owner_is_mixer (owner_is_mixer), 
-	  _placement(pcmnt), 
-	  _plugin_selector(plugsel),
-	  _rr_selection(rsel)
+	: _session(sess)
+	, _owner_is_mixer (owner_is_mixer)
+	, _placement(pcmnt)
+	, _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 ("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 ));
+		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;
 	}
 
@@ -123,24 +127,29 @@ ProcessorBox::ProcessorBox (Placement pcmnt, Session& sess, PluginSelector &plug
 	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);
 
-	processor_eventbox.signal_enter_notify_event().connect (bind (sigc::ptr_fun (ProcessorBox::enter_box), this));
+	processor_eventbox.signal_enter_notify_event().connect (bind (
+			sigc::ptr_fun (ProcessorBox::enter_box),
+			this));
 
-	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));
+	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 ()
@@ -154,9 +163,12 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
 
 	_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)));
+	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 ();
 }
@@ -172,8 +184,8 @@ ProcessorBox::route_going_away ()
 void
 ProcessorBox::object_drop (const list<boost::shared_ptr<Processor> >& procs)
 {
-	for (std::list<boost::shared_ptr<Processor> >::const_iterator i = procs.begin(); i != procs.end(); ++i) {
-
+	for (std::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);
@@ -207,11 +219,9 @@ ProcessorBox::remove_processor_gui (boost::shared_ptr<Processor> processor)
 	boost::shared_ptr<PortInsert> port_insert;
 
 	if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
-
 		PortInsertUI *io_selector = reinterpret_cast<PortInsertUI *> (port_insert->get_gui());
 		port_insert->set_gui (0);
 		delete io_selector;
-
 	} else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
 		SendUIWindow *sui = reinterpret_cast<SendUIWindow*> (send->get_gui());
 		send->set_gui (0);
@@ -219,9 +229,8 @@ ProcessorBox::remove_processor_gui (boost::shared_ptr<Processor> processor)
 	}
 }
 
-void 
+void
 ProcessorBox::build_send_action_menu ()
-
 {
 	using namespace Menu_Helpers;
 
@@ -235,13 +244,11 @@ ProcessorBox::build_send_action_menu ()
 
 void
 ProcessorBox::show_send_controls ()
-
 {
 }
 
 void
 ProcessorBox::new_send ()
-
 {
 }
 
@@ -292,17 +299,17 @@ 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
@@ -314,7 +321,7 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev)
 		_plugin_selector.show_manager ();
 	}
 
-	
+
 	return ret;
 }
 
@@ -337,10 +344,12 @@ 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);
@@ -350,7 +359,7 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev)
 #ifndef GTKOSX
 		   && (Keyboard::no_modifier_keys_pressed (ev) && ((ev->state & Gdk::BUTTON2_MASK) == Gdk::BUTTON2_MASK))
 #endif
-		) {		
+		) {
 
 		/* button2-click with no/appropriate modifiers */
 
@@ -361,7 +370,7 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev)
 		}
 		ret = true;
 
-	} 
+	}
 
 	return ret;
 }
@@ -407,23 +416,25 @@ 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, _placement));
+		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_streams)) {
+
+		if (_route->add_processor (processor, &err_streams, 0, _placement)) {
 			weird_plugin_dialog (**p, err_streams, _route);
-			// XXX SHAREDPTR delete plugin here .. do we even need to care? 
+			// 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)));
+			processor->ActiveChanged.connect (bind (
+					mem_fun (*this, &ProcessorBox::show_processor_active),
+					boost::weak_ptr<Processor>(processor)));
 		}
 	}
 }
@@ -448,7 +459,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams, b
 		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";
+	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");
 	}
@@ -456,7 +467,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams, b
 		text += string_compose("\t%1 ", streams.count.n_audio()) + _("audio channel(s)\n");
 	}
 
-	text += "\nArdour is unable to insert this plugin here.\n";
+	text += _("\nArdour is unable to insert this plugin here.\n");
 	label.set_text(text);
 
 	dialog.get_vbox()->pack_start (label);
@@ -473,15 +484,17 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams, b
 void
 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));
+	processor->ActiveChanged.connect (bind (
+			mem_fun(*this, &ProcessorBox::show_processor_active),
+			boost::weak_ptr<Processor>(processor)));
+	_route->add_processor (processor, 0, 0, _placement);
 }
 
 void
 ProcessorBox::choose_send ()
 {
-	boost::shared_ptr<Send> send (new Send (_session, _placement));
+	boost::shared_ptr<Send> send (new Send (_session));
 	//send->set_default_type(_route->default_type());
 
 	ChanCount outs;
@@ -502,11 +515,11 @@ ProcessorBox::choose_send ()
 		error << string_compose (_("Cannot set up new send: %1"), err.what()) << endmsg;
 		return;
 	}
-	
+
 	/* let the user adjust the output setup (number and connections) before passing
 	   it along to the Route
 	*/
-	
+
 	IOSelectorWindow *ios = new IOSelectorWindow (_session, send->io(), false, true);
 
 	ios->show_all ();
@@ -516,8 +529,10 @@ ProcessorBox::choose_send ()
 	_send_being_created = send;
 
 	boost::shared_ptr<Processor> r = boost::static_pointer_cast<Processor>(send);
-	
-	ios->selector().Finished.connect (bind (mem_fun(*this, &ProcessorBox::send_io_finished), boost::weak_ptr<Processor>(r), ios));
+
+	ios->selector().Finished.connect (bind (
+			mem_fun(*this, &ProcessorBox::send_io_finished),
+			boost::weak_ptr<Processor>(r), ios));
 }
 
 void
@@ -538,7 +553,7 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr<Processor>
 		break;
 
 	case IOSelector::Accepted:
-		_route->add_processor (processor);
+		_route->add_processor (processor, 0, 0, _placement);
 		if (Profile->get_sae()) {
 			processor->activate ();
 		}
@@ -556,7 +571,7 @@ ProcessorBox::redisplay_processors ()
 	if (no_processor_redisplay) {
 		return;
 	}
-	
+
 	ignore_delete = true;
 	model->clear ();
 	ignore_delete = false;
@@ -564,7 +579,7 @@ ProcessorBox::redisplay_processors ()
 	processor_active_connections.clear ();
 	processor_name_connections.clear ();
 
-	_route->foreach_processor (mem_fun (*this, &ProcessorBox::add_processor_to_display));
+	_route->foreach_processor (_placement, mem_fun (*this, &ProcessorBox::add_processor_to_display));
 
 	switch (_placement) {
 	case PreFader:
@@ -583,19 +598,23 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
 	if (!processor) {
 		return;
 	}
-	
-	if (processor->placement() != _placement) {
+
+	if (processor == _route->amp()) {
 		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
@@ -678,13 +697,13 @@ void
 ProcessorBox::show_processor_active (boost::weak_ptr<Processor> 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();
 
@@ -694,7 +713,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 {
@@ -756,15 +775,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);
 	}
 }
@@ -772,7 +791,7 @@ ProcessorBox::rename_processors ()
 void
 ProcessorBox::cut_processors ()
 {
-	vector<boost::shared_ptr<Processor> > to_be_removed;
+	ProcSelection to_be_removed;
 	XMLNode* node = new XMLNode (X_("cut"));
 
 	get_selected_processors (to_be_removed);
@@ -782,17 +801,17 @@ ProcessorBox::cut_processors ()
 	}
 
 	no_processor_redisplay = true;
-	for (vector<boost::shared_ptr<Processor> >::iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) {
+	for (ProcSelection::iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) {
 		// Do not cut inserts
 		if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0 ||
 		    (boost::dynamic_pointer_cast<Send>((*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) {
@@ -801,7 +820,7 @@ ProcessorBox::cut_processors ()
 			} else {
 				delete &child;
 			}
-		} 
+		}
 	}
 
 	_rr_selection.set (node);
@@ -813,7 +832,7 @@ ProcessorBox::cut_processors ()
 void
 ProcessorBox::copy_processors ()
 {
-	vector<boost::shared_ptr<Processor> > to_be_copied;
+	ProcSelection to_be_copied;
 	XMLNode* node = new XMLNode (X_("copy"));
 
 	get_selected_processors (to_be_copied);
@@ -822,7 +841,7 @@ ProcessorBox::copy_processors ()
 		return;
 	}
 
-	for (vector<boost::shared_ptr<Processor> >::iterator i = to_be_copied.begin(); i != to_be_copied.end(); ++i) {
+	for (ProcSelection::iterator i = to_be_copied.begin(); i != to_be_copied.end(); ++i) {
 		// Do not copy inserts
 		if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0 ||
 		    (boost::dynamic_pointer_cast<Send>((*i)) != 0)) {
@@ -836,18 +855,18 @@ 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);
 
 	if (to_be_deleted.empty()) {
 		return;
 	}
 
-	for (vector<boost::shared_ptr<Processor> >::iterator i = to_be_deleted.begin(); i != to_be_deleted.end(); ++i) {
-		
+	for (ProcSelection::iterator i = to_be_deleted.begin(); i != to_be_deleted.end(); ++i) {
+
 		void* gui = (*i)->get_gui ();
-		
+
 		if (gui) {
 			static_cast<Gtk::Widget*>(gui)->hide ();
 		}
@@ -895,7 +914,7 @@ ProcessorBox::rename_processor (boost::shared_ptr<Processor> processor)
         name_prompter.get_result (result);
         if (result.length()) {
 			processor->set_name (result);
-		}	
+		}
 		break;
 	}
 
@@ -937,12 +956,14 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist)
 				XMLNode n (**niter);
 				Send::make_unique (n, _session);
 				p.reset (new Send (_session, n));
-				
+
+			} else if (type->value() == "meter") {
+				p = _route->shared_peak_meter();
+
 			} else {
 				p.reset (new PluginInsert (_session, **niter));
 			}
 
-			p->set_placement (_placement);
 			copies.push_back (p);
 		}
 		catch (...) {
@@ -950,7 +971,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist)
 		}
 	}
 
-	if (_route->add_processors (copies)) {
+	if (_route->add_processors (copies, 0, _placement)) {
 
 		string msg = _(
 			"Copying the set of processors on the clipboard failed,\n\
@@ -974,10 +995,10 @@ ProcessorBox::deactivate_processor (boost::shared_ptr<Processor> r)
 }
 
 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]);
     }
@@ -1056,19 +1077,19 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 			return;
 		}
 	}
-	
+
 	if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
-		
+
 		if (!_session.engine().connected()) {
 			return;
 		}
 
 		boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
-		
+
 		SendUIWindow *send_ui;
-		
+
 		if (send->get_gui() == 0) {
-			
+
 			send_ui = new SendUIWindow (send, _session);
 
 			WindowTitle title(Glib::get_application_name());
@@ -1076,57 +1097,57 @@ 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());
 		}
-		
+
 		gidget = send_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"));
 			msg.run ();
 			return;
 		}
-		
+
 		PortInsertWindow *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_insert->get_gui());
 		}
-		
+
 		gidget = io_selector;
 	}
 
@@ -1164,45 +1185,59 @@ 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_insert));
+	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);
 
-	ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear"),  sigc::ptr_fun (ProcessorBox::rb_clear));
+	ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear"),
+			sigc::ptr_fun (ProcessorBox::rb_clear));
 
 	/* 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_("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
@@ -1373,7 +1408,7 @@ ProcessorBox::route_name_changed ()
   		Gtk::TreeModel::Row row = *iter;
 
   		processor= row[columns.processor];
-		
+
 		void* gui = processor->get_gui();
 
 		if (!gui) {
@@ -1383,7 +1418,7 @@ ProcessorBox::route_name_changed ()
 		/* 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());
@@ -1394,7 +1429,7 @@ ProcessorBox::route_name_changed ()
 	}
 }
 
-string 
+string
 ProcessorBox::generate_processor_title (boost::shared_ptr<PluginInsert> pi)
 {
 	string maker = pi->plugin()->maker() ? pi->plugin()->maker() : "";
@@ -1409,6 +1444,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);
 }
 
diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index 60836ac1f6..ea908133e3 100644
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -184,8 +184,10 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
 	void clear_processors ();
 	void rename_processors ();
 
+	typedef vector<boost::shared_ptr<ARDOUR::Processor> > ProcSelection;
+
 	void for_selected_processors (void (ProcessorBox::*pmf)(boost::shared_ptr<ARDOUR::Processor>));
-	void get_selected_processors (vector<boost::shared_ptr<ARDOUR::Processor> >&);
+	void get_selected_processors (ProcSelection&);
 
 	static Glib::RefPtr<Gtk::Action> paste_action;
 	void paste_processor_state (const XMLNodeList&);
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 056135e70c..f62895c6f7 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -1104,8 +1104,6 @@ TimeAxisView::compute_controls_size_info ()
 	two_row_table.show_all ();
 	req = two_row_table.size_request ();
 
-	cerr << "Normal height is " << req.height << " + " << extra_height << endl;
-
 	// height required to show all normal buttons 
 
 	hNormal = /*req.height*/ 48 + extra_height;
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index c6dd70c992..f52ad14277 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -79,7 +79,7 @@ UIConfiguration::load_defaults ()
 
 		string rcfile = default_ui_rc_file.to_string();
 
-		cerr << string_compose (_("loading default ui configuration file %1"), rcfile) << endl;
+		cerr << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
 		
 		if (!tree.read (rcfile.c_str())) {
 			error << string_compose(_("Ardour: cannot read default ui configuration file \"%1\""), rcfile) << endmsg;
@@ -109,7 +109,7 @@ UIConfiguration::load_state ()
 
 		string rcfile = default_ui_rc_file.to_string();
 
-		cerr << string_compose (_("loading default ui configuration file %1"), rcfile) << endl;
+		cerr << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
 		
 		if (!tree.read (rcfile.c_str())) {
 			error << string_compose(_("Ardour: cannot read default ui configuration file \"%1\""), rcfile) << endmsg;
@@ -132,7 +132,7 @@ UIConfiguration::load_state ()
 	
 		string rcfile = user_ui_rc_file.to_string();
 
-		cerr << string_compose (_("loading user ui configuration file %1"), rcfile) << endl;
+		cerr << string_compose (_("Loading user ui configuration file %1"), rcfile) << endl;
 
 		if (!tree.read (rcfile)) {
 			error << string_compose(_("Ardour: cannot read ui configuration file \"%1\""), rcfile) << endmsg;