X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgeneric_pluginui.cc;h=ba7e4d0058849e47c2dda40f697b64dc2c529cbc;hb=746665e89cf66c5688cd584555168bb8323b824e;hp=dbb86277e0a19b69c647ebb13308e11d7c125eef;hpb=8eb18fdd76fb54447795b792df5adb3fa5746be5;p=ardour.git

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index dbb86277e0..ba7e4d0058 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -27,45 +27,62 @@
 #include <string>
 #include <vector>
 
+#include <gtkmm/separator.h>
+
 #include "pbd/stl_delete.h"
+#include "pbd/unwind.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 "evoral/midi_events.h"
+#include "evoral/PatchChange.hpp"
+
+#include "midi++/midnam_patch.h"
 
+#include "ardour/midi_patch_manager.h"
+#include "ardour/midi_track.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/session.h"
 #include "ardour/value_as_string.h"
 
-#include "ardour_ui.h"
-#include "prompter.h"
+#include "gtkmm2ext/menu_elems.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/doi.h"
+
+#include "widgets/ardour_knob.h"
+#include "widgets/click_box.h"
+#include "widgets/fastmeter.h"
+#include "widgets/slider_controller.h"
+#include "widgets/tooltips.h"
+
 #include "plugin_ui.h"
+#include "plugin_display.h"
 #include "gui_thread.h"
 #include "automation_controller.h"
+#include "gain_meter.h"
+#include "timers.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
 using namespace Gtk;
+using namespace ARDOUR_UI_UTILS;
 
 GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrollable)
 	: PlugUIBase (pi)
-	, 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)
+	, _plugin_pianokeyboard_expander (_("MIDI Keyboard"))
+	, _piano (0)
+	, _pianomm (0)
+	, _piano_velocity (*manage (new Adjustment (100, 1, 127, 1, 16)))
+	, _piano_channel (*manage (new Adjustment (0, 1, 16, 1, 1)))
 {
 	set_name ("PluginEditor");
 	set_border_width (10);
@@ -76,50 +93,88 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrol
 
 	HBox* constraint_hbox = manage (new HBox);
 	HBox* smaller_hbox = manage (new HBox);
-	HBox* automation_hbox = manage (new HBox);
 	smaller_hbox->set_spacing (4);
-	automation_hbox->set_spacing (4);
 	Label* combo_label = manage (new Label (_("<span size=\"large\">Presets</span>")));
 	combo_label->set_use_markup (true);
 
-	latency_button.add (latency_label);
-	latency_button.signal_clicked().connect (sigc::mem_fun (*this, &PlugUIBase::latency_button_clicked));
+	latency_button.signal_clicked.connect (sigc::mem_fun (*this, &PlugUIBase::latency_button_clicked));
 	set_latency_label ();
 
-	smaller_hbox->pack_start (latency_button, false, false, 10);
+	smaller_hbox->pack_start (latency_button, false, false, 4);
+	smaller_hbox->pack_start (pin_management_button, false, false, 4);
 	smaller_hbox->pack_start (_preset_combo, false, false);
 	smaller_hbox->pack_start (_preset_modified, false, false);
 	smaller_hbox->pack_start (add_button, false, false);
 	smaller_hbox->pack_start (save_button, false, false);
 	smaller_hbox->pack_start (delete_button, false, false);
-	smaller_hbox->pack_start (bypass_button, false, true);
-	
-	automation_manual_all_button.set_label(_("Manual All"));
-	automation_play_all_button.set_label(_("Play All"));
-	automation_write_all_button.set_label(_("Write All"));
-	automation_touch_all_button.set_label(_("Touch All"));
-	
-	Gtk::Alignment *al = Gtk::manage(new Gtk::Alignment());
-    al->set_size_request(6, 2);
-    automation_hbox->pack_start(*al, false, true);
-    
-	automation_hbox->pack_start (automation_manual_all_button, false, false);
-	automation_hbox->pack_start (automation_play_all_button, false, false);
-	automation_hbox->pack_start (automation_write_all_button, false, false);
-	automation_hbox->pack_start (automation_touch_all_button, false, false);
+	if (pi->controls().size() > 0) {
+		smaller_hbox->pack_start (reset_button, false, false, 4);
+	}
+	smaller_hbox->pack_start (bypass_button, false, true, 4);
+
+	automation_manual_all_button.set_text(_("Manual"));
+	automation_manual_all_button.set_name (X_("generic button"));
+	automation_play_all_button.set_text(_("Play"));
+	automation_play_all_button.set_name (X_("generic button"));
+	automation_write_all_button.set_text(_("Write"));
+	automation_write_all_button.set_name (X_("generic button"));
+	automation_touch_all_button.set_text(_("Touch"));
+	automation_touch_all_button.set_name (X_("generic button"));
 
 	constraint_hbox->set_spacing (5);
 	constraint_hbox->set_homogeneous (false);
 
 	VBox* v1_box = manage (new VBox);
 	VBox* v2_box = manage (new VBox);
-	pack_end (plugin_analysis_expander, false, false);
+	if (pi->is_instrument ()) {
+		if (dynamic_cast<MidiTrack*> (pi->owner())) {
+			_piano = (PianoKeyboard*)piano_keyboard_new();
+			_pianomm = Glib::wrap((GtkWidget*)_piano);
+			_pianomm->set_flags(Gtk::CAN_FOCUS);
+			_pianomm->add_events(Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
+
+			g_signal_connect (G_OBJECT (_piano), "note-on", G_CALLBACK (GenericPluginUI::_note_on_event_handler), this);
+			g_signal_connect (G_OBJECT (_piano), "note-off", G_CALLBACK (GenericPluginUI::_note_off_event_handler), this);
+
+			HBox* box = manage (new HBox);
+			box->pack_start (*manage (new Label (_("Channel:"))), false, false);
+			box->pack_start (_piano_channel, false, false);
+			box->pack_start (*manage (new Label (_("Velocity:"))), false, false);
+			box->pack_start (_piano_velocity, false, false);
+
+			Box* box2 = manage (new HBox ());
+			box2->pack_start (*box, true, false);
+
+			_pianobox.set_spacing (4);
+			_pianobox.pack_start (*box2, true, true);
+			_pianobox.pack_start (*_pianomm, true, true);
+
+			_plugin_pianokeyboard_expander.set_expanded(false);
+			_plugin_pianokeyboard_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &GenericPluginUI::toggle_pianokeyboard));
+
+			pack_end (_plugin_pianokeyboard_expander, false, false);
+		}
+	} else {
+		pack_end (plugin_analysis_expander, false, false);
+	}
 	if (!plugin->get_docs().empty()) {
 		pack_end (description_expander, false, false);
 	}
 
+	v1_box->set_spacing (6);
 	v1_box->pack_start (*smaller_hbox, false, true);
-	v1_box->pack_start (*automation_hbox, false, true);
+	if (pi->controls().size() > 0) {
+		HBox* automation_hbox = manage (new HBox);
+		automation_hbox->set_spacing (6);
+		Label* l = manage (new Label (_("All Automation")));
+		l->set_alignment (1.0, 0.5);
+		automation_hbox->pack_start (*l, true, true);
+		automation_hbox->pack_start (automation_manual_all_button, false, false);
+		automation_hbox->pack_start (automation_play_all_button, false, false);
+		automation_hbox->pack_start (automation_write_all_button, false, false);
+		automation_hbox->pack_start (automation_touch_all_button, false, false);
+		v1_box->pack_start (*automation_hbox, false, true);
+	}
 	v2_box->pack_start (focus_button, false, true);
 
 	main_contents.pack_start (settings_box, false, false);
@@ -129,25 +184,44 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrol
 
 	main_contents.pack_start (*constraint_hbox, false, false);
 
-	if (is_scrollable ) {
-		scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-		scroller.set_name ("PluginEditor");
-		scroller_view.set_name("PluginEditor");
-		scroller_view.add (hpacker);
-		scroller.add (scroller_view);
+	pi->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&GenericPluginUI::processor_active_changed, this, boost::weak_ptr<Processor>(pi)), gui_context());
+
+	bypass_button.set_active (!pi->enabled());
+
+	/* ScrolledWindow will wrap hpacker in a Viewport */
+	scroller.add (hpacker);
+	Viewport* view = static_cast<Viewport*>(scroller.get_child());
+	view->set_shadow_type(Gtk::SHADOW_NONE);
 
-		main_contents.pack_start (scroller, true, true);
+	main_contents.pack_start (scroller, true, true);
+
+	prefheight = 0;
+	build ();
 
+	if (insert->plugin()->has_midnam() && insert->plugin()->knows_bank_patch()) {
+		/* right now PC are sent via MIDI Track controls only */
+		if (dynamic_cast<MidiTrack*> (insert->owner())) {
+			build_midi_table ();
+		}
+	}
+
+	if (is_scrollable) {
+		scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+		scroller.set_name ("PluginEditor");
 	} else {
-		main_contents.pack_start (hpacker, false, false);
+		scroller.signal_size_request().connect (sigc::mem_fun(*this, &GenericPluginUI::scroller_size_request));
+		scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER);
 	}
 
-	pi->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&GenericPluginUI::processor_active_changed, this, boost::weak_ptr<Processor>(pi)), gui_context());
 
-	bypass_button.set_active (!pi->active());
+	/* Listen for property changes that are not notified normally because
+	 * AutomationControl has only support for numeric values currently.
+	 * The only case is Variant::PATH for now */
+	plugin->PropertyChanged.connect(*this, invalidator(*this),
+	                                boost::bind(&GenericPluginUI::path_property_changed, this, _1, _2),
+	                                gui_context());
 
-	prefheight = 0;
-	build ();
+	main_contents.show ();
 }
 
 GenericPluginUI::~GenericPluginUI ()
@@ -155,6 +229,40 @@ GenericPluginUI::~GenericPluginUI ()
 	if (output_controls.size() > 0) {
 		screen_update_connection.disconnect();
 	}
+	delete _pianomm;
+}
+
+void
+GenericPluginUI::scroller_size_request (Gtk::Requisition* a)
+{
+	Glib::RefPtr<Gdk::Screen> screen = get_screen();
+	if (!screen)
+		screen = Gdk::Screen::get_default();
+
+	int maximum_width;
+	{
+		Gdk::Rectangle monitor;
+		const int monitor_num = screen->get_monitor_at_window (get_window ());
+		screen->get_monitor_geometry (
+				(monitor_num < 0) ? 0 : monitor_num,
+				monitor);
+
+		maximum_width = monitor.get_width() * 0.9;
+	}
+
+	GtkRequisition request = hpacker.size_request();
+
+	if (request.width > maximum_width) {
+		for (vector<ControlUI*>::const_iterator cuip = input_controls.begin();
+		                                        cuip != input_controls.end();
+		                                        ++cuip) {
+			if (!(*cuip)->short_autostate)
+				set_short_autostate(*cuip, true);
+		}
+		request = hpacker.size_request();
+	}
+
+	a->width = min(request.width, maximum_width);
 }
 
 // Some functions for calculating the 'similarity' of two plugin
@@ -176,7 +284,7 @@ int value = -1;
 
 static int match_or_digit(char c1, char c2) {
 	return c1 == c2 || (isdigit(c1) && isdigit(c2));
-}	
+}
 
 static std::size_t matching_chars_at_head(const string s1, const string s2) {
 std::size_t length, n = 0;
@@ -186,7 +294,7 @@ std::size_t length, n = 0;
 		if (!match_or_digit(s1[n], s2[n]))
 			break;
 		n++;
-	} 
+	}
 	return n;
 }
 
@@ -199,7 +307,7 @@ std::size_t s1pos, s2pos, n = 0;
 		if (!match_or_digit(s1[s1pos], s2[s2pos])	)
 			break;
 		n++;
-	} 
+	}
 	return n;
 }
 
@@ -209,58 +317,11 @@ static const float default_similarity_threshold = 0.3;
 void
 GenericPluginUI::build ()
 {
-	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;
-
-	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->set_label (_("Switches"));
-	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);
-
 	std::vector<ControlUI *> control_uis;
+	bool grid = plugin->parameter_count() > 0;
 
 	// Build a ControlUI for each control port
-	for (i = 0; i < plugin->parameter_count(); ++i) {
+	for (size_t i = 0; i < plugin->parameter_count(); ++i) {
 
 		if (plugin->parameter_is_control (i)) {
 
@@ -278,6 +339,11 @@ GenericPluginUI::build ()
 			const float value = plugin->get_parameter(i);
 
 			ControlUI* cui;
+			Plugin::UILayoutHint hint;
+
+			if (!plugin->get_layout(i, hint)) {
+				grid = false;
+			}
 
 			boost::shared_ptr<ARDOUR::AutomationControl> c
 				= boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
@@ -285,14 +351,21 @@ GenericPluginUI::build ()
 
 			ParameterDescriptor desc;
 			plugin->get_parameter_descriptor(i, desc);
-			if ((cui = build_control_ui (param, desc, c, value, plugin->parameter_is_input(i))) == 0) {
+			if ((cui = build_control_ui (param, desc, c, value, plugin->parameter_is_input(i), hint.knob)) == 0) {
 				error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg;
 				continue;
 			}
 
+			if (grid) {
+				cui->x0 = hint.x0;
+				cui->x1 = hint.x1;
+				cui->y0 = hint.y0;
+				cui->y1 = hint.y1;
+			}
+
 			const std::string param_docs = plugin->get_parameter_docs(i);
 			if (!param_docs.empty()) {
-				ARDOUR_UI::instance()->set_tip(cui, param_docs.c_str());
+				set_tooltip(cui, param_docs.c_str());
 			}
 
 			control_uis.push_back(cui);
@@ -326,60 +399,133 @@ GenericPluginUI::build ()
 	if (!descs.empty()) {
 		plugin->announce_property_values();
 	}
-	
-	// Connect automation *_all buttons
-	automation_manual_all_button.signal_clicked().connect(boost::bind(&GenericPluginUI::automation_manual_all, this, control_uis));
-	automation_play_all_button.signal_clicked().connect(boost::bind(&GenericPluginUI::automation_play_all, this, control_uis));
-    automation_write_all_button.signal_clicked().connect(boost::bind(&GenericPluginUI::automation_write_all, this, control_uis));
-    automation_touch_all_button.signal_clicked().connect(boost::bind(&GenericPluginUI::automation_touch_all, this, control_uis));
+
+	if (grid) {
+		custom_layout (control_uis);
+	} else {
+		automatic_layout (control_uis);
+	}
+
+	output_update ();
+
+	automation_manual_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Off));
+	automation_play_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Play));
+	automation_write_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Write));
+	automation_touch_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Touch));
+
+	/* XXX This is a workaround for AutomationControl not knowing about preset loads */
+	plugin->PresetLoaded.connect (*this, invalidator (*this), boost::bind (&GenericPluginUI::update_input_displays, this), gui_context ());
+}
+
+
+void
+GenericPluginUI::automatic_layout (const std::vector<ControlUI*>& control_uis)
+{
+	guint32 x = 0;
+
+	static const int32_t initial_button_rows = 12;
+	static const int32_t initial_button_cols = 1;
+	static const int32_t initial_output_rows = 1;
+	static const int32_t initial_output_cols = 4;
+
+	Gtk::Table* button_table = manage (new Gtk::Table (initial_button_rows, initial_button_cols));
+	Gtk::Table* output_table = manage (new Gtk::Table (initial_output_rows, initial_output_cols));
+
+	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;
+
+	hpacker.set_spacing (10);
+	hpacker.set_border_width (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);
+	button_table->set_border_width (5);
+
+	output_table->set_homogeneous (true);
+	output_table->set_row_spacings (2);
+	output_table->set_col_spacings (2);
+	output_table->set_border_width (5);
+
+
+	bt_frame = manage (new Frame);
+	bt_frame->set_name ("BaseFrame");
+	bt_frame->set_label (_("Switches"));
+	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);
 
 	// Add special controls to UI, and build list of normal controls to be layed out later
 	std::vector<ControlUI *> cui_controls_list;
-	for (i = 0; i < control_uis.size(); ++i) {
+	for (size_t i = 0; i < control_uis.size(); ++i) {
 		ControlUI* cui = control_uis[i];
 
-		if (cui->controller || cui->clickbox || cui->combo) {
-			// Get all of the controls into a list, so that
-			// we can lay them out a bit more nicely later.
-			cui_controls_list.push_back(cui);
-		} else if (cui->button || cui->file_button) {
+		if (cui->button || cui->file_button) {
 
 			if (!is_scrollable && button_row == button_rows) {
 				button_row = 0;
 				if (++button_col == button_cols) {
 					button_cols += 2;
-					button_table.resize (button_rows, button_cols);
+					button_table->resize (button_rows, button_cols);
 				}
 			}
 
-			button_table.attach (*cui, button_col, button_col + 1, button_row, button_row+1,
+			button_table->attach (*cui, button_col, button_col + 1, button_row, button_row+1,
 			                     FILL|EXPAND, FILL);
 			button_row++;
 
+		} else if (cui->controller || cui->clickbox || cui->combo) {
+			// Get all of the controls into a list, so that
+			// we can lay them out a bit more nicely later.
+			cui_controls_list.push_back(cui);
+
 		} else if (cui->display) {
 
-			output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1,
+			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);
+				output_table->resize (output_rows, output_cols);
 			}
 		}
 	}
 
 	// Iterate over the list of controls to find which adjacent controls
 	// are similar enough to be grouped together.
-	
+
 	string label, previous_label = "";
 	std::vector<int> numbers_in_labels(cui_controls_list.size());
-	
+
 	std::vector<float> similarity_scores(cui_controls_list.size());
 	float most_similar = 0.0, least_similar = 1.0;
-	
-	i = 0;
+
+	size_t i = 0;
 	for (vector<ControlUI*>::iterator cuip = cui_controls_list.begin(); cuip != cui_controls_list.end(); ++cuip, ++i) {
 		label = (*cuip)->label.get_text();
 		numbers_in_labels[i] = get_number(label);
@@ -387,12 +533,12 @@ GenericPluginUI::build ()
 		if (i > 0) {
 			// A hand-wavy calculation of how similar this control's
 			// label is to the previous.
-			similarity_scores[i] = 
-				(float) ( 
-					( matching_chars_at_head(label, previous_label) + 
+			similarity_scores[i] =
+				(float) (
+					( matching_chars_at_head(label, previous_label) +
 					  matching_chars_at_tail(label, previous_label) +
-					  1 
-					) 
+					  1
+					)
 				) / (label.length() + previous_label.length());
 			if (numbers_in_labels[i] >= 0) {
 				similarity_scores[i] += (numbers_in_labels[i] == numbers_in_labels[i-1]);
@@ -404,32 +550,32 @@ GenericPluginUI::build ()
 		}
 
 		// cerr << "label: " << label << " sim: " << fixed << setprecision(3) << similarity_scores[i] << " num: " << numbers_in_labels[i] << endl;
-		previous_label = label;		                       
+		previous_label = label;
 	}
 
-	
+
 	// cerr << "most similar: " << most_similar << ", least similar: " << least_similar << endl;
 	float similarity_threshold;
-	
+
 	if (most_similar > 1.0) {
 		similarity_threshold = default_similarity_threshold;
 	} else {
 		similarity_threshold = most_similar - (1 - default_similarity_threshold);
 	}
-	
+
 	// Now iterate over the list of controls to display them, placing an
-	// HSeparator between controls of less than a certain similarity, and 
+	// HSeparator between controls of less than a certain similarity, and
 	// starting a new column when necessary.
-	
+
 	i = 0;
 	for (vector<ControlUI*>::iterator cuip = cui_controls_list.begin(); cuip != cui_controls_list.end(); ++cuip, ++i) {
 
 		ControlUI* cui = *cuip;
-		
+
 		if (!is_scrollable) {
 			x++;
 		}
-		
+
 		if (x > max_controls_per_column || similarity_scores[i] <= similarity_threshold) {
 			if (x > min_controls_per_column) {
 				frame = manage (new Frame);
@@ -459,44 +605,210 @@ GenericPluginUI::build ()
 		hpacker.remove (*frame);
 	}
 
-	if (button_table.children().empty()) {
+	if (button_table->children().empty()) {
 		hpacker.remove (*bt_frame);
+		delete button_table;
+	} else {
+		button_table->show_all ();
 	}
 
-	if (!output_table.children().empty()) {
+	if (!output_table->children().empty()) {
 		frame = manage (new Frame);
 		frame->set_name ("BaseFrame");
 		frame->set_label(_("Meters"));
-		frame->add (output_table);
+		frame->add (*output_table);
 		hpacker.pack_end (*frame, true, true);
+		output_table->show_all ();
+	} else {
+		delete output_table;
 	}
 
-	output_update ();
+	if (plugin->has_inline_display () && plugin->inline_display_in_gui ()) {
+		PluginDisplay* pd = manage (new PluginDisplay (plugin, 300));
+		hpacker.pack_end (*pd, true, true);
+	}
+	show_all();
+
+}
+
+void
+GenericPluginUI::custom_layout (const std::vector<ControlUI*>& control_uis)
+{
+	Gtk::Table* layout = manage (new Gtk::Table ());
+
+	for (vector<ControlUI*>::const_iterator i = control_uis.begin(); i != control_uis.end(); ++i) {
+		ControlUI* cui = *i;
+		if (cui->x0 < 0 || cui->y0 < 0) {
+			continue;
+		}
+		layout->attach (*cui, cui->x0, cui->x1, cui->y0, cui->y1, FILL, SHRINK, 2, 2);
+	}
+	hpacker.pack_start (*layout, true, true);
 
-	output_table.show_all ();
-	button_table.show_all ();
+	if (plugin->has_inline_display () && plugin->inline_display_in_gui ()) {
+		PluginDisplay* pd = manage (new PluginDisplay (plugin, 300));
+		hpacker.pack_end (*pd, true, true);
+	}
+}
+
+void
+GenericPluginUI::build_midi_table ()
+{
+	Gtk::Table* pgm_table = manage (new Gtk::Table (8, 2));
+
+	pgm_table->set_homogeneous (true);
+	pgm_table->set_row_spacings (2);
+	pgm_table->set_col_spacings (2);
+	pgm_table->set_border_width (5);
+
+	Frame* frame = manage (new Frame);
+	frame->set_name ("BaseFrame");
+	frame->set_label (_("MIDI Progams (sent to track)"));
+	//frame->set_label (_("MIDI Progams (volatile)"));
+	frame->add (*pgm_table);
+	hpacker.pack_start (*frame, true, true);
+
+	for (uint8_t chn = 0; chn < 16; ++chn) {
+		int col = chn / 8;
+		int row = chn % 8;
+		ArdourDropdown* cui = manage (new ArdourWidgets::ArdourDropdown ());
+		// TODO set size_request
+		cui->set_text_ellipsize (Pango::ELLIPSIZE_END);
+		cui->set_layout_ellipsize_width (PANGO_SCALE * 112 * UIConfiguration::instance ().get_ui_scale ());
+		midi_pgmsel.push_back (cui);
+		pgm_table->attach (*cui, col, col + 1, row, row+1, FILL|EXPAND, FILL);
+	}
+
+	midi_refill_patches ();
+
+	insert->plugin()->BankPatchChange.connect (
+			midi_connections, invalidator (*this),
+			boost::bind (&GenericPluginUI::midi_bank_patch_change, this, _1),
+			gui_context());
+
+	/* Note: possible race with MidiTimeAxisView::update_patch_selector()
+	 * which uses this signal to update/re-register the midnam (also in gui context).
+	 * MTAV does register before us, so the midnam should already be updated when
+	 * we're notified.
+	 */
+	insert->plugin()->UpdateMidnam.connect (
+			midi_connections, invalidator (*this),
+			boost::bind (&GenericPluginUI::midi_refill_patches, this),
+			gui_context());
+}
+
+void
+GenericPluginUI::midi_refill_patches ()
+{
+	assert (midi_pgmsel.size() == 16);
+
+	pgm_names.clear ();
+
+	const std::string model = insert->plugin ()->midnam_model ();
+	std::string mode;
+	const std::list<std::string> device_modes = MIDI::Name::MidiPatchManager::instance().custom_device_mode_names_by_model (model);
+	if (device_modes.size() > 0) {
+		mode = device_modes.front();
+	}
+
+	for (uint8_t chn = 0; chn < 16; ++chn) {
+		midi_pgmsel[chn]->clear_items ();
+		boost::shared_ptr<MIDI::Name::ChannelNameSet> cns =
+			MIDI::Name::MidiPatchManager::instance().find_channel_name_set (model, mode, chn);
+
+		if (cns) {
+			using namespace Menu_Helpers;
+			using namespace Gtkmm2ext;
+
+			for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = cns->patch_banks().begin(); i != cns->patch_banks().end(); ++i) {
+				const MIDI::Name::PatchNameList& patches = (*i)->patch_name_list ();
+				for (MIDI::Name::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
+					const std::string pgm = (*j)->name ();
+					MIDI::Name::PatchPrimaryKey const& key = (*j)->patch_primary_key ();
+					assert ((*i)->number () == key.bank());
+					const uint32_t bp = (key.bank() << 7) | key.program();
+					midi_pgmsel[chn]->AddMenuElem (MenuElemNoMnemonic (pgm, sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::midi_bank_patch_select), chn, bp)));
+					pgm_names[bp] = pgm;
+				}
+			}
+		}
+
+		midi_bank_patch_change (chn);
+	}
+}
+
+void
+GenericPluginUI::midi_bank_patch_change (uint8_t chn)
+{
+	assert (chn < 16 && midi_pgmsel.size() == 16);
+	uint32_t bankpgm = insert->plugin()->bank_patch (chn);
+	if (bankpgm == UINT32_MAX) {
+		midi_pgmsel[chn]->set_text (_("--Unset--"));
+	} else {
+		int bank = bankpgm >> 7;
+		int pgm = bankpgm & 127;
+		if (pgm_names.find (bankpgm) != pgm_names.end ()) {
+			midi_pgmsel[chn]->set_text (pgm_names[bankpgm]);
+		} else {
+			midi_pgmsel[chn]->set_text (string_compose ("Bank %1,%2 Pgm %3",
+						(bank >> 7) + 1, (bank & 127) + 1, pgm +1));
+		}
+	}
+}
+
+void
+GenericPluginUI::midi_bank_patch_select (uint8_t chn, uint32_t bankpgm)
+{
+	int bank = bankpgm >> 7;
+	int pgm = bankpgm & 127;
+	if (1) {
+		/* send to track */
+		MidiTrack* mt = dynamic_cast<MidiTrack*> (insert->owner());
+		if (!mt) {
+			return;
+		}
+
+		boost::shared_ptr<AutomationControl> bank_msb = mt->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true);
+		boost::shared_ptr<AutomationControl> bank_lsb = mt->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true);
+		boost::shared_ptr<AutomationControl> program = mt->automation_control(Evoral::Parameter (MidiPgmChangeAutomation, chn), true);
+
+		bank_msb->set_value (bank >> 7, PBD::Controllable::NoGroup);
+		bank_lsb->set_value (bank & 127, PBD::Controllable::NoGroup);
+		program->set_value (pgm, PBD::Controllable::NoGroup);
+
+	} else {
+#if 0 // TODO inject directly to plugin..
+		const int cnt = insert->get_count();
+		for (int i=0; i < cnt; i++ ) {
+			boost::shared_ptr<LV2Plugin> lv2i = boost::dynamic_pointer_cast<LV2Plugin> (insert->plugin(i));
+			//lv2i->write_from_ui(port_index, format, buffer_size, (const uint8_t*)buffer);
+
+		}
+#endif
+	}
 }
 
 GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p)
 	: param(p)
 	, automate_button (X_("")) // force creation of a label
-	, file_button(NULL)
+	, combo (0)
+	, clickbox (0)
+	, file_button (0)
+	, spin_box (0)
+	, display (0)
+	, hbox (0)
+	, vbox (0)
+	, meterinfo (0)
+	, knobtable (0)
 {
-	automate_button.set_name ("PluginAutomateButton");
-	ARDOUR_UI::instance()->set_tip (automate_button, _("Automation control"));
-
-	/* XXX translators: use a string here that will be at least as long
-	   as the longest automation label (see ::automation_state_changed()
-	   below). be sure to include a descender.
-	*/
+	automate_button.set_name ("plugin automation state button");
+	set_tooltip (automate_button, _("Automation control"));
 
-	set_size_request_to_display_given_text (automate_button, _("Mgnual"), 15, 10);
+	ignore_change = false;
+	update_pending = false;
+	button = false;
 
-	ignore_change = 0;
-	display = 0;
-	button = 0;
-	clickbox = 0;
-	meterinfo = 0;
+	x0 = x1 = y0 = y1 = -1;
 }
 
 GenericPluginUI::ControlUI::~ControlUI()
@@ -507,6 +819,21 @@ GenericPluginUI::ControlUI::~ControlUI()
 	}
 }
 
+void
+GenericPluginUI::set_short_autostate (ControlUI* cui, bool value)
+{
+	cui->short_autostate = value;
+	if (value) {
+		cui->automate_button.set_sizing_text("M");
+	} else {
+		/* XXX translators: use a string here that will be at least as long
+		   as the longest automation label (see ::automation_state_changed()
+		   below). be sure to include a descender. */
+		cui->automate_button.set_sizing_text(_("Mgnual"));
+	}
+	automation_state_changed(cui);
+}
+
 void
 GenericPluginUI::automation_state_changed (ControlUI* cui)
 {
@@ -514,21 +841,32 @@ GenericPluginUI::automation_state_changed (ControlUI* cui)
 
 	// don't lock to avoid deadlock because we're triggered by
 	// AutomationControl::Changed() while the automation lock is taken
-	switch (insert->get_parameter_automation_state (cui->parameter()) & (ARDOUR::Off|Play|Touch|Write)) {
+
+	AutoState state = insert->get_parameter_automation_state (cui->parameter());
+
+	cui->automate_button.set_active((state != ARDOUR::Off));
+
+	if (cui->short_autostate) {
+		cui->automate_button.set_text (
+				GainMeterBase::astate_string (state));
+		return;
+	}
+
+	switch (state & (ARDOUR::Off|Play|Touch|Write)) {
 	case ARDOUR::Off:
-		cui->automate_button.set_label (S_("Automation|Manual"));
+		cui->automate_button.set_text (S_("Automation|Manual"));
 		break;
 	case Play:
-		cui->automate_button.set_label (_("Play"));
+		cui->automate_button.set_text (_("Play"));
 		break;
 	case Write:
-		cui->automate_button.set_label (_("Write"));
+		cui->automate_button.set_text (_("Write"));
 		break;
 	case Touch:
-		cui->automate_button.set_label (_("Touch"));
+		cui->automate_button.set_text (_("Touch"));
 		break;
 	default:
-		cui->automate_button.set_label (_("???"));
+		cui->automate_button.set_text (_("???"));
 		break;
 	}
 }
@@ -567,24 +905,58 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                                    const ParameterDescriptor&           desc,
                                    boost::shared_ptr<AutomationControl> mcontrol,
                                    float                                value,
-                                   bool                                 is_input)
+                                   bool                                 is_input,
+                                   bool                                 use_knob)
 {
 	ControlUI* control_ui = 0;
 
 	control_ui = manage (new ControlUI (param));
 	control_ui->combo = 0;
 	control_ui->control = mcontrol;
-	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);
-
-	Gtk::Requisition req (control_ui->automate_button.size_request());
+	set_short_autostate(control_ui, false);
 
 	if (is_input) {
 
+		if (desc.datatype == Variant::PATH) {
+
+			/* We shouldn't get that type for input ports */
+			assert(param.type() == PluginPropertyAutomation);
+
+			/* Build a file selector button */
+
+			// Create/add controller
+			control_ui->file_button = manage(new Gtk::FileChooserButton(Gtk::FILE_CHOOSER_ACTION_OPEN));
+			control_ui->file_button->set_title(desc.label);
+
+			if (use_knob) {
+				control_ui->knobtable = manage (new Table());
+				control_ui->pack_start(*control_ui->knobtable, true, false);
+				control_ui->knobtable->attach (control_ui->label, 0, 1, 0, 1);
+				control_ui->knobtable->attach (*control_ui->file_button, 0, 1, 1, 2);
+			} else {
+				control_ui->pack_start (control_ui->label, false, true);
+				control_ui->pack_start (*control_ui->file_button, true, true);
+			}
+
+			// Monitor changes from the user.
+			control_ui->file_button->signal_file_set().connect(
+				sigc::bind(sigc::mem_fun(*this, &GenericPluginUI::set_path_property),
+				           desc, control_ui->file_button));
+
+			/* Add the filebutton control to a map so that we can update it when
+			 * the corresponding property changes. This doesn't go through the usual
+			 * AutomationControls, because they don't support non-numeric values. */
+			_filepath_controls.insert(std::make_pair(desc.key, control_ui->file_button));
+
+			return control_ui;
+		}
+
+		assert(mcontrol);
+
 		/* See if there any named values for our input value */
 		control_ui->scale_points = desc.scale_points;
 
@@ -594,146 +966,158 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
 		int const steps = desc.integer_step ? (desc.upper - desc.lower + 1) / desc.step : 0;
 
 		if (control_ui->scale_points && ((steps && int (control_ui->scale_points->size()) == steps) || desc.enumeration)) {
-			
+
 			/* Either:
 			 *   a) There is a label for each possible value of this input, or
 			 *   b) This port is marked as being an enumeration.
 			 */
 
-			std::vector<std::string> labels;
-			for (
-				ARDOUR::ScalePoints::const_iterator i = control_ui->scale_points->begin();
-				i != control_ui->scale_points->end();
-				++i) {
-				
-				labels.push_back(i->first);
+			control_ui->combo = new ArdourDropdown();
+			for (ARDOUR::ScalePoints::const_iterator i = control_ui->scale_points->begin();
+			     i != control_ui->scale_points->end();
+			     ++i) {
+				control_ui->combo->AddMenuElem(Menu_Helpers::MenuElem(
+						i->first,
+						sigc::bind(sigc::mem_fun(*this, &GenericPluginUI::control_combo_changed),
+						           control_ui,
+						           i->second)));
 			}
 
-			control_ui->combo = new Gtk::ComboBoxText();
-			set_popdown_strings(*control_ui->combo, labels);
-			control_ui->combo->signal_changed().connect(
-				sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::control_combo_changed),
-				            control_ui));
-			mcontrol->Changed.connect(control_connections, invalidator(*this),
-			                          boost::bind(&GenericPluginUI::ui_parameter_changed,
-			                                      this, control_ui),
-			                          gui_context());
-			control_ui->pack_start(control_ui->label, true, true);
-			control_ui->pack_start(*control_ui->combo, false, true);
+			control_ui->combo->set_controllable (mcontrol);
 
 			update_control_display(control_ui);
 
-			return control_ui;
-		}
+		} else {
 
-		if (desc.toggled) {
+			/* create the controller */
 
-			/* Build a button */
+			/* XXX memory leak: SliderController not destroyed by ControlUI
+			 * destructor, and manage() reports object hierarchy
+			 * ambiguity.
+			 */
+			control_ui->controller = AutomationController::create(mcontrol->parameter(), desc, mcontrol, use_knob);
 
-			control_ui->button = manage (new ToggleButton ());
-			control_ui->button->set_name ("PluginEditorButton");
-			control_ui->button->set_size_request (20, 20);
+			/* Control UI's don't need the rapid timer workaround */
+			control_ui->controller->stop_updating ();
 
-			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);
+			/* XXX this code is not right yet, because it doesn't handle
+			   the absence of bounds in any sensible fashion.
+			*/
 
-			control_ui->button->signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui));
-			control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui));
+			Adjustment* adj = control_ui->controller->adjustment();
 
-			mcontrol->Changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::toggle_parameter_changed, this, control_ui), gui_context());
-			mcontrol->alist()->automation_state_changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui), gui_context());
+			if (desc.integer_step && !desc.toggled) {
+				control_ui->clickbox = new ArdourWidgets::ClickBox (adj, "PluginUIClickBox", true);
+				Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2);
+				if (desc.unit == ParameterDescriptor::MIDI_NOTE) {
+					control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::midinote_printer), control_ui));
+				} else {
+					control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::integer_printer), control_ui));
+				}
+				control_ui->clickbox->set_controllable (mcontrol);
+			} else if (desc.toggled) {
+				ArdourButton* but = dynamic_cast<ArdourButton*> (control_ui->controller->widget());
+				assert(but);
+				but->set_tweaks(ArdourButton::Square);
+			} else if (use_knob) {
+				/* Delay size request so that styles are gotten right */
+				control_ui->controller->widget()->signal_size_request().connect(
+						sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::knob_size_request), control_ui));
+			} else {
+				control_ui->controller->set_size_request (200, -1);
+				control_ui->controller->set_name (X_("ProcessorControlSlider"));
+			}
 
-			if (value > 0.5){
-				control_ui->button->set_active(true);
+			if (!desc.integer_step && !desc.toggled && use_knob) {
+				control_ui->spin_box = manage (new ArdourSpinner (mcontrol, adj));
 			}
 
-			automation_state_changed (control_ui);
+			adj->set_value (mcontrol->internal_to_interface(value));
 
-			return control_ui;
 		}
 
-		if (desc.datatype == Variant::PATH) {
-
-			/* Build a file selector button */
+		if (use_knob) {
+			set_short_autostate(control_ui, true);
+
+			control_ui->label.set_alignment (0.5, 0.5);
+			control_ui->knobtable = manage (new Table());
+			control_ui->pack_start(*control_ui->knobtable, true, true);
+
+			if (control_ui->combo) {
+				control_ui->knobtable->attach (control_ui->label, 0, 1, 0, 1);
+				control_ui->knobtable->attach (*control_ui->combo, 0, 1, 1, 2);
+			} else if (control_ui->clickbox) {
+				control_ui->knobtable->attach (*control_ui->clickbox, 0, 2, 0, 1);
+				control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK);
+				control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0);
+			} else if (control_ui->spin_box) {
+				ArdourKnob* knob = dynamic_cast<ArdourKnob*>(control_ui->controller->widget ());
+				knob->set_tooltip_prefix (desc.label + ": ");
+				Alignment *align = manage (new Alignment (.5, .5, 0, 0));
+				align->add (*control_ui->controller);
+				control_ui->knobtable->attach (*align, 0, 1, 0, 1, EXPAND, SHRINK, 1, 2);
+				control_ui->knobtable->attach (*control_ui->spin_box, 0, 2, 1, 2);
+				control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 0, 1, SHRINK, SHRINK, 2, 0);
+			} else if (desc.toggled) {
+				Alignment *align = manage (new Alignment (.5, .5, 0, 0));
+				align->add (*control_ui->controller);
+				control_ui->knobtable->attach (*align, 0, 2, 0, 1, EXPAND, SHRINK, 2, 2);
+				control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK);
+				control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0);
+			} else {
+				control_ui->knobtable->attach (*control_ui->controller, 0, 2, 0, 1);
+				control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK);
+				control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0);
+			}
 
-			// Create/add controller
-			control_ui->file_button = manage(new Gtk::FileChooserButton(Gtk::FILE_CHOOSER_ACTION_OPEN));
-			control_ui->file_button->set_title(desc.label);
+		} else {
 
 			control_ui->pack_start (control_ui->label, true, true);
-			control_ui->pack_start (*control_ui->file_button, true, true);
-
-			// Connect signals (TODO: do this via the Control)
-			control_ui->file_button->signal_file_set().connect(
-				sigc::bind(sigc::mem_fun(*this, &GenericPluginUI::set_property),
-				           desc, control_ui->file_button));
-			plugin->PropertyChanged.connect(*this, invalidator(*this),
-			                                boost::bind(&GenericPluginUI::property_changed, this, _1, _2),
-			                                gui_context());
-
-			_property_controls.insert(std::make_pair(desc.key, control_ui->file_button));
-			control_ui->file_button = control_ui->file_button;
-
-			return control_ui;
-		}
-
-		/* create the controller */
-
-		if (mcontrol) {
-			control_ui->controller = AutomationController::create(insert, mcontrol->parameter(), desc, mcontrol);
-		}
-
-		/* XXX this code is not right yet, because it doesn't handle
-		   the absence of bounds in any sensible fashion.
-		*/
-
-		Adjustment* adj = control_ui->controller->adjustment();
-
-		if (desc.integer_step) {
-			control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox", desc.enumeration);
-			Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2);
-			if (desc.unit == ParameterDescriptor::MIDI_NOTE) {
-				control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::midinote_printer), control_ui));
+			if (control_ui->combo) {
+				control_ui->pack_start(*control_ui->combo, false, true);
+			} else if (control_ui->clickbox) {
+				control_ui->pack_start (*control_ui->clickbox, false, false);
+			} else if (control_ui->spin_box) {
+				control_ui->pack_start (*control_ui->spin_box, false, false);
+				control_ui->pack_start (*control_ui->controller, false, false);
 			} else {
-				control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::integer_printer), control_ui));
+				control_ui->pack_start (*control_ui->controller, false, false);
 			}
-		} else {
-			//sigc::slot<void,char*,uint32_t> pslot = sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::print_parameter), (uint32_t) port_index);
-
-			control_ui->controller->set_size_request (200, req.height);
-			control_ui->controller->set_name (X_("ProcessorControlSlider"));
-
-			control_ui->controller->StartGesture.connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::start_touch), control_ui));
-			control_ui->controller->StopGesture.connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::stop_touch), control_ui));
-
+			control_ui->pack_start (control_ui->automate_button, false, false);
 		}
 
-		adj->set_value (mcontrol->internal_to_interface(value));
 
-		/* 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);
+		if (mcontrol->flags () & Controllable::NotAutomatable) {
+			control_ui->automate_button.set_sensitive (false);
+			set_tooltip(control_ui->automate_button, _("This control cannot be automated"));
 		} else {
-			control_ui->pack_start (*control_ui->controller, false, false);
+			control_ui->automate_button.signal_button_press_event().connect (
+					sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::astate_button_event),
+					            control_ui),
+					false);
+			mcontrol->alist()->automation_state_changed.connect (
+					control_connections,
+					invalidator (*this),
+					boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui),
+					gui_context());
+			input_controls_with_automation.push_back (control_ui);
 		}
 
-		control_ui->pack_start (control_ui->automate_button, false, false);
-		control_ui->automate_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui));
+		if (desc.toggled && !control_ui->combo) {
+			control_ui->button = true;
+			ArdourButton* but = dynamic_cast<ArdourButton*>(control_ui->controller->widget ());
+			assert (but);
+			but->set_name ("pluginui toggle");
+			update_control_display(control_ui);
+		}
 
 		automation_state_changed (control_ui);
 
-		mcontrol->Changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::ui_parameter_changed, this, control_ui), gui_context());
-		mcontrol->alist()->automation_state_changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui), gui_context());
-
+		/* Add to the list of CUIs that need manual update to workaround
+		 * AutomationControl not knowing about preset loads */
 		input_controls.push_back (control_ui);
 
-	} else if (!is_input) {
+	} else {
 
 		control_ui->display = manage (new EventBox);
 		control_ui->display->set_name ("ParameterValueDisplay");
@@ -747,79 +1131,88 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
 
 		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();
- 		control_ui->meterinfo = info;
-
-		info->meter = new FastMeter (
-				5, 5, FastMeter::Vertical, 0,
-				0x0000aaff,
-				0x008800ff, 0x008800ff,
-				0x00ff00ff, 0x00ff00ff,
-				0xcccc00ff, 0xcccc00ff,
-				0xffaa00ff, 0xffaa00ff,
-				0xff0000ff,
-				ARDOUR_UI::config()->get_MeterBackgroundBot(),
-				ARDOUR_UI::config()->get_MeterBackgroundTop()
-				);
-
-		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->hbox->set_spacing(1);
 		control_ui->vbox->set_spacing(3);
 
-		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);
+		if (desc.unit == ParameterDescriptor::MIDI_NOTE) {
+			control_ui->vbox->pack_end (*control_ui->display, false, false);
+			control_ui->vbox->pack_end (control_ui->label, false, false);
+		} else if (desc.integer_step || desc.enumeration) {
+			control_ui->vbox->pack_end (*control_ui->display, false, false);
+			control_ui->vbox->pack_end (control_ui->label, false, false);
+		} else {
+			/* set up a meter for float ports */
+
+			MeterInfo * info = new MeterInfo();
+			control_ui->meterinfo = info;
+
+			info->meter = new FastMeter (
+					5, 5, FastMeter::Vertical, 0,
+					0x0000aaff,
+					0x008800ff, 0x008800ff,
+					0x00ff00ff, 0x00ff00ff,
+					0xcccc00ff, 0xcccc00ff,
+					0xffaa00ff, 0xffaa00ff,
+					0xff0000ff,
+					UIConfiguration::instance().color ("meter background bottom"),
+					UIConfiguration::instance().color ("meter background top")
+					);
+
+			control_ui->label.set_angle(90);
+
+			HBox* center =  manage (new HBox);
+			center->set_spacing(1);
+			center->pack_start (control_ui->label, false, false);
+			center->pack_start (*info->meter, false, false);
+
+			control_ui->hbox = manage (new HBox);
+			control_ui->hbox->pack_start (*center, true, false);
+
+			// horizontally center this hbox in the vbox
+			control_ui->vbox->pack_start (*control_ui->hbox, false, false);
+
+			control_ui->meterinfo->meter->show_all();
+			control_ui->meterinfo->packed = true;
+			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);
 	}
 
 	if (mcontrol) {
-		mcontrol->Changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::ui_parameter_changed, this, control_ui), gui_context());
+		mcontrol->Changed.connect(control_connections, invalidator(*this),
+		                          boost::bind(&GenericPluginUI::ui_parameter_changed,
+		                                      this, control_ui),
+		                          gui_context());
 	}
 
 	return control_ui;
 }
 
 void
-GenericPluginUI::start_touch (GenericPluginUI::ControlUI* cui)
-{
-	cui->control->start_touch (cui->control->session().transport_frame());
+GenericPluginUI::knob_size_request(Gtk::Requisition* req, ControlUI* cui) {
+	Gtk::Requisition astate_req (cui->automate_button.size_request());
+	const int size = (int) (astate_req.height * 1.5);
+	req->width = max(req->width, size);
+	req->height = max(req->height, size);
 }
 
-void
-GenericPluginUI::stop_touch (GenericPluginUI::ControlUI* cui)
-{
-	cui->control->stop_touch (false, cui->control->session().transport_frame());
-}
 
-void
-GenericPluginUI::astate_clicked (ControlUI* cui)
+bool
+GenericPluginUI::astate_button_event (GdkEventButton* ev, ControlUI* cui)
 {
+	if (ev->button != 1) {
+		return true;
+	}
+
 	using namespace Menu_Helpers;
 
 	if (automation_menu == 0) {
 		automation_menu = manage (new Menu);
 		automation_menu->set_name ("ArdourContextMenu");
+		automation_menu->set_reserve_toggle_size(false);
 	}
 
 	MenuList& items (automation_menu->items());
@@ -834,43 +1227,18 @@ GenericPluginUI::astate_clicked (ControlUI* cui)
 	items.push_back (MenuElem (_("Touch"),
 				   sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Touch, cui)));
 
-	automation_menu->popup (1, gtk_get_current_event_time());
-}
+	anchored_menu_popup(automation_menu, &cui->automate_button, cui->automate_button.get_text(),
+	                    1, ev->time);
 
-void 
-GenericPluginUI::automation_manual_all(std::vector<ControlUI *>& controls)
-{
-    for (std::vector<ControlUI *>::iterator control_it = controls.begin(); control_it != controls.end(); ++control_it)
-    {
-        set_automation_state((AutoState) ARDOUR::Off, (*control_it));
-    }
-}
-
-void 
-GenericPluginUI::automation_play_all(std::vector<ControlUI *>& controls)
-{
-    for (std::vector<ControlUI *>::iterator control_it = controls.begin(); control_it != controls.end(); ++control_it)
-    {
-        set_automation_state((AutoState) Play, (*control_it));
-    }
-}
-
-void 
-GenericPluginUI::automation_write_all(std::vector<ControlUI *>& controls)
-{
-    for (std::vector<ControlUI *>::iterator control_it = controls.begin(); control_it != controls.end(); ++control_it)
-    {
-        set_automation_state((AutoState) Write, (*control_it));
-    }
+	return true;
 }
 
-void 
-GenericPluginUI::automation_touch_all(std::vector<ControlUI *>& controls)
+void
+GenericPluginUI::set_all_automation (AutoState as)
 {
-    for (std::vector<ControlUI *>::iterator control_it = controls.begin(); control_it != controls.end(); ++control_it)
-    {
-        set_automation_state((AutoState) Touch, (*control_it));
-    }
+	for (vector<ControlUI*>::iterator i = input_controls_with_automation.begin(); i != input_controls_with_automation.end(); ++i) {
+		set_automation_state (as, (*i));
+	}
 }
 
 void
@@ -879,22 +1247,6 @@ GenericPluginUI::set_automation_state (AutoState state, ControlUI* cui)
 	insert->set_parameter_automation_state (cui->parameter(), state);
 }
 
-void
-GenericPluginUI::toggle_parameter_changed (ControlUI* cui)
-{
-	float val = cui->control->get_value();
-
-	if (!cui->ignore_change) {
-		if (val > 0.5) {
-			cui->button->set_active (true);
-			cui->button->set_name ("PluginEditorButton-active");
-		} else {
-			cui->button->set_active (false);
-			cui->button->set_name ("PluginEditorButton");
-		}
-	}
-}
-
 void
 GenericPluginUI::ui_parameter_changed (ControlUI* cui)
 {
@@ -913,22 +1265,17 @@ GenericPluginUI::update_control_display (ControlUI* cui)
 
 	float val = cui->control->get_value();
 
-	cui->ignore_change++;
+	PBD::Unwinder<bool> (cui->ignore_change, true);
 
 	if (cui->combo && cui->scale_points) {
 		for (ARDOUR::ScalePoints::iterator it = cui->scale_points->begin(); it != cui->scale_points->end(); ++it) {
 			if (it->second == val) {
-				cui->combo->set_active_text(it->first);
+				cui->combo->set_text(it->first);
 				break;
 			}
 		}
 	} else if (cui->button) {
-
-		if (val > 0.5) {
-			cui->button->set_active (true);
-		} else {
-			cui->button->set_active (false);
-		}
+		// AutomationController handles this
 	}
 
 	if( cui->controller ) {
@@ -944,29 +1291,25 @@ GenericPluginUI::update_control_display (ControlUI* cui)
 			cui->adjustment->set_value (val);
 		}
 	}*/
-	cui->ignore_change--;
 }
 
 void
-GenericPluginUI::control_port_toggled (ControlUI* cui)
+GenericPluginUI::update_input_displays ()
 {
-	cui->ignore_change++;
-	const bool active = cui->button->get_active();
-	if (active) {
-		cui->button->set_name ("PluginEditorButton-active");
-	} else {
-		cui->button->set_name ("PluginEditorButton");
+	/* XXX This is a workaround for AutomationControl not knowing about preset loads */
+	for (vector<ControlUI*>::iterator i = input_controls.begin();
+	     i != input_controls.end();
+	     ++i) {
+		update_control_display(*i);
 	}
-	insert->automation_control (cui->parameter())->set_value (active);
-	cui->ignore_change--;
+	return;
 }
 
 void
-GenericPluginUI::control_combo_changed (ControlUI* cui)
+GenericPluginUI::control_combo_changed (ControlUI* cui, float value)
 {
-	if (!cui->ignore_change && cui->scale_points) {
-		string value = cui->combo->get_active_text();
-		insert->automation_control (cui->parameter())->set_value ((*cui->scale_points)[value]);
+	if (!cui->ignore_change) {
+		insert->automation_control (cui->parameter())->set_value (value, Controllable::NoGroup);
 	}
 }
 
@@ -975,8 +1318,7 @@ GenericPluginUI::start_updating (GdkEventAny*)
 {
 	if (output_controls.size() > 0 ) {
 		screen_update_connection.disconnect();
-		screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect
-			(sigc::mem_fun(*this, &GenericPluginUI::output_update));
+		screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &GenericPluginUI::output_update));
 	}
 	return false;
 }
@@ -984,14 +1326,9 @@ GenericPluginUI::start_updating (GdkEventAny*)
 bool
 GenericPluginUI::stop_updating (GdkEventAny*)
 {
-	for (vector<ControlUI*>::iterator i = input_controls.begin(); i != input_controls.end(); ++i) {
-		(*i)->controller->stop_updating ();
-	}
-
 	if (output_controls.size() > 0 ) {
 		screen_update_connection.disconnect();
 	}
-
 	return false;
 }
 
@@ -1001,48 +1338,93 @@ GenericPluginUI::output_update ()
 	for (vector<ControlUI*>::iterator i = output_controls.begin(); i != output_controls.end(); ++i) {
 		float val = plugin->get_parameter ((*i)->parameter().id());
 		char buf[32];
-		snprintf (buf, sizeof(buf), "%.2f", val);
+		boost::shared_ptr<ReadOnlyControl> c = insert->control_output ((*i)->parameter().id());
+		const std::string& str = ARDOUR::value_as_string(c->desc(), Variant(val));
+		size_t len = str.copy(buf, 31);
+		buf[len] = '\0';
 		(*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 );
-			}
+			(*i)->meterinfo->meter->set (c->desc().to_interface (val));
 		}
 	}
 }
 
 void
-GenericPluginUI::set_property (const ParameterDescriptor& desc,
-                               Gtk::FileChooserButton*    widget)
+GenericPluginUI::set_path_property (const ParameterDescriptor& desc,
+                                    Gtk::FileChooserButton*    widget)
 {
 	plugin->set_property(desc.key, Variant(Variant::PATH, widget->get_filename()));
 }
 
 void
-GenericPluginUI::property_changed (uint32_t key, const Variant& value)
+GenericPluginUI::path_property_changed (uint32_t key, const Variant& value)
 {
-	PropertyControls::iterator c = _property_controls.find(key);
-	if (c != _property_controls.end()) {
+	FilePathControls::iterator c = _filepath_controls.find(key);
+	if (c != _filepath_controls.end()) {
 		c->second->set_filename(value.get_path());
 	} else {
 		std::cerr << "warning: property change for property with no control" << std::endl;
 	}
 }
+
+void
+GenericPluginUI::toggle_pianokeyboard ()
+{
+	if (_plugin_pianokeyboard_expander.get_expanded()) {
+		_plugin_pianokeyboard_expander.add (_pianobox);
+		_pianobox.show_all ();
+	} else {
+		const int child_height = _plugin_pianokeyboard_expander.get_child ()->get_height ();
+		_plugin_pianokeyboard_expander.get_child ()->hide ();
+		_plugin_pianokeyboard_expander.remove ();
+
+		Gtk::Window *toplevel = (Gtk::Window*) _plugin_pianokeyboard_expander.get_ancestor (GTK_TYPE_WINDOW);
+		if (toplevel) {
+			Gtk::Requisition wr;
+			toplevel->get_size (wr.width, wr.height);
+			wr.height -= child_height;
+			toplevel->resize (wr.width, wr.height);
+		}
+	}
+}
+
+void
+GenericPluginUI::_note_on_event_handler(GtkWidget*, int note, gpointer arg)
+{
+	((GenericPluginUI*)arg)->note_on_event_handler(note);
+}
+
+void
+GenericPluginUI::_note_off_event_handler(GtkWidget*, int note, gpointer arg)
+{
+	((GenericPluginUI*)arg)->note_off_event_handler(note);
+}
+
+void
+GenericPluginUI::note_on_event_handler (int note)
+{
+	// TODO add option to send to synth directly (bypass track)
+	MidiTrack* mt = dynamic_cast<MidiTrack*> (insert->owner());
+	if (!mt) { return; }
+	_pianomm->grab_focus ();
+	uint8_t channel = _piano_channel.get_value_as_int () - 1;
+	uint8_t event[3];
+	event[0] = (MIDI_CMD_NOTE_ON | channel);
+	event[1] = note;
+	event[2] = _piano_velocity.get_value_as_int ();
+	mt->write_immediate_event (3, event);
+}
+
+void
+GenericPluginUI::note_off_event_handler (int note)
+{
+	MidiTrack* mt = dynamic_cast<MidiTrack*> (insert->owner());
+	if (!mt) { return; }
+	uint8_t channel = _piano_channel.get_value_as_int () - 1;
+	uint8_t event[3];
+	event[0] = (MIDI_CMD_NOTE_OFF | channel);
+	event[1] = note;
+	event[2] = 0;
+	mt->write_immediate_event (3, event);
+}