- Changed IO's vector<Port*>'s to PortList

- Added new Port classes, code to drive them
- Added PortList, which is a filthy mess ATM (nevermind that, it's the interface that's important at this stage)
- Added ChanCount, though it isn't very thoroughly used yet.  That's the next step....
- Fixed a few bugs relating to loading sessions saved with trunk
- Fixed a few random other bugs

Slowly working towards type agnosticism while keeping all the former code/logic intact is the name of the game here

Warning:  Removing ports is currently (intentionally) broken due solely to laziness.


git-svn-id: svn://localhost/ardour2/branches/midi@786 d708f5d6-7413-0410-9779-e7cbd77b26cf

22 files changed, 1188 insertions, 779 deletions

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 2d59be1b5e..857ed4b8e1 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -57,14 +57,13 @@ if gtkardour['FFT_ANALYSIS']:
 	gtkardour.Merge ([libraries['fftw3f']])
 	gtkardour.Append(CCFLAGS='-DFFT_ANALYSIS')
 
-if gtkardour['COREAUDIO']:
-	gtkardour.Append(CCFLAGS='-DHAVE_COREAUDIO')
-	gtkardour.Merge([libraries['appleutility']])
-
 skipped_files=Split("""
 connection_editor.cc
 """)
 
+coreaudio_files=Split("""
+au_pluginui.cc
+""")
 
 gtkardour_files=Split("""
 about.cc
@@ -142,6 +141,7 @@ imageframe_time_axis_view.cc
 imageframe_view.cc
 io_selector.cc
 keyboard.cc
+ladspa_pluginui.cc
 location_ui.cc
 main.cc
 marker.cc
@@ -188,7 +188,6 @@ visual_time_axis.cc
 waveview.cc
 """)
 
-
 fft_analysis_files=Split("""
 analysis_window.cc
 fft_graph.cc
@@ -214,7 +213,12 @@ vst_files = [ 'vst_pluginui.cc' ]
 if env['VST']:
 	extra_sources += vst_files
 	gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst")
-  
+
+if gtkardour['COREAUDIO']:
+    extra_sources += coreaudio_files
+    gtkardour.Append(CCFLAGS='-DHAVE_COREAUDIO')
+    gtkardour.Merge([libraries['appleutility']])
+ 
 if env['FFT_ANALYSIS']:
 	extra_sources += fft_analysis_files
 
diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index f742afd727..24c6cc4fb8 100644
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -221,7 +221,6 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 		Sample *buf    = (Sample *) malloc(sizeof(Sample) * fft_graph.windowSize());
 		Sample *mixbuf = (Sample *) malloc(sizeof(Sample) * fft_graph.windowSize());
 		float  *gain   = (float *)  malloc(sizeof(float) * fft_graph.windowSize());
-		char   *work   = (char *)   malloc(sizeof(char) * fft_graph.windowSize());
 	
 		Selection s = PublicEditor::instance().get_selection();
 		TimeSelection ts = s.time;
@@ -261,7 +260,7 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 							n = (*j).length() - i;
 						}
 				
-						n = pl->read(buf, mixbuf, gain, work, (*j).start + i, n);
+						n = pl->read(buf, mixbuf, gain, (*j).start + i, n);
 	
 						if ( n < fft_graph.windowSize()) {
 							for (int j = n; j < fft_graph.windowSize(); j++) {
@@ -301,7 +300,7 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 							n = arv->region().length() - i;
 						}
 
-						n = arv->audio_region().read_at(buf, mixbuf, gain, work, arv->region().position() + i, n);
+						n = arv->audio_region().read_at(buf, mixbuf, gain, arv->region().position() + i, n);
 	
 						if ( n < fft_graph.windowSize()) {
 							for (int j = n; j < fft_graph.windowSize(); j++) {
@@ -331,7 +330,6 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 	
 		free(buf);
 		free(mixbuf);
-		free(work);
 
 		track_list_ready = true;
 	} /* end lock */
diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg
index 267fdbae73..9d3f5bf6c7 100755
--- a/gtk2_ardour/ardbg
+++ b/gtk2_ardour/ardbg
@@ -1,3 +1,3 @@
 #!/bin/sh
 source ardev_common.sh
-exec gdb ./ardour.bin
+exec gdb ./ardour.bin "$*"
diff --git a/gtk2_ardour/au_pluginui.cc b/gtk2_ardour/au_pluginui.cc
new file mode 100644
index 0000000000..3e0e7e4874
--- /dev/null
+++ b/gtk2_ardour/au_pluginui.cc
@@ -0,0 +1,37 @@
+/*
+    Copyright (C) 2006 Paul Davis 
+	Written by Taybin Rutkin
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <ardour/insert.h>
+#include <ardour/audio_unit.h>
+
+#include "plugin_ui.h"
+
+using namespace ARDOUR;
+using namespace PBD;
+
+AUPluginUI::AUPluginUI (ARDOUR::AudioEngine& engine, boost::shared_ptr<PluginInsert> ap)
+{
+	info << "AUPluginUI created" << endmsg;
+}
+
+AUPluginUI::~AUPluginUI ()
+{
+	// nothing to do here - plugin destructor destroys the GUI
+}
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index dff2300529..f675bf9eed 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -314,6 +314,34 @@ AudioRegionView::region_scale_amplitude_changed ()
 }
 
 void
+AudioRegionView::region_renamed ()
+{
+	// FIXME: ugly duplication with RegionView...
+	
+	string str;
+
+	if (_region.locked()) {
+		str += '>';
+		str += _region.name();
+		str += '<';
+	} else {
+		str = _region.name();
+	}
+
+	// ... because of this
+	if (audio_region().speed_mismatch (trackview.session().frame_rate())) {
+		str = string ("*") + str;
+	}
+
+	if (_region.muted()) {
+		str = string ("!") + str;
+	}
+
+	set_item_name (str, this);
+	set_name_text (str);
+}
+
+void
 AudioRegionView::region_resized (Change what_changed)
 {
 	RegionView::region_resized(what_changed);
@@ -375,16 +403,12 @@ AudioRegionView::region_muted ()
 	}
 }
 
-
 void
 AudioRegionView::set_height (gdouble height)
 {
-	uint32_t wcnt = waves.size();
-
-	// FIXME: ick
-	TimeAxisViewItem::set_height (height - 2);
+	RegionView::set_height(height);
 	
-	_height = height;
+	uint32_t wcnt = waves.size();
 
 	for (uint32_t n=0; n < wcnt; ++n) {
 		gdouble ht;
@@ -759,7 +783,7 @@ AudioRegionView::create_waves ()
 		wave_caches.push_back (WaveView::create_cache ());
 
 		if (wait_for_data) {
-			if (audio_region().source(n).peaks_ready (bind (mem_fun(*this, &AudioRegionView::peaks_ready_handler), n), data_ready_connection)) {
+			if (audio_region().audio_source(n).peaks_ready (bind (mem_fun(*this, &AudioRegionView::peaks_ready_handler), n), data_ready_connection)) {
 				create_one_wave (n, true);
 			} else {
 				create_zero_line = false;
diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 29b3f9d904..e9172dec97 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -145,6 +145,7 @@ class AudioRegionView : public RegionView
     void region_moved (void *);
     void region_muted ();
     void region_scale_amplitude_changed ();
+	void region_renamed ();
 
     void create_waves ();
     void create_one_wave (uint32_t, bool);
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 5c09ddd49b..f3e30c4523 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -1270,13 +1270,14 @@ AutomationLine::hide_all_but_selected_control_points ()
 
 XMLNode &AutomationLine::get_state(void)
 {
-    // TODO
-    return alist.get_state();
+    XMLNode *node = new XMLNode("AutomationLine");
+    node->add_child_nocopy(alist.get_state());
+    return *node;
 }
 
 int AutomationLine::set_state(const XMLNode &node)
 {
     // TODO
-    alist.set_state(node);
+    //alist.set_state(node);
     return 0;
 }
diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index b2967dc4a9..c56f51fcfa 100644
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -1035,7 +1035,7 @@ CrossfadeEditor::make_waves (AudioRegion& region, WhichFade which)
 		
 		gdouble yoff = n * ht;
 		
-		if (region.source(n).peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), &region, which), peaks_ready_connection)) {
+		if (region.audio_source(n).peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), &region, which), peaks_ready_connection)) {
 			
 			WaveView* waveview = new WaveView (*(canvas->root()));
 
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 7e26ba37b2..70c4863fd3 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -163,7 +163,6 @@ Editor::write_region (string path, AudioRegion& region)
 	jack_nframes_t to_read;
 	Sample buf[chunk_size];
 	gain_t gain_buffer[chunk_size];
-	char   workbuf[chunk_size *4];
 	jack_nframes_t pos;
 	char s[PATH_MAX+1];
 	uint32_t cnt;
@@ -235,11 +234,11 @@ Editor::write_region (string path, AudioRegion& region)
 			
 			fs = (*src);
 
-			if (region.read_at (buf, buf, gain_buffer, workbuf, pos, this_time) != this_time) {
+			if (region.read_at (buf, buf, gain_buffer, pos, this_time) != this_time) {
 				break;
 			}
 			
-			if (fs->write (buf, this_time, workbuf) != this_time) {
+			if (fs->write (buf, this_time) != this_time) {
 				error << "" << endmsg;
 				goto error_out;
 			}
@@ -310,7 +309,6 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 	jack_nframes_t nframes;
 	Sample buf[chunk_size];
 	gain_t gain_buffer[chunk_size];
-	char   workbuf[chunk_size*4];
 	jack_nframes_t pos;
 	char s[PATH_MAX+1];
 	uint32_t cnt;
@@ -368,11 +366,11 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 
 				fs = sources[n];
 				
-				if (playlist.read (buf, buf, gain_buffer, workbuf, pos, this_time, n) != this_time) {
+				if (playlist.read (buf, buf, gain_buffer, pos, this_time, n) != this_time) {
 					break;
 				}
 				
-				if (fs->write (buf, this_time, workbuf) != this_time) {
+				if (fs->write (buf, this_time) != this_time) {
 					goto error_out;
 				}
 			}
@@ -398,7 +396,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 				for (uint32_t n=0; n < channels; ++n) {
 
 					fs = sources[n];
-					if (fs->write (buf, this_time, workbuf) != this_time) {
+					if (fs->write (buf, this_time) != this_time) {
 						goto error_out;
 					}
 				}
diff --git a/gtk2_ardour/ladspa_pluginui.cc b/gtk2_ardour/ladspa_pluginui.cc
new file mode 100644
index 0000000000..22b860900a
--- /dev/null
+++ b/gtk2_ardour/ladspa_pluginui.cc
@@ -0,0 +1,759 @@
+/*
+    Copyright (C) 2000 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <climits>
+#include <cerrno>
+#include <cmath>
+#include <string>
+
+#include <pbd/stl_delete.h>
+#include <pbd/xml++.h>
+#include <pbd/failed_constructor.h>
+
+#include <gtkmm2ext/click_box.h>
+#include <gtkmm2ext/fastmeter.h>
+#include <gtkmm2ext/barcontroller.h>
+#include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/doi.h>
+#include <gtkmm2ext/slider_controller.h>
+
+#include <midi++/manager.h>
+
+#include <ardour/audioengine.h>
+#include <ardour/plugin.h>
+#include <ardour/insert.h>
+#include <ardour/ladspa_plugin.h>
+
+#include <lrdf.h>
+
+#include "ardour_ui.h"
+#include "prompter.h"
+#include "plugin_ui.h"
+#include "utils.h"
+#include "gui_thread.h"
+
+#include "i18n.h"
+
+using namespace std;
+using namespace ARDOUR;
+using namespace PBD;
+using namespace Gtkmm2ext;
+using namespace Gtk;
+using namespace sigc;
+
+LadspaPluginUI::LadspaPluginUI (AudioEngine &engine, boost::shared_ptr<PluginInsert> pi, bool scrollable)
+	: PlugUIBase (pi),
+	  engine(engine),
+	  button_table (initial_button_rows, initial_button_cols),
+	  output_table (initial_output_rows, initial_output_cols),
+	  hAdjustment(0.0, 0.0, 0.0),
+	  vAdjustment(0.0, 0.0, 0.0),
+	  scroller_view(hAdjustment, vAdjustment),
+	  automation_menu (0),
+	  is_scrollable(scrollable)
+{
+	set_name ("PluginEditor");
+	set_border_width (10);
+	set_homogeneous (false);
+
+	settings_box.set_homogeneous (false);
+
+	HBox* constraint_hbox = manage (new HBox);
+	HBox* smaller_hbox = manage (new HBox);
+	Label* combo_label = manage (new Label (_("<span size=\"large\">Presets</span>")));
+	combo_label->set_use_markup (true);
+
+	smaller_hbox->pack_start (*combo_label, false, false, 10);
+	smaller_hbox->pack_start (combo, false, false);
+	smaller_hbox->pack_start (save_button, false, false);
+
+	constraint_hbox->set_spacing (5);
+	constraint_hbox->pack_start (*smaller_hbox, true, false);
+	constraint_hbox->pack_end (bypass_button, false, false);
+
+	settings_box.pack_end (*constraint_hbox, false, false);
+
+	pack_start (settings_box, false, false);
+
+	if ( is_scrollable ) {
+		scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+		scroller.set_name ("PluginEditor");
+		scroller_view.set_name("PluginEditor");
+		scroller_view.add (hpacker);
+		scroller.add (scroller_view);
+		
+		pack_start (scroller, true, true);
+
+	}
+	else {
+		pack_start (hpacker, false, false);
+	}
+
+	insert->active_changed.connect (mem_fun(*this, &LadspaPluginUI::redirect_active_changed));
+	bypass_button.set_active (!insert->active());
+	
+	build (engine);
+}
+
+LadspaPluginUI::~LadspaPluginUI ()
+{
+	if (output_controls.size() > 0) {
+		screen_update_connection.disconnect();
+	}
+}
+
+void
+LadspaPluginUI::build (AudioEngine &engine)
+
+{
+	guint32 i = 0;
+	guint32 x = 0;
+	Frame* frame;
+	Frame* bt_frame;
+	VBox* box;
+	int output_row, output_col;
+	int button_row, button_col;
+	int output_rows, output_cols;
+	int button_rows, button_cols;
+	guint32 n_ins=0, n_outs = 0;
+
+	prefheight = 30;
+	hpacker.set_spacing (10);
+
+	output_rows = initial_output_rows;
+	output_cols = initial_output_cols;
+	button_rows = initial_button_rows;
+	button_cols = initial_button_cols;
+	output_row = 0;
+	button_row = 0;
+	output_col = 0;
+	button_col = 0;
+
+	button_table.set_homogeneous (false);
+	button_table.set_row_spacings (2);
+	button_table.set_col_spacings (2);
+	output_table.set_homogeneous (true);
+	output_table.set_row_spacings (2);
+	output_table.set_col_spacings (2);
+	button_table.set_border_width (5);
+	output_table.set_border_width (5);
+
+	hpacker.set_border_width (10);
+
+	bt_frame = manage (new Frame);
+	bt_frame->set_name ("BaseFrame");
+	bt_frame->add (button_table);
+	hpacker.pack_start(*bt_frame, true, true);
+
+	box = manage (new VBox);
+	box->set_border_width (5);
+	box->set_spacing (1);
+
+	frame = manage (new Frame);
+	frame->set_name ("BaseFrame");
+	frame->set_label (_("Controls"));
+	frame->add (*box);
+	hpacker.pack_start(*frame, true, true);
+
+	/* find all ports. build control elements for all appropriate control ports */
+
+	for (i = 0; i < plugin->parameter_count(); ++i) {
+
+		if (plugin->parameter_is_control (i)) {
+			
+			/* Don't show latency control ports */
+
+			if (plugin->describe_parameter (i) == X_("latency")) {
+				continue;
+			}
+
+			ControlUI* cui;
+	
+			/* if we are scrollable, just use one long column */
+
+			if (!is_scrollable) {
+				if (x++ > 7){
+					frame = manage (new Frame);
+					frame->set_name ("BaseFrame");
+					box = manage (new VBox);
+					
+					box->set_border_width (5);
+					box->set_spacing (1);
+
+					frame->add (*box);
+					hpacker.pack_start(*frame,true,true);
+
+					x = 0;
+				}
+			}
+
+			if ((cui = build_control_ui (engine, i, plugin->get_nth_control (i))) == 0) {
+				error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg;
+				continue;
+			}
+				
+			if (cui->control || cui->clickbox || cui->combo) {
+
+				box->pack_start (*cui, false, false);
+
+			} else if (cui->button) {
+
+				if (button_row == button_rows) {
+					button_row = 0;
+					if (++button_col == button_cols) {
+						button_cols += 2;
+						button_table.resize (button_rows, button_cols);
+					}
+				}
+
+				button_table.attach (*cui, button_col, button_col + 1, button_row, button_row+1, 
+						     FILL|EXPAND, FILL);
+				button_row++;
+
+			} else if (cui->display) {
+
+				output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1, 
+						     FILL|EXPAND, FILL);
+				
+ 				// TODO: The meters should be divided into multiple rows 
+				
+				if (++output_col == output_cols) {
+					output_cols ++;
+					output_table.resize (output_rows, output_cols);
+				}
+				
+				/* old code, which divides meters into
+				 * columns first, rows later. New code divides into one row
+				 
+				if (output_row == output_rows) {
+					output_row = 0;
+					if (++output_col == output_cols) {
+						output_cols += 2;
+						output_table.resize (output_rows, output_cols);
+					}
+				}
+				
+				output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1, 
+						     FILL|EXPAND, FILL);
+ 
+				output_row++;
+				*/
+			}
+				
+			/* HACK: ideally the preferred height would be queried from
+			   the complete hpacker, but I can't seem to get that
+			   information in time, so this is an estimation 
+			*/
+
+			prefheight += 30;
+
+		} 
+	}
+
+	n_ins = plugin->get_info()->n_inputs;
+	n_outs = plugin->get_info()->n_outputs;
+
+	if (box->children().empty()) {
+		hpacker.remove (*frame);
+	}
+
+	if (button_table.children().empty()) {
+		hpacker.remove (*bt_frame);
+	}
+
+	if (!output_table.children().empty()) {
+		frame = manage (new Frame);
+		frame->set_name ("BaseFrame");
+		frame->add (output_table);
+		hpacker.pack_end (*frame, true, true);
+	}
+
+	output_update ();
+
+	output_table.show_all ();
+	button_table.show_all ();
+}
+
+LadspaPluginUI::ControlUI::ControlUI ()
+	: automate_button (X_("")) // force creation of a label 
+{
+	automate_button.set_name ("PluginAutomateButton");
+	ARDOUR_UI::instance()->tooltips().set_tip (automate_button,
+						   _("Automation control"));
+
+	/* don't fix the height, it messes up the bar controllers */
+
+	set_size_request_to_display_given_text (automate_button, X_("lngnuf"), 2, 2);
+
+	ignore_change = 0;
+	display = 0;
+	button = 0;
+	control = 0;
+	clickbox = 0;
+	adjustment = 0;
+	meterinfo = 0;
+}
+
+LadspaPluginUI::ControlUI::~ControlUI() 
+{
+	if (adjustment) {
+		delete adjustment;
+	}
+
+	if (meterinfo) {
+		delete meterinfo->meter;
+		delete meterinfo;
+	}
+}
+
+void
+LadspaPluginUI::automation_state_changed (ControlUI* cui)
+{
+	/* update button label */
+
+	switch (insert->get_port_automation_state (cui->port_index) & (Off|Play|Touch|Write)) {
+	case Off:
+		cui->automate_button.set_label (_("Off"));
+		break;
+	case Play:
+		cui->automate_button.set_label (_("Play"));
+		break;
+	case Write:
+		cui->automate_button.set_label (_("Write"));
+		break;
+	case Touch:
+		cui->automate_button.set_label (_("Touch"));
+		break;
+	default:
+		cui->automate_button.set_label (_("???"));
+		break;
+	}
+}
+
+
+static void integer_printer (char buf[32], Adjustment &adj, void *arg)
+{
+	snprintf (buf, 32, "%.0f", adj.get_value());
+}
+
+void
+LadspaPluginUI::print_parameter (char *buf, uint32_t len, uint32_t param)
+{
+	plugin->print_parameter (param, buf, len);
+}
+
+LadspaPluginUI::ControlUI*
+LadspaPluginUI::build_control_ui (AudioEngine &engine, guint32 port_index, PBD::Controllable* mcontrol)
+
+{
+	ControlUI* control_ui;
+	Plugin::ParameterDescriptor desc;
+
+	plugin->get_parameter_descriptor (port_index, desc);
+
+	control_ui = manage (new ControlUI ());
+	control_ui->adjustment = 0;
+	control_ui->combo = 0;
+	control_ui->combo_map = 0;
+	control_ui->port_index = port_index;
+	control_ui->update_pending = false;
+	control_ui->label.set_text (desc.label);
+	control_ui->label.set_alignment (0.0, 0.5);
+	control_ui->label.set_name ("PluginParameterLabel");
+
+	control_ui->set_spacing (5);
+
+	if (plugin->parameter_is_input (port_index)) {
+
+		boost::shared_ptr<LadspaPlugin> lp;
+
+		if ((lp = boost::dynamic_pointer_cast<LadspaPlugin>(plugin)) != 0) {
+			
+			lrdf_defaults* defaults = lrdf_get_scale_values(lp->unique_id(), port_index);
+			
+			if (defaults && defaults->count > 0)	{
+				
+				control_ui->combo = new Gtk::ComboBoxText;
+				//control_ui->combo->set_value_in_list(true, false);
+				set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui));
+				control_ui->combo->signal_changed().connect (bind (mem_fun(*this, &LadspaPluginUI::control_combo_changed), control_ui));
+				plugin->ParameterChanged.connect (bind (mem_fun (*this, &LadspaPluginUI::parameter_changed), control_ui));
+				control_ui->pack_start(control_ui->label, true, true);
+				control_ui->pack_start(*control_ui->combo, false, true);
+				
+				update_control_display(control_ui);
+				
+				lrdf_free_setting_values(defaults);
+				return control_ui;
+			}
+		}
+			
+		if (desc.toggled) {
+
+			/* Build a button */
+		
+			control_ui->button = manage (new ToggleButton ());
+			control_ui->button->set_name ("PluginEditorButton");
+			control_ui->button->set_size_request (20, 20);
+
+			control_ui->pack_start (control_ui->label, true, true);
+			control_ui->pack_start (*control_ui->button, false, true);
+			control_ui->pack_start (control_ui->automate_button, false, false);
+
+			control_ui->button->signal_clicked().connect (bind (mem_fun(*this, &LadspaPluginUI::control_port_toggled), control_ui));
+		
+			if(plugin->get_parameter (port_index) == 1){
+				control_ui->button->set_active(true);
+			}
+
+			return control_ui;
+		}
+	
+		control_ui->adjustment = new Adjustment (0, 0, 0, 0, 0);
+
+		/* XXX this code is not right yet, because it doesn't handle
+		   the absence of bounds in any sensible fashion.
+		*/
+
+		control_ui->adjustment->set_lower (desc.lower);
+		control_ui->adjustment->set_upper (desc.upper);
+
+		control_ui->logarithmic = desc.logarithmic;
+		if (control_ui->logarithmic) {
+			if (control_ui->adjustment->get_lower() == 0.0) {
+				control_ui->adjustment->set_lower (control_ui->adjustment->get_upper()/10000);
+			}
+			control_ui->adjustment->set_upper (log(control_ui->adjustment->get_upper()));
+			control_ui->adjustment->set_lower (log(control_ui->adjustment->get_lower()));
+		}
+	
+		float delta = desc.upper - desc.lower;
+
+		control_ui->adjustment->set_page_size (delta/100.0);
+		control_ui->adjustment->set_step_increment (desc.step);
+		control_ui->adjustment->set_page_increment (desc.largestep);
+
+		if (desc.integer_step) {
+			control_ui->clickbox = new ClickBox (control_ui->adjustment, "PluginUIClickBox");
+			Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2);
+			control_ui->clickbox->set_print_func (integer_printer, 0);
+		} else {
+			sigc::slot<void,char*,uint32_t> pslot = sigc::bind (mem_fun(*this, &LadspaPluginUI::print_parameter), (uint32_t) port_index);
+
+			control_ui->control = new BarController (*control_ui->adjustment, *mcontrol, pslot);
+			// should really match the height of the text in the automation button+label
+			control_ui->control->set_size_request (200, 22);
+			control_ui->control->set_name (X_("PluginSlider"));
+			control_ui->control->set_style (BarController::LeftToRight);
+			control_ui->control->set_use_parent (true);
+
+			control_ui->control->StartGesture.connect (bind (mem_fun(*this, &LadspaPluginUI::start_touch), control_ui));
+			control_ui->control->StopGesture.connect (bind (mem_fun(*this, &LadspaPluginUI::stop_touch), control_ui));
+			
+		}
+
+		if (control_ui->logarithmic) {
+			control_ui->adjustment->set_value(log(plugin->get_parameter(port_index)));
+		} else{
+			control_ui->adjustment->set_value(plugin->get_parameter(port_index));
+		}
+
+		/* XXX memory leak: SliderController not destroyed by ControlUI
+		   destructor, and manage() reports object hierarchy
+		   ambiguity.
+		*/
+
+		control_ui->pack_start (control_ui->label, true, true);
+		if (desc.integer_step) {
+			control_ui->pack_start (*control_ui->clickbox, false, false);
+		} else {
+			control_ui->pack_start (*control_ui->control, false, false);
+		}
+
+		control_ui->pack_start (control_ui->automate_button, false, false);
+		control_ui->adjustment->signal_value_changed().connect (bind (mem_fun(*this, &LadspaPluginUI::control_adjustment_changed), control_ui));
+		control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &LadspaPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
+
+		automation_state_changed (control_ui);
+
+		plugin->ParameterChanged.connect (bind (mem_fun(*this, &LadspaPluginUI::parameter_changed), control_ui));
+		insert->automation_list (port_index).automation_state_changed.connect 
+			(bind (mem_fun(*this, &LadspaPluginUI::automation_state_changed), control_ui));
+
+	} else if (plugin->parameter_is_output (port_index)) {
+
+		control_ui->display = manage (new EventBox);
+		control_ui->display->set_name ("ParameterValueDisplay");
+
+		control_ui->display_label = manage (new Label);
+
+		control_ui->display_label->set_name ("ParameterValueDisplay");
+
+		control_ui->display->add (*control_ui->display_label);
+		Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->display, "-99,99", 2, 2);
+
+		control_ui->display->show_all ();
+
+		/* set up a meter */
+		/* TODO: only make a meter if the port is Hinted for it */
+
+		MeterInfo * info = new MeterInfo(port_index);
+ 		control_ui->meterinfo = info;
+		
+		info->meter = new FastMeter (5, 100, FastMeter::Vertical);
+
+		info->min_unbound = desc.min_unbound;
+		info->max_unbound = desc.max_unbound;
+
+		info->min = desc.lower;
+		info->max = desc.upper;
+
+		control_ui->vbox = manage (new VBox);
+		control_ui->hbox = manage (new HBox);
+		
+		control_ui->label.set_angle(90);
+		control_ui->hbox->pack_start (control_ui->label, false, false);
+ 		control_ui->hbox->pack_start (*info->meter, false, false);
+
+ 		control_ui->vbox->pack_start (*control_ui->hbox, false, false);
+		
+ 		control_ui->vbox->pack_start (*control_ui->display, false, false);
+
+		control_ui->pack_start (*control_ui->vbox);
+
+		control_ui->meterinfo->meter->show_all();
+		control_ui->meterinfo->packed = true;
+		
+		output_controls.push_back (control_ui);
+	}
+	
+	plugin->ParameterChanged.connect (bind (mem_fun(*this, &LadspaPluginUI::parameter_changed), control_ui));
+	return control_ui;
+}
+
+void
+LadspaPluginUI::start_touch (LadspaPluginUI::ControlUI* cui)
+{
+	insert->automation_list (cui->port_index).start_touch ();
+}
+
+void
+LadspaPluginUI::stop_touch (LadspaPluginUI::ControlUI* cui)
+{
+	insert->automation_list (cui->port_index).stop_touch ();
+}
+
+void
+LadspaPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
+{
+	using namespace Menu_Helpers;
+
+	if (automation_menu == 0) {
+		automation_menu = manage (new Menu);
+		automation_menu->set_name ("ArdourContextMenu");
+	} 
+
+	MenuList& items (automation_menu->items());
+
+	items.clear ();
+	items.push_back (MenuElem (_("Off"), 
+				   bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Off, cui)));
+	items.push_back (MenuElem (_("Play"),
+				   bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Play, cui)));
+	items.push_back (MenuElem (_("Write"),
+				   bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Write, cui)));
+	items.push_back (MenuElem (_("Touch"),
+				   bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Touch, cui)));
+
+	automation_menu->popup (1, 0);
+}
+
+void
+LadspaPluginUI::set_automation_state (AutoState state, ControlUI* cui)
+{
+	insert->set_port_automation_state (cui->port_index, state);
+}
+
+void
+LadspaPluginUI::control_adjustment_changed (ControlUI* cui)
+{
+	if (cui->ignore_change) {
+		return;
+	}
+
+	double value = cui->adjustment->get_value();
+
+	if (cui->logarithmic) {
+	  	value = exp(value);
+	}
+
+	insert->set_parameter (cui->port_index, (float) value);
+}
+
+void
+LadspaPluginUI::parameter_changed (uint32_t abs_port_id, float val, ControlUI* cui)
+{
+	if (cui->port_index == abs_port_id) {
+		if (!cui->update_pending) {
+			cui->update_pending = true;
+			Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &LadspaPluginUI::update_control_display), cui));
+		}
+	}
+}
+
+void
+LadspaPluginUI::update_control_display (ControlUI* cui)	
+{
+	/* XXX how do we handle logarithmic stuff here ? */
+	
+	cui->update_pending = false;
+
+	float val = plugin->get_parameter (cui->port_index);
+
+	cui->ignore_change++;
+	if (cui->combo) {
+	        std::map<string,float>::iterator it;
+		for (it = cui->combo_map->begin(); it != cui->combo_map->end(); ++it) {
+			if (it->second == val) {
+				cui->combo->set_active_text(it->first);
+				break;
+			}
+		}
+	} else if (cui->adjustment == 0) {
+
+		if (val > 0.5) {
+			cui->button->set_active (true);
+		} else {
+			cui->button->set_active (false);
+		}
+
+	} else {
+		if (cui->logarithmic) {
+			val = log(val);
+		}
+		if (val != cui->adjustment->get_value()) {
+			cui->adjustment->set_value (val);
+		}
+	}
+	cui->ignore_change--;
+}
+
+void
+LadspaPluginUI::control_port_toggled (ControlUI* cui)
+{
+	if (!cui->ignore_change) {
+		insert->set_parameter (cui->port_index, cui->button->get_active());
+	}
+}
+
+void
+LadspaPluginUI::control_combo_changed (ControlUI* cui)
+{
+	if (!cui->ignore_change) {
+		string value = cui->combo->get_active_text();
+		std::map<string,float> mapping = *cui->combo_map;
+		insert->set_parameter (cui->port_index, mapping[value]);
+	}
+
+}
+
+void
+LadspaPluginUI::redirect_active_changed (Redirect* r, void* src)
+{
+	ENSURE_GUI_THREAD(bind (mem_fun(*this, &LadspaPluginUI::redirect_active_changed), r, src));
+	
+	bypass_button.set_active (!r->active());
+}
+
+bool
+LadspaPluginUI::start_updating (GdkEventAny* ignored)
+{
+	if (output_controls.size() > 0 ) {
+		screen_update_connection.disconnect();
+		screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect 
+			(mem_fun(*this, &LadspaPluginUI::output_update));
+	}
+	return false;
+}
+
+bool
+LadspaPluginUI::stop_updating (GdkEventAny* ignored)
+{
+	if (output_controls.size() > 0 ) {
+		screen_update_connection.disconnect();
+	}
+	return false;
+}
+
+void
+LadspaPluginUI::output_update ()
+{
+	for (vector<ControlUI*>::iterator i = output_controls.begin(); i != output_controls.end(); ++i) {
+		float val = plugin->get_parameter ((*i)->port_index);
+		char buf[32];
+		snprintf (buf, sizeof(buf), "%.2f", val);
+		(*i)->display_label->set_text (buf);
+
+		/* autoscaling for the meter */
+		if ((*i)->meterinfo && (*i)->meterinfo->packed) {
+			
+			if (val < (*i)->meterinfo->min) {
+				if ((*i)->meterinfo->min_unbound)
+					(*i)->meterinfo->min = val;
+				else
+					val = (*i)->meterinfo->min;
+			}
+
+			if (val > (*i)->meterinfo->max) {
+				if ((*i)->meterinfo->max_unbound)
+					(*i)->meterinfo->max = val;
+				else
+					val = (*i)->meterinfo->max;
+			}
+			
+			if ((*i)->meterinfo->max > (*i)->meterinfo->min ) {
+				float lval = (val - (*i)->meterinfo->min) / ((*i)->meterinfo->max - (*i)->meterinfo->min) ;
+				(*i)->meterinfo->meter->set (lval );
+			}
+		}
+	}
+}
+
+vector<string> 
+LadspaPluginUI::setup_scale_values(guint32 port_index, ControlUI* cui)
+{
+	vector<string> enums;
+	boost::shared_ptr<LadspaPlugin> lp = boost::dynamic_pointer_cast<LadspaPlugin> (plugin);
+
+	cui->combo_map = new std::map<string, float>;
+	lrdf_defaults* defaults = lrdf_get_scale_values(lp->unique_id(), port_index);
+	if (defaults)	{
+		for (uint32_t i = 0; i < defaults->count; ++i) {
+			enums.push_back(defaults->items[i].label);
+			pair<string, float> newpair;
+			newpair.first = defaults->items[i].label;
+			newpair.second = defaults->items[i].value;
+			cui->combo_map->insert(newpair);
+		}
+
+		lrdf_free_setting_values(defaults);
+	}
+
+	return enums;
+}
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
new file mode 100644
index 0000000000..d716a5605a
--- /dev/null
+++ b/gtk2_ardour/midi_region_view.cc
@@ -0,0 +1,113 @@
+/*
+    Copyright (C) 2001-2006 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <cmath>
+#include <cassert>
+#include <algorithm>
+
+#include <gtkmm.h>
+
+#include <gtkmm2ext/gtk_ui.h>
+
+#include <ardour/playlist.h>
+#include <ardour/midi_region.h>
+#include <ardour/midi_source.h>
+#include <ardour/midi_diskstream.h>
+
+#include "streamview.h"
+#include "midi_region_view.h"
+#include "midi_time_axis.h"
+#include "simplerect.h"
+#include "simpleline.h"
+#include "public_editor.h"
+//#include "midi_region_editor.h"
+#include "ghostregion.h"
+#include "midi_time_axis.h"
+#include "utils.h"
+#include "rgb_macros.h"
+#include "gui_thread.h"
+
+#include "i18n.h"
+
+using namespace sigc;
+using namespace ARDOUR;
+using namespace PBD;
+using namespace Editing;
+using namespace ArdourCanvas;
+
+MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, MidiRegion& r, double spu,
+				  Gdk::Color& basic_color)
+	: RegionView (parent, tv, r, spu, basic_color)
+{
+}
+
+MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, MidiRegion& r, double spu, 
+				  Gdk::Color& basic_color, TimeAxisViewItem::Visibility visibility)
+	: RegionView (parent, tv, r, spu, basic_color, visibility)
+{
+}
+
+void
+MidiRegionView::init (Gdk::Color& basic_color, bool wfd)
+{
+	// FIXME: Some redundancy here with RegionView::init.  Need to figure out
+	// where order is important and where it isn't...
+	
+	RegionView::init(basic_color, wfd);
+
+	compute_colors (basic_color);
+
+	reset_width_dependent_items ((double) _region.length() / samples_per_unit);
+
+	set_height (trackview.height);
+
+	region_muted ();
+	region_resized (BoundsChanged);
+	region_locked ();
+
+	_region.StateChanged.connect (mem_fun(*this, &MidiRegionView::region_changed));
+
+	set_colors ();
+}
+
+MidiRegionView::~MidiRegionView ()
+{
+	in_destructor = true;
+
+	RegionViewGoingAway (this); /* EMIT_SIGNAL */
+}
+
+ARDOUR::MidiRegion&
+MidiRegionView::midi_region() const
+{
+	// "Guaranteed" to succeed...
+	return dynamic_cast<MidiRegion&>(_region);
+}
+
+void
+MidiRegionView::show_region_editor ()
+{
+	cerr << "No MIDI region editor." << endl;
+}
+
+GhostRegion*
+MidiRegionView::add_ghost (AutomationTimeAxisView& atv)
+{
+	return NULL;
+}
+
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
new file mode 100644
index 0000000000..3161d0eb05
--- /dev/null
+++ b/gtk2_ardour/midi_region_view.h
@@ -0,0 +1,84 @@
+/*
+    Copyright (C) 2001-2006 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __gtk_ardour_midi_region_view_h__
+#define __gtk_ardour_midi_region_view_h__
+
+#include <vector>
+
+#include <libgnomecanvasmm.h>
+#include <libgnomecanvasmm/polygon.h>
+#include <sigc++/signal.h>
+#include <ardour/midi_region.h>
+
+#include "region_view.h"
+#include "route_time_axis.h"
+#include "time_axis_view_item.h"
+#include "automation_line.h"
+#include "enums.h"
+#include "canvas.h"
+#include "color.h"
+
+namespace ARDOUR {
+	class MidiRegion;
+};
+
+class MidiTimeAxisView;
+class GhostRegion;
+class AutomationTimeAxisView;
+
+class MidiRegionView : public RegionView
+{
+  public:
+	MidiRegionView (ArdourCanvas::Group *, 
+		 RouteTimeAxisView&,
+		 ARDOUR::MidiRegion&,
+		 double initial_samples_per_unit,
+		 Gdk::Color& basic_color);
+
+	~MidiRegionView ();
+	
+	virtual void init (Gdk::Color& base_color, bool wait_for_data = false);
+	
+	ARDOUR::MidiRegion& midi_region() const;
+    
+    void show_region_editor ();
+
+    GhostRegion* add_ghost (AutomationTimeAxisView&);
+
+  protected:
+
+    /* this constructor allows derived types
+       to specify their visibility requirements
+       to the TimeAxisViewItem parent class
+    */
+    
+    MidiRegionView (ArdourCanvas::Group *, 
+		             RouteTimeAxisView&,
+		             ARDOUR::MidiRegion&,
+		             double      samples_per_unit,
+		             Gdk::Color& basic_color,
+		             TimeAxisViewItem::Visibility);
+    
+    void region_moved (void *);
+
+    void set_flags (XMLNode *);
+    void store_flags ();
+};
+
+#endif /* __gtk_ardour_midi_region_view_h__ */
diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index 47a2b2b6d3..993db62d59 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -141,15 +141,17 @@ NewSessionDialog::NewSessionDialog()
 	advanced_table->attach(*m_control_bus_channel_count, 1, 2, 2, 3, Gtk::AttachOptions(), Gtk::AttachOptions(), 0, 0);
 	advanced_table->attach(*m_master_bus_channel_count, 1, 2, 1, 2, Gtk::AttachOptions(), Gtk::AttachOptions(), 0, 0);
 	advanced_table->attach(*m_create_master_bus, 0, 1, 1, 2, Gtk::FILL, Gtk::AttachOptions(), 0, 0);
+
 	m_connect_inputs->set_flags(Gtk::CAN_FOCUS);
 	m_connect_inputs->set_relief(Gtk::RELIEF_NORMAL);
 	m_connect_inputs->set_mode(true);
-	m_connect_inputs->set_active(false);
+	m_connect_inputs->set_active(true);
 	m_connect_inputs->set_border_width(0);
+
 	m_limit_input_ports->set_flags(Gtk::CAN_FOCUS);
 	m_limit_input_ports->set_relief(Gtk::RELIEF_NORMAL);
 	m_limit_input_ports->set_mode(true);
-	m_limit_input_ports->set_sensitive(false);
+	m_limit_input_ports->set_sensitive(true);
 	m_limit_input_ports->set_border_width(0);
 	m_input_limit_count->set_flags(Gtk::CAN_FOCUS);
 	m_input_limit_count->set_update_policy(Gtk::UPDATE_ALWAYS);
@@ -157,6 +159,7 @@ NewSessionDialog::NewSessionDialog()
 	m_input_limit_count->set_digits(0);
 	m_input_limit_count->set_wrap(false);
 	m_input_limit_count->set_sensitive(false);
+
 	input_port_limit_hbox->pack_start(*m_limit_input_ports, Gtk::PACK_SHRINK, 6);
 	input_port_limit_hbox->pack_start(*m_input_limit_count, Gtk::PACK_EXPAND_PADDING, 0);
 	input_port_vbox->pack_start(*m_connect_inputs, Gtk::PACK_SHRINK, 0);
@@ -177,12 +180,12 @@ NewSessionDialog::NewSessionDialog()
 	m_connect_outputs->set_flags(Gtk::CAN_FOCUS);
 	m_connect_outputs->set_relief(Gtk::RELIEF_NORMAL);
 	m_connect_outputs->set_mode(true);
-	m_connect_outputs->set_active(false);
+	m_connect_outputs->set_active(true);
 	m_connect_outputs->set_border_width(0);
 	m_limit_output_ports->set_flags(Gtk::CAN_FOCUS);
 	m_limit_output_ports->set_relief(Gtk::RELIEF_NORMAL);
 	m_limit_output_ports->set_mode(true);
-	m_limit_output_ports->set_sensitive(false);
+	m_limit_output_ports->set_sensitive(true);
 	m_limit_output_ports->set_border_width(0);
 	m_output_limit_count->set_flags(Gtk::CAN_FOCUS);
 	m_output_limit_count->set_update_policy(Gtk::UPDATE_ALWAYS);
@@ -597,12 +600,24 @@ void
 NewSessionDialog::connect_inputs_clicked ()
 {
         m_limit_input_ports->set_sensitive(m_connect_inputs->get_active());
+
+		if (m_connect_inputs->get_active() && m_limit_input_ports->get_active()) {
+	        m_input_limit_count->set_sensitive(true);
+		} else {
+	        m_input_limit_count->set_sensitive(false);
+		}
 }
 
 void
 NewSessionDialog::connect_outputs_clicked ()
 {
         m_limit_output_ports->set_sensitive(m_connect_outputs->get_active());
+
+		if (m_connect_outputs->get_active() && m_limit_output_ports->get_active()) {
+	        m_output_limit_count->set_sensitive(true);
+		} else {
+	        m_output_limit_count->set_sensitive(false);
+		}
 }
 
 void
diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index e0a62b177f..6c72767b11 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -49,7 +49,7 @@ PluginSelector::PluginSelector (PluginManager *mgr)
 	manager = mgr;
 	session = 0;
 	
-	current_selection = PluginInfo::LADSPA;
+	current_selection = ARDOUR::LADSPA;
 
 	lmodel = Gtk::ListStore::create(lcols);
 	ladspa_display.set_model (lmodel);
@@ -141,6 +141,7 @@ PluginSelector::PluginSelector (PluginManager *mgr)
 	set_response_sensitive (RESPONSE_APPLY, false);
 	get_vbox()->pack_start (*table);
 
+	// Notebook tab order must be the same in here as in set_correct_focus()
 	using namespace Gtk::Notebook_Helpers;
 	notebook.pages().push_back (TabElem (lscroller, _("LADSPA")));
 
@@ -161,6 +162,7 @@ PluginSelector::PluginSelector (PluginManager *mgr)
 
 	ladspa_display.signal_button_press_event().connect_notify (mem_fun(*this, &PluginSelector::row_clicked));
 	ladspa_display.get_selection()->signal_changed().connect (mem_fun(*this, &PluginSelector::ladspa_display_selection_changed));
+	ladspa_display.grab_focus();
 	
 #ifdef VST_SUPPORT
 	if (Config->get_use_vst()) {
@@ -188,6 +190,43 @@ PluginSelector::PluginSelector (PluginManager *mgr)
 #ifdef HAVE_COREAUDIO
 	au_refiller ();
 #endif
+
+	signal_show().connect (mem_fun (*this, &PluginSelector::set_correct_focus));
+}
+
+/**
+ * Makes sure keyboard focus is always in the plugin list
+ * of the selected notebook tab.
+ **/
+void
+PluginSelector::set_correct_focus()
+{
+	int cp = notebook.get_current_page();
+
+	if (cp == 0) {
+		ladspa_display.grab_focus();
+		return;
+	}
+
+#ifdef VST_SUPPORT
+	if (Config->get_use_vst()) {
+		cp--;
+	
+		if (cp == 0) {
+			vst_display.grab_focus();
+			return;
+		}
+	}
+#endif
+
+#ifdef HAVE_COREAUDIO
+	cp--;
+
+	if (cp == 0) {
+		au_display.grab_focus();
+		return;
+	}
+#endif
 }
 
 void
@@ -286,7 +325,7 @@ PluginSelector::vst_display_selection_changed()
 		btn_add->set_sensitive (false);
 	}
 
-	current_selection = PluginInfo::VST;
+	current_selection = ARDOUR::VST;
 }
 
 #endif //VST_SUPPORT
@@ -332,7 +371,7 @@ PluginSelector::au_display_selection_changed()
 		btn_add->set_sensitive (false);
 	}
 	
-	current_selection = PluginInfo::AudioUnit;
+	current_selection = ARDOUR::AudioUnit;
 }
 
 #endif //HAVE_COREAUDIO
@@ -361,19 +400,19 @@ PluginSelector::btn_add_clicked()
 	Gtk::TreeModel::Row row;
 
 	switch (current_selection) {
-		case PluginInfo::LADSPA:
+		case ARDOUR::LADSPA:
 			row = *(ladspa_display.get_selection()->get_selected());
 			name = row[lcols.name];
 			pi = row[lcols.plugin];
 			break;
-		case PluginInfo::VST:
+		case ARDOUR::VST:
 #ifdef VST_SUPPORT
 			row = *(vst_display.get_selection()->get_selected());
 			name = row[vcols.name];
 			pi = row[vcols.plugin];
 #endif
 			break;
-		case PluginInfo::AudioUnit:
+		case ARDOUR::AudioUnit:
 #ifdef HAVE_COREAUDIO
 			row = *(au_display.get_selection()->get_selected());
 			name = row[aucols.name];
@@ -426,7 +465,7 @@ PluginSelector::ladspa_display_selection_changed()
 		btn_add->set_sensitive (false);
 	}
 	
-	current_selection = PluginInfo::LADSPA;
+	current_selection = ARDOUR::LADSPA;
 }
 
 void
diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index 583506972a..d71203131c 100644
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -50,7 +50,7 @@ class PluginSelector : public ArdourDialog
 	Gtk::ScrolledWindow auscroller; // AudioUnit
 	Gtk::ScrolledWindow ascroller;  // Added plugins
 	
-	ARDOUR::PluginInfo::Type current_selection;
+	ARDOUR::PluginType current_selection;
 
 	// page 1
 	struct LadspaColumns : public Gtk::TreeModel::ColumnRecord {
@@ -147,6 +147,8 @@ class PluginSelector : public ArdourDialog
 	void btn_apply_clicked();
 	void use_plugin (ARDOUR::PluginInfoPtr);
 	void cleanup ();
+
+	void set_correct_focus();
 };
 
 #endif // __ardour_plugin_selector_h__
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index edc94864f2..f9db649737 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -27,6 +27,7 @@
 #include <pbd/xml++.h>
 #include <pbd/failed_constructor.h>
 
+#include <gtkmm/widget.h>
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/fastmeter.h>
 #include <gtkmm2ext/barcontroller.h>
@@ -51,6 +52,7 @@
 #include "plugin_ui.h"
 #include "utils.h"
 #include "gui_thread.h"
+#include "public_editor.h"
 
 #include "i18n.h"
 
@@ -111,626 +113,22 @@ PluginUIWindow::PluginUIWindow (AudioEngine &engine, boost::shared_ptr<PluginIns
 		if (h > 600) h = 600;
 		set_default_size (450, h); 
 	}
-}
-
-PluginUIWindow::~PluginUIWindow ()
-{
-}
-
-LadspaPluginUI::LadspaPluginUI (AudioEngine &engine, boost::shared_ptr<PluginInsert> pi, bool scrollable)
-	: PlugUIBase (pi),
-	  engine(engine),
-	  button_table (initial_button_rows, initial_button_cols),
-	  output_table (initial_output_rows, initial_output_cols),
-	  hAdjustment(0.0, 0.0, 0.0),
-	  vAdjustment(0.0, 0.0, 0.0),
-	  scroller_view(hAdjustment, vAdjustment),
-	  automation_menu (0),
-	  is_scrollable(scrollable)
-{
-	set_name ("PluginEditor");
-	set_border_width (10);
-	set_homogeneous (false);
-
-	settings_box.set_homogeneous (false);
-
-	HBox* constraint_hbox = manage (new HBox);
-	HBox* smaller_hbox = manage (new HBox);
-	Label* combo_label = manage (new Label (_("<span size=\"large\">Presets</span>")));
-	combo_label->set_use_markup (true);
-
-	smaller_hbox->pack_start (*combo_label, false, false, 10);
-	smaller_hbox->pack_start (combo, false, false);
-	smaller_hbox->pack_start (save_button, false, false);
-
-	constraint_hbox->set_spacing (5);
-	constraint_hbox->pack_start (*smaller_hbox, true, false);
-	constraint_hbox->pack_end (bypass_button, false, false);
-
-	settings_box.pack_end (*constraint_hbox, false, false);
-
-	pack_start (settings_box, false, false);
-
-	if ( is_scrollable ) {
-		scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-		scroller.set_name ("PluginEditor");
-		scroller_view.set_name("PluginEditor");
-		scroller_view.add (hpacker);
-		scroller.add (scroller_view);
-		
-		pack_start (scroller, true, true);
-
-	}
-	else {
-		pack_start (hpacker, false, false);
-	}
-
-	insert->active_changed.connect (mem_fun(*this, &LadspaPluginUI::redirect_active_changed));
-	bypass_button.set_active (!insert->active());
-	
-	build (engine);
-}
-
-LadspaPluginUI::~LadspaPluginUI ()
-{
-	if (output_controls.size() > 0) {
-		screen_update_connection.disconnect();
-	}
-}
-
-void
-LadspaPluginUI::build (AudioEngine &engine)
-
-{
-	guint32 i = 0;
-	guint32 x = 0;
-	Frame* frame;
-	Frame* bt_frame;
-	VBox* box;
-	int output_row, output_col;
-	int button_row, button_col;
-	int output_rows, output_cols;
-	int button_rows, button_cols;
-	guint32 n_ins=0, n_outs = 0;
-
-	prefheight = 30;
-	hpacker.set_spacing (10);
-
-	output_rows = initial_output_rows;
-	output_cols = initial_output_cols;
-	button_rows = initial_button_rows;
-	button_cols = initial_button_cols;
-	output_row = 0;
-	button_row = 0;
-	output_col = 0;
-	button_col = 0;
-
-	button_table.set_homogeneous (false);
-	button_table.set_row_spacings (2);
-	button_table.set_col_spacings (2);
-	output_table.set_homogeneous (true);
-	output_table.set_row_spacings (2);
-	output_table.set_col_spacings (2);
-	button_table.set_border_width (5);
-	output_table.set_border_width (5);
-
-	hpacker.set_border_width (10);
-
-	bt_frame = manage (new Frame);
-	bt_frame->set_name ("BaseFrame");
-	bt_frame->add (button_table);
-	hpacker.pack_start(*bt_frame, true, true);
-
-	box = manage (new VBox);
-	box->set_border_width (5);
-	box->set_spacing (1);
-
-	frame = manage (new Frame);
-	frame->set_name ("BaseFrame");
-	frame->set_label (_("Controls"));
-	frame->add (*box);
-	hpacker.pack_start(*frame, true, true);
-
-	/* find all ports. build control elements for all appropriate control ports */
-
-	for (i = 0; i < plugin->parameter_count(); ++i) {
-
-		if (plugin->parameter_is_control (i)) {
-			
-			/* Don't show latency control ports */
-
-			if (plugin->describe_parameter (i) == X_("latency")) {
-				continue;
-			}
-
-			ControlUI* cui;
-	
-			/* if we are scrollable, just use one long column */
-
-			if (!is_scrollable) {
-				if (x++ > 7){
-					frame = manage (new Frame);
-					frame->set_name ("BaseFrame");
-					box = manage (new VBox);
-					
-					box->set_border_width (5);
-					box->set_spacing (1);
-
-					frame->add (*box);
-					hpacker.pack_start(*frame,true,true);
-
-					x = 0;
-				}
-			}
-
-			if ((cui = build_control_ui (engine, i, plugin->get_nth_control (i))) == 0) {
-				error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg;
-				continue;
-			}
-				
-			if (cui->control || cui->clickbox || cui->combo) {
-
-				box->pack_start (*cui, false, false);
-
-			} else if (cui->button) {
-
-				if (button_row == button_rows) {
-					button_row = 0;
-					if (++button_col == button_cols) {
-						button_cols += 2;
-						button_table.resize (button_rows, button_cols);
-					}
-				}
-
-				button_table.attach (*cui, button_col, button_col + 1, button_row, button_row+1, 
-						     FILL|EXPAND, FILL);
-				button_row++;
-
-			} else if (cui->display) {
-
-				output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1, 
-						     FILL|EXPAND, FILL);
-				
- 				// TODO: The meters should be divided into multiple rows 
-				
-				if (++output_col == output_cols) {
-					output_cols ++;
-					output_table.resize (output_rows, output_cols);
-				}
-				
-				/* old code, which divides meters into
-				 * columns first, rows later. New code divides into one row
-				 
-				if (output_row == output_rows) {
-					output_row = 0;
-					if (++output_col == output_cols) {
-						output_cols += 2;
-						output_table.resize (output_rows, output_cols);
-					}
-				}
-				
-				output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1, 
-						     FILL|EXPAND, FILL);
- 
-				output_row++;
-				*/
-			}
-				
-			/* HACK: ideally the preferred height would be queried from
-			   the complete hpacker, but I can't seem to get that
-			   information in time, so this is an estimation 
-			*/
-
-			prefheight += 30;
-
-		} 
-	}
-
-	n_ins = plugin->get_info()->n_inputs;
-	n_outs = plugin->get_info()->n_outputs;
-
-	if (box->children().empty()) {
-		hpacker.remove (*frame);
-	}
-
-	if (button_table.children().empty()) {
-		hpacker.remove (*bt_frame);
-	}
-
-	if (!output_table.children().empty()) {
-		frame = manage (new Frame);
-		frame->set_name ("BaseFrame");
-		frame->add (output_table);
-		hpacker.pack_end (*frame, true, true);
-	}
-
-	output_update ();
-
-	output_table.show_all ();
-	button_table.show_all ();
-}
-
-LadspaPluginUI::ControlUI::ControlUI ()
-	: automate_button (X_("")) // force creation of a label 
-{
-	automate_button.set_name ("PluginAutomateButton");
-	ARDOUR_UI::instance()->tooltips().set_tip (automate_button,
-						   _("Automation control"));
-
-	/* don't fix the height, it messes up the bar controllers */
-
-	set_size_request_to_display_given_text (automate_button, X_("lngnuf"), 2, 2);
-
-	ignore_change = 0;
-	display = 0;
-	button = 0;
-	control = 0;
-	clickbox = 0;
-	adjustment = 0;
-	meterinfo = 0;
-}
-
-LadspaPluginUI::ControlUI::~ControlUI() 
-{
-	if (adjustment) {
-		delete adjustment;
-	}
-
-	if (meterinfo) {
-		delete meterinfo->meter;
-		delete meterinfo;
-	}
-}
-
-void
-LadspaPluginUI::automation_state_changed (ControlUI* cui)
-{
-	/* update button label */
-
-	switch (insert->get_port_automation_state (cui->port_index) & (Off|Play|Touch|Write)) {
-	case Off:
-		cui->automate_button.set_label (_("Off"));
-		break;
-	case Play:
-		cui->automate_button.set_label (_("Play"));
-		break;
-	case Write:
-		cui->automate_button.set_label (_("Write"));
-		break;
-	case Touch:
-		cui->automate_button.set_label (_("Touch"));
-		break;
-	default:
-		cui->automate_button.set_label (_("???"));
-		break;
-	}
-}
-
-
-static void integer_printer (char buf[32], Adjustment &adj, void *arg)
-{
-	snprintf (buf, 32, "%.0f", adj.get_value());
-}
-
-void
-LadspaPluginUI::print_parameter (char *buf, uint32_t len, uint32_t param)
-{
-	plugin->print_parameter (param, buf, len);
-}
-
-LadspaPluginUI::ControlUI*
-LadspaPluginUI::build_control_ui (AudioEngine &engine, guint32 port_index, PBD::Controllable* mcontrol)
-
-{
-	ControlUI* control_ui;
-	Plugin::ParameterDescriptor desc;
-
-	plugin->get_parameter_descriptor (port_index, desc);
-
-	control_ui = manage (new ControlUI ());
-	control_ui->adjustment = 0;
-	control_ui->combo = 0;
-	control_ui->combo_map = 0;
-	control_ui->port_index = port_index;
-	control_ui->update_pending = false;
-	control_ui->label.set_text (desc.label);
-	control_ui->label.set_alignment (0.0, 0.5);
-	control_ui->label.set_name ("PluginParameterLabel");
-
-	control_ui->set_spacing (5);
-
-	if (plugin->parameter_is_input (port_index)) {
-
-		boost::shared_ptr<LadspaPlugin> lp;
-
-		if ((lp = boost::dynamic_pointer_cast<LadspaPlugin>(plugin)) != 0) {
-			
-			lrdf_defaults* defaults = lrdf_get_scale_values(lp->unique_id(), port_index);
-			
-			if (defaults && defaults->count > 0)	{
-				
-				control_ui->combo = new Gtk::ComboBoxText;
-				//control_ui->combo->set_value_in_list(true, false);
-				set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui));
-				control_ui->combo->signal_changed().connect (bind (mem_fun(*this, &LadspaPluginUI::control_combo_changed), control_ui));
-				plugin->ParameterChanged.connect (bind (mem_fun (*this, &LadspaPluginUI::parameter_changed), control_ui));
-				control_ui->pack_start(control_ui->label, true, true);
-				control_ui->pack_start(*control_ui->combo, false, true);
-				
-				update_control_display(control_ui);
-				
-				lrdf_free_setting_values(defaults);
-				return control_ui;
-			}
-		}
-			
-		if (desc.toggled) {
-
-			/* Build a button */
-		
-			control_ui->button = manage (new ToggleButton ());
-			control_ui->button->set_name ("PluginEditorButton");
-			control_ui->button->set_size_request (20, 20);
-
-			control_ui->pack_start (control_ui->label, true, true);
-			control_ui->pack_start (*control_ui->button, false, true);
-			control_ui->pack_start (control_ui->automate_button, false, false);
-
-			control_ui->button->signal_clicked().connect (bind (mem_fun(*this, &LadspaPluginUI::control_port_toggled), control_ui));
-		
-			if(plugin->get_parameter (port_index) == 1){
-				control_ui->button->set_active(true);
-			}
-
-			return control_ui;
-		}
-	
-		control_ui->adjustment = new Adjustment (0, 0, 0, 0, 0);
-
-		/* XXX this code is not right yet, because it doesn't handle
-		   the absence of bounds in any sensible fashion.
-		*/
-
-		control_ui->adjustment->set_lower (desc.lower);
-		control_ui->adjustment->set_upper (desc.upper);
-
-		control_ui->logarithmic = desc.logarithmic;
-		if (control_ui->logarithmic) {
-			if (control_ui->adjustment->get_lower() == 0.0) {
-				control_ui->adjustment->set_lower (control_ui->adjustment->get_upper()/10000);
-			}
-			control_ui->adjustment->set_upper (log(control_ui->adjustment->get_upper()));
-			control_ui->adjustment->set_lower (log(control_ui->adjustment->get_lower()));
-		}
-	
-		float delta = desc.upper - desc.lower;
-
-		control_ui->adjustment->set_page_size (delta/100.0);
-		control_ui->adjustment->set_step_increment (desc.step);
-		control_ui->adjustment->set_page_increment (desc.largestep);
-
-		if (desc.integer_step) {
-			control_ui->clickbox = new ClickBox (control_ui->adjustment, "PluginUIClickBox");
-			Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2);
-			control_ui->clickbox->set_print_func (integer_printer, 0);
-		} else {
-			sigc::slot<void,char*,uint32_t> pslot = sigc::bind (mem_fun(*this, &LadspaPluginUI::print_parameter), (uint32_t) port_index);
-
-			control_ui->control = new BarController (*control_ui->adjustment, *mcontrol, pslot);
-			// should really match the height of the text in the automation button+label
-			control_ui->control->set_size_request (200, 22);
-			control_ui->control->set_name (X_("PluginSlider"));
-			control_ui->control->set_style (BarController::LeftToRight);
-			control_ui->control->set_use_parent (true);
-
-			control_ui->control->StartGesture.connect (bind (mem_fun(*this, &LadspaPluginUI::start_touch), control_ui));
-			control_ui->control->StopGesture.connect (bind (mem_fun(*this, &LadspaPluginUI::stop_touch), control_ui));
-			
-		}
-
-		if (control_ui->logarithmic) {
-			control_ui->adjustment->set_value(log(plugin->get_parameter(port_index)));
-		} else{
-			control_ui->adjustment->set_value(plugin->get_parameter(port_index));
-		}
-
-		/* XXX memory leak: SliderController not destroyed by ControlUI
-		   destructor, and manage() reports object hierarchy
-		   ambiguity.
-		*/
-
-		control_ui->pack_start (control_ui->label, true, true);
-		if (desc.integer_step) {
-			control_ui->pack_start (*control_ui->clickbox, false, false);
-		} else {
-			control_ui->pack_start (*control_ui->control, false, false);
-		}
-
-		control_ui->pack_start (control_ui->automate_button, false, false);
-		control_ui->adjustment->signal_value_changed().connect (bind (mem_fun(*this, &LadspaPluginUI::control_adjustment_changed), control_ui));
-		control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &LadspaPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
-
-		automation_state_changed (control_ui);
-
-		plugin->ParameterChanged.connect (bind (mem_fun(*this, &LadspaPluginUI::parameter_changed), control_ui));
-		insert->automation_list (port_index).automation_state_changed.connect 
-			(bind (mem_fun(*this, &LadspaPluginUI::automation_state_changed), control_ui));
-
-	} else if (plugin->parameter_is_output (port_index)) {
-
-		control_ui->display = manage (new EventBox);
-		control_ui->display->set_name ("ParameterValueDisplay");
-
-		control_ui->display_label = manage (new Label);
-
-		control_ui->display_label->set_name ("ParameterValueDisplay");
-
-		control_ui->display->add (*control_ui->display_label);
-		Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->display, "-99,99", 2, 2);
 
-		control_ui->display->show_all ();
-
-		/* set up a meter */
-		/* TODO: only make a meter if the port is Hinted for it */
-
-		MeterInfo * info = new MeterInfo(port_index);
- 		control_ui->meterinfo = info;
-		
-		info->meter = new FastMeter (5, 100, FastMeter::Vertical);
-
-		info->min_unbound = desc.min_unbound;
-		info->max_unbound = desc.max_unbound;
-
-		info->min = desc.lower;
-		info->max = desc.upper;
-
-		control_ui->vbox = manage (new VBox);
-		control_ui->hbox = manage (new HBox);
-		
-		control_ui->label.set_angle(90);
-		control_ui->hbox->pack_start (control_ui->label, false, false);
- 		control_ui->hbox->pack_start (*info->meter, false, false);
-
- 		control_ui->vbox->pack_start (*control_ui->hbox, false, false);
-		
- 		control_ui->vbox->pack_start (*control_ui->display, false, false);
-
-		control_ui->pack_start (*control_ui->vbox);
-
-		control_ui->meterinfo->meter->show_all();
-		control_ui->meterinfo->packed = true;
-		
-		output_controls.push_back (control_ui);
-	}
-	
-	plugin->ParameterChanged.connect (bind (mem_fun(*this, &LadspaPluginUI::parameter_changed), control_ui));
-	return control_ui;
-}
-
-void
-LadspaPluginUI::start_touch (LadspaPluginUI::ControlUI* cui)
-{
-	insert->automation_list (cui->port_index).start_touch ();
-}
-
-void
-LadspaPluginUI::stop_touch (LadspaPluginUI::ControlUI* cui)
-{
-	insert->automation_list (cui->port_index).stop_touch ();
-}
-
-void
-LadspaPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
-{
-	using namespace Menu_Helpers;
-
-	if (automation_menu == 0) {
-		automation_menu = manage (new Menu);
-		automation_menu->set_name ("ArdourContextMenu");
-	} 
-
-	MenuList& items (automation_menu->items());
-
-	items.clear ();
-	items.push_back (MenuElem (_("Off"), 
-				   bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Off, cui)));
-	items.push_back (MenuElem (_("Play"),
-				   bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Play, cui)));
-	items.push_back (MenuElem (_("Write"),
-				   bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Write, cui)));
-	items.push_back (MenuElem (_("Touch"),
-				   bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Touch, cui)));
-
-	automation_menu->popup (1, 0);
-}
-
-void
-LadspaPluginUI::set_automation_state (AutoState state, ControlUI* cui)
-{
-	insert->set_port_automation_state (cui->port_index, state);
-}
-
-void
-LadspaPluginUI::control_adjustment_changed (ControlUI* cui)
-{
-	if (cui->ignore_change) {
-		return;
-	}
-
-	double value = cui->adjustment->get_value();
-
-	if (cui->logarithmic) {
-	  	value = exp(value);
-	}
-
-	insert->set_parameter (cui->port_index, (float) value);
-}
-
-void
-LadspaPluginUI::parameter_changed (uint32_t abs_port_id, float val, ControlUI* cui)
-{
-	if (cui->port_index == abs_port_id) {
-		if (!cui->update_pending) {
-			cui->update_pending = true;
-			Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &LadspaPluginUI::update_control_display), cui));
-		}
-	}
 }
 
-void
-LadspaPluginUI::update_control_display (ControlUI* cui)	
+PluginUIWindow::~PluginUIWindow ()
 {
-	/* XXX how do we handle logarithmic stuff here ? */
-	
-	cui->update_pending = false;
-
-	float val = plugin->get_parameter (cui->port_index);
-
-	cui->ignore_change++;
-	if (cui->combo) {
-	        std::map<string,float>::iterator it;
-		for (it = cui->combo_map->begin(); it != cui->combo_map->end(); ++it) {
-			if (it->second == val) {
-				cui->combo->set_active_text(it->first);
-				break;
-			}
-		}
-	} else if (cui->adjustment == 0) {
-
-		if (val > 0.5) {
-			cui->button->set_active (true);
-		} else {
-			cui->button->set_active (false);
-		}
-
-	} else {
-		if (cui->logarithmic) {
-			val = log(val);
-		}
-		if (val != cui->adjustment->get_value()) {
-			cui->adjustment->set_value (val);
-		}
-	}
-	cui->ignore_change--;
 }
-
-void
-LadspaPluginUI::control_port_toggled (ControlUI* cui)
+bool
+PluginUIWindow::on_key_press_event (GdkEventKey* event)
 {
-	if (!cui->ignore_change) {
-		insert->set_parameter (cui->port_index, cui->button->get_active());
-	}
+	return PublicEditor::instance().on_key_press_event(event);
 }
 
-void
-LadspaPluginUI::control_combo_changed (ControlUI* cui)
+bool
+PluginUIWindow::on_key_release_event (GdkEventKey* event)
 {
-	if (!cui->ignore_change) {
-		string value = cui->combo->get_active_text();
-		std::map<string,float> mapping = *cui->combo_map;
-		insert->set_parameter (cui->port_index, mapping[value]);
-	}
-
+	return PublicEditor::instance().on_key_release_event(event);
 }
 
 void
@@ -742,91 +140,6 @@ PluginUIWindow::plugin_going_away (ARDOUR::Redirect* ignored)
 	delete_when_idle (this);
 }
 
-void
-LadspaPluginUI::redirect_active_changed (Redirect* r, void* src)
-{
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &LadspaPluginUI::redirect_active_changed), r, src));
-	
-	bypass_button.set_active (!r->active());
-}
-
-bool
-LadspaPluginUI::start_updating (GdkEventAny* ignored)
-{
-	if (output_controls.size() > 0 ) {
-		screen_update_connection.disconnect();
-		screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect 
-			(mem_fun(*this, &LadspaPluginUI::output_update));
-	}
-	return false;
-}
-
-bool
-LadspaPluginUI::stop_updating (GdkEventAny* ignored)
-{
-	if (output_controls.size() > 0 ) {
-		screen_update_connection.disconnect();
-	}
-	return false;
-}
-
-void
-LadspaPluginUI::output_update ()
-{
-	for (vector<ControlUI*>::iterator i = output_controls.begin(); i != output_controls.end(); ++i) {
-		float val = plugin->get_parameter ((*i)->port_index);
-		char buf[32];
-		snprintf (buf, sizeof(buf), "%.2f", val);
-		(*i)->display_label->set_text (buf);
-
-		/* autoscaling for the meter */
-		if ((*i)->meterinfo && (*i)->meterinfo->packed) {
-			
-			if (val < (*i)->meterinfo->min) {
-				if ((*i)->meterinfo->min_unbound)
-					(*i)->meterinfo->min = val;
-				else
-					val = (*i)->meterinfo->min;
-			}
-
-			if (val > (*i)->meterinfo->max) {
-				if ((*i)->meterinfo->max_unbound)
-					(*i)->meterinfo->max = val;
-				else
-					val = (*i)->meterinfo->max;
-			}
-			
-			if ((*i)->meterinfo->max > (*i)->meterinfo->min ) {
-				float lval = (val - (*i)->meterinfo->min) / ((*i)->meterinfo->max - (*i)->meterinfo->min) ;
-				(*i)->meterinfo->meter->set (lval );
-			}
-		}
-	}
-}
-
-vector<string> 
-LadspaPluginUI::setup_scale_values(guint32 port_index, ControlUI* cui)
-{
-	vector<string> enums;
-	boost::shared_ptr<LadspaPlugin> lp = boost::dynamic_pointer_cast<LadspaPlugin> (plugin);
-
-	cui->combo_map = new std::map<string, float>;
-	lrdf_defaults* defaults = lrdf_get_scale_values(lp->unique_id(), port_index);
-	if (defaults)	{
-		for (uint32_t i = 0; i < defaults->count; ++i) {
-			enums.push_back(defaults->items[i].label);
-			pair<string, float> newpair;
-			newpair.first = defaults->items[i].label;
-			newpair.second = defaults->items[i].value;
-			cui->combo_map->insert(newpair);
-		}
-
-		lrdf_free_setting_values(defaults);
-	}
-
-	return enums;
-}
-
 PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
 	: insert (pi),
 	  plugin (insert->plugin()),
@@ -893,4 +206,3 @@ PlugUIBase::bypass_toggled ()
 		insert->set_active (!x, this);
 	}
 }
-
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index dc1e61887b..acd22294dd 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -203,13 +203,15 @@ class PluginUIWindow : public ArdourDialog
 	PlugUIBase& pluginui() { return *_pluginui; }
 
 	void resize_preferred();
+
+	virtual bool on_key_press_event (GdkEventKey*);
+	virtual bool on_key_release_event (GdkEventKey*);
 	
   private:
 	PlugUIBase* _pluginui;
 	void plugin_going_away (ARDOUR::Redirect*);
 };
 
-
 #ifdef VST_SUPPORT
 class VSTPluginUI : public PlugUIBase, public Gtk::VBox
 {
@@ -235,16 +237,12 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox
 #endif // VST_SUPPORT
 
 #ifdef HAVE_COREAUDIO
-class AUPluginUI : public PlugUIBase
+class AUPluginUI
 {
   public:
-	AUPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::AUPlugin>);
+	AUPluginUI (ARDOUR::AudioEngine&, boost::shared_ptr<ARDOUR::PluginInsert>);
 	~AUPluginUI ();
 	
-	gint get_preferred_height ();
-	bool start_updating(GdkEventAny*) {return false;}
-	bool stop_updating(GdkEventAny*) {return false;}
-
   private:
 	boost::shared_ptr<ARDOUR::AUPlugin> au;
 };
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index aa30a828a8..cb3d62f625 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -31,6 +31,7 @@ namespace Gtk {
 class Editor;
 class TimeAxisViewItem;
 class TimeAxisView;
+class PluginUIWindow;
 class PluginSelector;
 class PlaylistSelector;
 class XMLNode;
@@ -172,6 +173,8 @@ class PublicEditor : public Gtk::Window, public Stateful {
 	virtual bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0;
 
 	static PublicEditor* _instance;
+
+	friend class PluginUIWindow;
 };
 
 #endif // __gtk_ardour_public_editor_h__
diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index 74198265d9..ddb9e85ca2 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -957,44 +957,61 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
 		
 		if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (insert)) != 0) {
 			
-			PluginUIWindow *plugin_ui;
+			ARDOUR::PluginType type = plugin_insert->type();
+
+			if (type == ARDOUR::LADSPA || type == ARDOUR::VST) {
+				PluginUIWindow *plugin_ui;
 			
-			if (plugin_insert->get_gui() == 0) {
+				if (plugin_insert->get_gui() == 0) {
 				
-				string title;
-				string maker = plugin_insert->plugin()->maker();
-				string::size_type email_pos;
+					string title;
+					string maker = plugin_insert->plugin()->maker();
+					string::size_type email_pos;
 				
-				if ((email_pos = maker.find_first_of ('<')) != string::npos) {
-					maker = maker.substr (0, email_pos - 1);
-				}
+					if ((email_pos = maker.find_first_of ('<')) != string::npos) {
+						maker = maker.substr (0, email_pos - 1);
+					}
 				
-				if (maker.length() > 32) {
-					maker = maker.substr (0, 32);
-					maker += " ...";
-				}
+					if (maker.length() > 32) {
+						maker = maker.substr (0, 32);
+						maker += " ...";
+					}
 
-				title = string_compose(_("ardour: %1: %2 (by %3)"), _route->name(), plugin_insert->name(), maker);	
+					title = string_compose(_("ardour: %1: %2 (by %3)"), _route->name(), plugin_insert->name(), maker);	
+				
+					plugin_ui = new PluginUIWindow (_session.engine(), plugin_insert);
+					if (_owner_is_mixer) {
+						ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui);
+					} else {
+						ARDOUR_UI::instance()->the_editor().ensure_float (*plugin_ui);
+					}
+					plugin_ui->set_title (title);
+					plugin_insert->set_gui (plugin_ui);
 				
-				plugin_ui = new PluginUIWindow (_session.engine(), plugin_insert);
-				if (_owner_is_mixer) {
-					ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui);
 				} else {
-					ARDOUR_UI::instance()->the_editor().ensure_float (*plugin_ui);
+					plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_insert->get_gui());
 				}
-				plugin_ui->set_title (title);
-				plugin_insert->set_gui (plugin_ui);
-				
-			} else {
-				plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_insert->get_gui());
-			}
 			
-			if (plugin_ui->is_visible()) {
-				plugin_ui->get_window()->raise ();
+				if (plugin_ui->is_visible()) {
+					plugin_ui->get_window()->raise ();
+				} else {
+					plugin_ui->show_all ();
+				}
+#ifdef HAVE_COREAUDIO
+			} else if (type == ARDOUR::AudioUnit) {
+				AUPluginUI* plugin_ui;
+				if (plugin_insert->get_gui() == 0) {
+					plugin_ui = new AUPluginUI (_session.engine(), plugin_insert);
+				} else {
+					plugin_ui = reinterpret_cast<AUPluginUI*> (plugin_insert->get_gui());
+				}
+				
+				// raise window, somehow
+#endif				
 			} else {
-				plugin_ui->show_all ();
+				warning << "Unsupported plugin sent to RedirectBox::edit_redirect()" << endmsg;
+				return;
 			}
-			
 		} else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (insert)) != 0) {
 			
 			if (!_session.engine().connected()) {
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 0fff2e5d7b..db8f345574 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -250,6 +250,14 @@ RegionView::reset_width_dependent_items (double pixel_width)
 }
 
 void
+RegionView::set_height (gdouble height)
+{
+	TimeAxisViewItem::set_height (height - 2);
+	
+	_height = height;
+}
+
+void
 RegionView::region_layered ()
 {
 	RouteTimeAxisView *rtv = dynamic_cast<RouteTimeAxisView*>(&get_time_axis_view());
@@ -393,10 +401,6 @@ RegionView::region_renamed ()
 		str = _region.name();
 	}
 
-	if (_region.speed_mismatch (trackview.session().frame_rate())) {
-		str = string ("*") + str;
-	}
-
 	if (_region.muted()) {
 		str = string ("!") + str;
 	}
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index d2d2c22760..beb4f10d54 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -56,7 +56,7 @@ class RegionView : public TimeAxisViewItem
 	bool is_valid() const    { return valid; }
     void set_valid (bool yn) { valid = yn; }
 
-    virtual void set_height (double) = 0;
+    virtual void set_height (double);
     virtual void set_samples_per_unit (double);
     virtual bool set_duration (jack_nframes_t, void*);
 
@@ -121,7 +121,7 @@ class RegionView : public TimeAxisViewItem
     void         region_locked ();
     void         region_opacity ();
     void         region_layered ();
-    void         region_renamed ();
+    virtual void region_renamed ();
     void         region_sync_changed ();
 
     static gint _lock_toggle (ArdourCanvas::Item*, GdkEvent*, void*);
diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc
index bd5ce8af02..4110ad7d98 100644
--- a/gtk2_ardour/tape_region_view.cc
+++ b/gtk2_ardour/tape_region_view.cc
@@ -68,7 +68,7 @@ TapeAudioRegionView::init (Gdk::Color& basic_color, bool wfw)
 	/* every time the wave data changes and peaks are ready, redraw */
 	
 	for (uint32_t n = 0; n < audio_region().n_channels(); ++n) {
-		audio_region().source(n).PeaksReady.connect (bind (mem_fun(*this, &TapeAudioRegionView::update), n));
+		audio_region().audio_source(n).PeaksReady.connect (bind (mem_fun(*this, &TapeAudioRegionView::update), n));
 	}
 	
 }