X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=ff3fd54624da77830c388fb8872bb107c37d8d92;hb=d4af4d99e946d094e45c0463f7ba159802640478;hp=dc788dd35e50a1f9ca6265ff844d9187c0a3a82d;hpb=1539ac1b9661f0c0bb313d8f0d9a72b6dc95aaf1;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index dc788dd35e..ff3fd54624 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -17,6 +17,7 @@
 */
 
 #include <cmath>
+#include <list>
 #include <algorithm>
 
 #include <sigc++/bind.h>
@@ -24,6 +25,7 @@
 #include "pbd/convert.h"
 #include "pbd/enumwriter.h"
 #include "pbd/replace_all.h"
+#include "pbd/stacktrace.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
@@ -32,28 +34,28 @@
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/bindable_button.h>
 
-#include "ardour/ardour.h"
-#include "ardour/amp.h"
-#include "ardour/session.h"
+#include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/internal_send.h"
+#include "ardour/midi_track.h"
+#include "ardour/pannable.h"
+#include "ardour/panner.h"
+#include "ardour/panner_shell.h"
+#include "ardour/port.h"
+#include "ardour/profile.h"
 #include "ardour/route.h"
 #include "ardour/route_group.h"
-#include "ardour/audio_track.h"
-#include "ardour/panner.h"
 #include "ardour/send.h"
-#include "ardour/processor.h"
-#include "ardour/profile.h"
-#include "ardour/ladspa_plugin.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
 #include "ardour/user_bundle.h"
-#include "ardour/port.h"
 
 #include "ardour_ui.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
 #include "keyboard.h"
-#include "led.h"
+#include "ardour_button.h"
 #include "public_editor.h"
 #include "send_ui.h"
 #include "io_selector.h"
@@ -69,8 +71,6 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
 
-sigc::signal<void,boost::shared_ptr<Route> > MixerStrip::SwitchIO;
-
 int MixerStrip::scrollbar_height = 0;
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
@@ -82,13 +82,16 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 	, processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer)
 	, gpm (sess, 250)
 	, panners (sess)
-	, _mono_button (_("Mono"))
-	, button_table (4, 2)
-	, solo_led_table (2, 2)
+	, button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
+	, button_table (3, 1)
+	, rec_solo_table (2, 2)
+	, top_button_table (1, 2)
 	, middle_button_table (1, 2)
 	, bottom_button_table (1, 2)
-	, meter_point_label (_("pre"))
-	, comment_button (_("Comments"))
+	, meter_point_button (_("pre"))
+	, midi_input_enable_button (0)
+	, _comment_button (_("Comments"))
+	, _visibility (X_("mixer-strip-visibility"))
 {
 	init ();
 
@@ -106,15 +109,17 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
 	, RouteUI (sess)
 	, _mixer(mx)
 	, _mixer_owned (in_mixer)
-	, processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
+	, processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer)
 	, gpm (sess, 250)
 	, panners (sess)
-	, _mono_button (_("Mono"))
-	, button_table (3, 2)
+	, button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
+	, button_table (3, 1)
 	, middle_button_table (1, 2)
 	, bottom_button_table (1, 2)
-	, meter_point_label (_("pre"))
-	, comment_button (_("Comments"))
+	, meter_point_button (_("pre"))
+	, midi_input_enable_button (0)
+	, _comment_button (_("Comments"))
+	, _visibility (X_("mixer-strip-visibility"))
 {
 	init ();
 	set_route (rt);
@@ -126,7 +131,6 @@ MixerStrip::init ()
 	input_selector = 0;
 	output_selector = 0;
 	group_menu = 0;
-	_marked_for_display = false;
 	route_ops_menu = 0;
 	ignore_comment_edit = false;
 	ignore_toggle = false;
@@ -138,37 +142,27 @@ MixerStrip::init ()
 	/* the length of this string determines the width of the mixer strip when it is set to `wide' */
 	longest_label = "longest label";
 
-	Gtk::Image* img;
-
-	img = manage (new Gtk::Image (::get_icon("strip_width")));
-	img->show ();
-
-	width_button.add (*img);
-
-	img = manage (new Gtk::Image (::get_icon("hide")));
-	img->show ();
-
-	hide_button.add (*img);
+	string t = _("Click to toggle the width of this mixer strip.");
+	if (_mixer_owned) {
+		t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ());
+	}
+	
+	width_button.set_image (::get_icon("strip_width"));
+	ARDOUR_UI::instance()->set_tip (width_button, t);
 
-	input_label.set_text (_("Input"));
-	ARDOUR_UI::instance()->set_tip (&input_button, _("Button 1 to choose inputs from a port matrix, button 3 to select inputs from a menu"), "");
-	input_button.add (input_label);
-	input_button.set_name ("MixerIOButton");
-	input_label.set_name ("MixerIOButtonLabel");
+	hide_button.set_image(::get_icon("hide"));
+	ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
 
-	Gtkmm2ext::set_size_request_to_display_given_text (input_button, longest_label.c_str(), 4, 4);
+	input_button.set_text (_("Input"));
+	input_button.set_name ("mixer strip button");
+	input_button_box.pack_start (input_button, true, true);
 
-	output_label.set_text (_("Output"));
-	ARDOUR_UI::instance()->set_tip (&output_button, _("Button 1 to choose outputs from a port matrix, button 3 to select inputs from a menu"), "");
-	output_button.add (output_label);
-	output_button.set_name ("MixerIOButton");
-	output_label.set_name ("MixerIOButtonLabel");
+	output_button.set_text (_("Output"));
+	output_button.set_name ("mixer strip button");
 	Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4);
 
 	ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), "");
-	meter_point_button.add (meter_point_label);
-	meter_point_button.set_name ("MixerStripMeterPreButton");
-	meter_point_label.set_name ("MixerStripMeterPreButton");
+	meter_point_button.set_name ("mixer strip button");
 
 	/* TRANSLATORS: this string should be longest of the strings
 	   used to describe meter points. In english, it's "input".
@@ -182,109 +176,115 @@ MixerStrip::init ()
 
 	hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-	mute_button->set_name ("MixerMuteButton");
-	solo_button->set_name ("MixerSoloButton");
+	monitor_input_button->set_diameter (3);
+	monitor_disk_button->set_diameter (3);
 
-        solo_isolated_led = manage (new LED);
+        solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
         solo_isolated_led->show ();
-        solo_isolated_led->set_diameter (6);
+        solo_isolated_led->set_diameter (3);
         solo_isolated_led->set_no_show_all (true);
-        solo_isolated_led->set_name (X_("SoloIsolatedLED"));
+        solo_isolated_led->set_name (X_("solo isolate"));
         solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
         solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release));
 	UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
 
-        solo_safe_led = manage (new LED);
+        solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
         solo_safe_led->show ();
-        solo_safe_led->set_diameter (6);
+        solo_safe_led->set_diameter (3);
         solo_safe_led->set_no_show_all (true);
-        solo_safe_led->set_name (X_("SoloSafeLED"));
+        solo_safe_led->set_name (X_("solo safe"));
         solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
         solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release));
 	UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
 
-        Label* iso_label = manage (new Label (_("iso")));
-        Label* safe_label = manage (new Label (_("lock")));
-        
-        iso_label->set_name (X_("SoloLEDLabel"));
-        safe_label->set_name (X_("SoloLEDLabel"));
+	solo_safe_led->set_text (_("lock"));
+	solo_isolated_led->set_text (_("iso"));
 
-        iso_label->show ();
-        safe_label->show (); 
+	top_button_table.set_homogeneous (true);
+	top_button_table.set_spacings (2);
+	top_button_table.attach (*monitor_input_button, 0, 1, 0, 1);
+        top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1);
+	top_button_table.show ();
 
-        solo_led_table.set_spacings (0);
-        solo_led_table.set_border_width (1);
-        solo_led_table.attach (*iso_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
-        solo_led_table.attach (*solo_isolated_led, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
-        solo_led_table.attach (*safe_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
-        solo_led_table.attach (*solo_safe_led, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
+	rec_solo_table.set_homogeneous (false);
+	rec_solo_table.set_row_spacings (2);
+	rec_solo_table.set_col_spacings (2);
+        rec_solo_table.attach (*solo_isolated_led, 1, 2, 0, 1);
+        rec_solo_table.attach (*solo_safe_led, 1, 2, 1, 2);
+        rec_solo_table.show ();
 
-        solo_led_table.show ();
-        solo_led_box.pack_end (solo_led_table, false, false);
-        solo_led_box.show ();
+	button_table.set_homogeneous (false);
+	button_table.set_spacings (2);
 
-	button_table.set_homogeneous (true);
-	button_table.set_spacings (0);
+	if (solo_isolated_led) {
+		button_size_group->add_widget (*solo_isolated_led);
+	}
+	if (solo_safe_led) {
+		button_size_group->add_widget (*solo_safe_led);
+	}
+	if (rec_enable_button) {
+		button_size_group->add_widget (*rec_enable_button);
+	}
+	if (monitor_disk_button) {
+		button_size_group->add_widget (*monitor_disk_button);
+	}
+	if (monitor_input_button) {
+		button_size_group->add_widget (*monitor_input_button);
+	}
 
-	button_table.attach (name_button, 0, 2, 0, 1);
-	button_table.attach (input_button, 0, 2, 1, 2);
-	button_table.attach (_invert_button_box, 0, 2, 3, 4);
+	button_table.attach (name_button, 0, 1, 0, 1);
+	button_table.attach (input_button_box, 0, 1, 1, 2);
+	button_table.attach (_invert_button_box, 0, 1, 2, 3);
 
 	middle_button_table.set_homogeneous (true);
-	middle_button_table.set_spacings (0);
-	middle_button_table.attach (*mute_button, 0, 1, 0, 1);
-        middle_button_table.attach (*solo_button, 1, 2, 0, 1);
+	middle_button_table.set_spacings (2);
 
-	bottom_button_table.set_col_spacings (0);
+	bottom_button_table.set_spacings (2);
 	bottom_button_table.set_homogeneous (true);
 	bottom_button_table.attach (group_button, 0, 1, 0, 1);
 
-	name_button.add (name_label);
-	name_button.set_name ("MixerNameButton");
+	name_button.set_name ("mixer strip name button");
+	name_button.set_text (" "); /* non empty text, forces creation of the layout */
+	name_button.set_text (""); /* back to empty */
+	name_button.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
+	name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized));
 	Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
 
-	name_label.set_name ("MixerNameButtonLabel");
 	ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
-	group_button.add (group_label);
-	group_button.set_name ("MixerGroupButton");
-        Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
-	group_label.set_name ("MixerGroupButtonLabel");
+	group_button.set_name ("mixer strip button");
+	Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
 
-	comment_button.set_name ("MixerCommentButton");
-	comment_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::comment_button_clicked));
-
-	_mono_button.set_name ("MixerMonoButton");
-	_mono_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::mono_button_clicked));
+	_comment_button.set_name (X_("mixer strip button"));
+	_comment_button.signal_clicked.connect (sigc::mem_fun (*this, &MixerStrip::toggle_comment_editor));
 
 	global_vpacker.set_border_width (0);
 	global_vpacker.set_spacing (0);
 
-	width_button.set_name ("MixerWidthButton");
-	hide_button.set_name ("MixerHideButton");
-	top_event_box.set_name ("MixerTopEventBox");
+	width_button.set_name ("mixer strip button");
+	hide_button.set_name ("mixer strip button");
+	top_event_box.set_name ("mixer strip button");
 
-	width_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::width_clicked));
-	hide_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::hide_clicked));
+	width_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::width_button_pressed), false);
+	hide_button.signal_clicked.connect (sigc::mem_fun(*this, &MixerStrip::hide_clicked));
 
 	width_hide_box.pack_start (width_button, false, true);
 	width_hide_box.pack_start (top_event_box, true, true);
 	width_hide_box.pack_end (hide_button, false, true);
-	gain_meter_alignment.set_padding(0, 4, 0, 0);
-	gain_meter_alignment.add(gpm);
 
 	whvbox.pack_start (width_hide_box, true, true);
 
+	global_vpacker.set_spacing (2);
 	global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
-	global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (processor_box, true, true);
 	global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
-	global_vpacker.pack_start (solo_led_box,Gtk::PACK_SHRINK);
-	global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
-	global_vpacker.pack_start (gain_meter_alignment,Gtk::PACK_SHRINK);
-	global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
-	global_vpacker.pack_start (_mono_button, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (rec_solo_table, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
-	global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (_comment_button, Gtk::PACK_SHRINK);
 
 	global_frame.add (global_vpacker);
 	global_frame.set_shadow_type (Gtk::SHADOW_IN);
@@ -306,12 +306,6 @@ MixerStrip::init ()
 	input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false);
 	output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false);
 
-	/* we don't need this if its not an audio track, but we don't know that yet and it doesn't
-	   hurt (much).
-	*/
-
-	rec_enable_button->set_name ("MixerRecordEnableButton");
-
 	/* ditto for this button and busses */
 
 	name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
@@ -327,10 +321,11 @@ MixerStrip::init ()
 	   in update_diskstream_display().
 	*/
 
-	if (is_midi_track())
+	if (is_midi_track()) {
 		set_name ("MidiTrackStripBase");
-	else
+	} else {
 		set_name ("AudioTrackStripBase");
+	}
 
 	add_events (Gdk::BUTTON_RELEASE_MASK|
 		    Gdk::ENTER_NOTIFY_MASK|
@@ -340,7 +335,26 @@ MixerStrip::init ()
 
 	set_flags (get_flags() | Gtk::CAN_FOCUS);
 
-	SwitchIO.connect (sigc::mem_fun (*this, &MixerStrip::switch_io));
+	AudioEngine::instance()->PortConnectedOrDisconnected.connect (
+		*this, invalidator (*this), boost::bind (&MixerStrip::port_connected_or_disconnected, this, _1, _3), gui_context ()
+		);
+
+	/* Add the widgets under visibility control to the VisibilityGroup; the names used here
+	   must be the same as those used in RCOptionEditor so that the configuration changes
+	   are recognised when they occur.
+	*/
+	_visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert"));
+	_visibility.add (solo_safe_led, X_("SoloSafe"), _("Solo Safe"), true, boost::bind (&MixerStrip::override_solo_visibility, this));
+	_visibility.add (solo_isolated_led, X_("SoloIsolated"), _("Solo Isolated"), true, boost::bind (&MixerStrip::override_solo_visibility, this));
+	_visibility.add (&_comment_button, X_("Comments"), _("Comments"));
+	_visibility.add (&group_button, X_("Group"), _("Group"));
+	_visibility.add (&meter_point_button, X_("MeterPoint"), _("Meter Point"));
+
+	parameter_changed (X_("mixer-strip-visibility"));
+
+	Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context());
+
+	gpm.LevelMeterButtonPress.connect_same_thread (_level_meter_connection, boost::bind (&MixerStrip::level_meter_button_press, this, _1));
 }
 
 MixerStrip::~MixerStrip ()
@@ -356,17 +370,20 @@ void
 MixerStrip::set_route (boost::shared_ptr<Route> rt)
 {
 	if (rec_enable_button->get_parent()) {
-		button_table.remove (*rec_enable_button);
+		rec_solo_table.remove (*rec_enable_button);
 	}
 
 	if (show_sends_button->get_parent()) {
-		button_table.remove (*show_sends_button);
+		rec_solo_table.remove (*show_sends_button);
 	}
 
-	processor_box.set_route (rt);
-
 	RouteUI::set_route (rt);
 
+	/* ProcessorBox needs access to _route so that it can read
+	   GUI object state.
+	*/
+	processor_box.set_route (rt);
+
 	/* map the current state */
 
 	mute_changed (0);
@@ -380,17 +397,26 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
 	revert_to_default_display ();
 
-	if (set_color_from_route()) {
-		set_color (unique_random_color());
+	if (solo_button->get_parent()) {
+		middle_button_table.remove (*solo_button);
 	}
 
-        if (route()->is_master()) {
-                solo_button->hide ();
-                solo_led_box.hide ();
-        } else {
-                solo_button->show ();
-                solo_led_box.show ();
-        }
+	if (mute_button->get_parent()) {
+		middle_button_table.remove (*mute_button);
+	}
+
+	if (route()->is_master()) {
+		middle_button_table.attach (*mute_button, 0, 2, 0, 1);
+		solo_button->hide ();
+		mute_button->show ();
+		rec_solo_table.hide ();
+	} else {
+		middle_button_table.attach (*mute_button, 0, 1, 0, 1);
+		middle_button_table.attach (*solo_button, 1, 2, 0, 1);
+		mute_button->show ();
+		solo_button->show ();
+		rec_solo_table.show ();
+	}
 
 	if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {
 
@@ -405,88 +431,95 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		global_vpacker.pack_start (*spacer, false, false);
 	}
 
+	if (is_track()) {
+		monitor_input_button->show ();
+		monitor_disk_button->show ();
+	} else {
+		monitor_input_button->hide();
+		monitor_disk_button->hide ();
+	}
+
+	if (is_midi_track()) {
+		if (midi_input_enable_button == 0) {
+			midi_input_enable_button = manage (new ArdourButton);
+			midi_input_enable_button->set_name ("midi input button");
+			midi_input_enable_button->set_image (::get_icon (X_("midi_socket_small")));
+			midi_input_enable_button->signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_press), false);
+			midi_input_enable_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false);
+			ARDOUR_UI::instance()->set_tip (midi_input_enable_button, _("Enable/Disable MIDI input"));
+		} else {
+			input_button_box.remove (*midi_input_enable_button);
+		}
+		/* get current state */
+		midi_input_status_changed ();
+		input_button_box.pack_start (*midi_input_enable_button, false, false);
+		/* follow changes */
+		midi_track()->InputActiveChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::midi_input_status_changed, this), gui_context());
+	} else {
+		if (midi_input_enable_button) {
+			/* removal from the container will delete it */
+			input_button_box.remove (*midi_input_enable_button);
+			midi_input_enable_button = 0;
+		}
+	}
+
 	if (is_audio_track()) {
 		boost::shared_ptr<AudioTrack> at = audio_track();
 		at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::map_frozen, this), gui_context());
 	}
 
 	if (has_audio_outputs ()) {
-		_mono_button.show ();
 		panners.show_all ();
 	} else {
-		_mono_button.hide ();
 		panners.hide_all ();
 	}
 
 	if (is_track ()) {
-		
-		button_table.attach (*rec_enable_button, 0, 2, 2, 3);
+
+		rec_solo_table.attach (*rec_enable_button, 0, 1, 0, 2);
 		rec_enable_button->set_sensitive (_session->writable());
 		rec_enable_button->show();
 
 	} else {
-		
+
 		/* non-master bus */
 
 		if (!_route->is_master()) {
-			button_table.attach (*show_sends_button, 0, 2, 2, 3);
+			rec_solo_table.attach (*show_sends_button, 0, 1, 0, 2);
 			show_sends_button->show();
 		}
 	}
 
-	switch (_route->meter_point()) {
-	case MeterInput:
-		meter_point_label.set_text (_("input"));
-		break;
-
-	case MeterPreFader:
-		meter_point_label.set_text (_("pre"));
-		break;
-
-	case MeterPostFader:
-		meter_point_label.set_text (_("post"));
-		break;
-
-	case MeterCustom:
-		meter_point_label.set_text (_("custom"));
-		break;
-	}
+	meter_point_button.set_text (meter_point_string (_route->meter_point()));
 
 	delete route_ops_menu;
 	route_ops_menu = 0;
 
-	ARDOUR_UI::instance()->set_tip (comment_button, _route->comment().empty() ?
-						   _("Click to Add/Edit Comments"):
-						   _route->comment());
-
 	_route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context());
-	_route->input()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::input_changed, this, _1, _2), gui_context());
-	_route->output()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::output_changed, this, _1, _2), gui_context());
 	_route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context());
 
-	if (_route->panner()) {
-		_route->panner()->Changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context());
+	if (_route->panner_shell()) {
+		_route->panner_shell()->Changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context());
 	}
 
 	if (is_audio_track()) {
 		audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context());
 	}
 
-	_route->comment_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::comment_changed, this, _1), gui_context());
-	_route->gui_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::route_gui_changed, this, _1, _2), gui_context());
+	_route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::comment_changed, this, _1), gui_context());
+	_route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context());
 
 	set_stuff_from_route ();
 
 	/* now force an update of all the various elements */
 
 	mute_changed (0);
-        update_solo_display ();
+	update_solo_display ();
 	name_changed ();
 	comment_changed (0);
 	route_group_changed ();
 
 	connect_to_pan ();
-
 	panners.setup_pan ();
 
 	update_diskstream_display ();
@@ -495,13 +528,15 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
 	add_events (Gdk::BUTTON_RELEASE_MASK);
 
-	processor_box.show();
+	processor_box.show ();
 
 	if (!route()->is_master() && !route()->is_monitor()) {
 		/* we don't allow master or control routes to be hidden */
 		hide_button.show();
 	}
 
+	gpm.reset_peak_display ();
+
 	width_button.show();
 	width_hide_box.show();
 	whvbox.show ();
@@ -510,24 +545,15 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	button_table.show();
 	middle_button_table.show();
 	bottom_button_table.show();
-	processor_box.show_all ();
 	gpm.show_all ();
-	gain_meter_alignment.show ();
-	gain_unit_button.show();
-	gain_unit_label.show();
 	meter_point_button.show();
-	meter_point_label.show();
-	diskstream_button.show();
-	diskstream_label.show();
-	input_button.show();
-	input_label.show();
+	input_button_box.show_all();
 	output_button.show();
-	output_label.show();
-	name_label.show();
 	name_button.show();
-	comment_button.show();
+	_comment_button.show();
 	group_button.show();
-	group_label.show();
+
+	parameter_changed ("mixer-strip-visibility");
 
 	show ();
 }
@@ -535,25 +561,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 void
 MixerStrip::set_stuff_from_route ()
 {
-	XMLProperty *prop;
-
-	ensure_xml_node ();
-
 	/* if width is not set, it will be set by the MixerUI or editor */
 
-	if ((prop = xml_node->property ("strip-width")) != 0) {
-		set_width_enum (Width (string_2_enum (prop->value(), _width)), this);
-	}
-
-	if ((prop = xml_node->property ("shown-mixer")) != 0) {
-		if (prop->value() == "no") {
-			_marked_for_display = false;
-		} else {
-			_marked_for_display = true;
-		}
-	} else {
-		/* backwards compatibility */
-		_marked_for_display = true;
+	string str = gui_property ("strip-width");
+	if (!str.empty()) {
+		set_width_enum (Width (string_2_enum (str, _width)), this);
 	}
 }
 
@@ -569,12 +581,10 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
 	_width_owner = owner;
 
-	ensure_xml_node ();
-
 	_width = w;
 
 	if (_width_owner == this) {
-		xml_node->add_property ("strip-width", enum_2_string (_width));
+		set_gui_property ("strip-width", enum_2_string (_width));
 	}
 
 	set_button_names ();
@@ -582,15 +592,8 @@ MixerStrip::set_width_enum (Width w, void* owner)
 	switch (w) {
 	case Wide:
 		if (show_sends_button)  {
-			((Gtk::Label*)show_sends_button->get_child())->set_text (_("Sends"));
-		}
-
-		if (_route->comment() == "") {
-			comment_button.unset_bg (STATE_NORMAL);
-			((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
-		} else {
-			comment_button.modify_bg (STATE_NORMAL, color());
-			((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
+			show_sends_button->set_text (_("Aux\nSends"));
+			show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER);
 		}
 
 		((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
@@ -605,21 +608,16 @@ MixerStrip::set_width_enum (Width w, void* owner)
 					panners.astate_string(_route->panner()->automation_state()));
 		}
 
+		solo_isolated_led->set_text (_("iso"));
+		solo_safe_led->set_text (_("lock"));
+
 		Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
 		set_size_request (-1, -1);
 		break;
 
 	case Narrow:
 		if (show_sends_button) {
-			((Gtk::Label*)show_sends_button->get_child())->set_text (_("Snd"));
-		}
-
-		if (_route->comment() == "") {
-		       comment_button.unset_bg (STATE_NORMAL);
-		       ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
-		} else {
-		       comment_button.modify_bg (STATE_NORMAL, color());
-		       ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
+			show_sends_button->set_text (_("Snd"));
 		}
 
 		((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
@@ -633,6 +631,9 @@ MixerStrip::set_width_enum (Width w, void* owner)
 			((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (
 			panners.short_astate_string(_route->panner()->automation_state()));
 		}
+		
+		solo_isolated_led->set_text (_("i"));
+		solo_safe_led->set_text (_("L"));
 
 		Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
 		set_size_request (max (50, gpm.get_gm_width()), -1);
@@ -640,9 +641,10 @@ MixerStrip::set_width_enum (Width w, void* owner)
 	}
 
 	processor_box.set_width (w);
-	
+
 	update_input_display ();
 	update_output_display ();
+	setup_comment_button ();
 	route_group_changed ();
 	name_changed ();
 	WidthChanged ();
@@ -653,22 +655,26 @@ MixerStrip::set_packed (bool yn)
 {
 	_packed = yn;
 
-	ensure_xml_node ();
-
 	if (_packed) {
-		xml_node->add_property ("shown-mixer", "yes");
+		set_gui_property ("visible", true);
 	} else {
-		xml_node->add_property ("shown-mixer", "no");
+		set_gui_property ("visible", false);
 	}
 }
 
 
+struct RouteCompareByName {
+	bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
+		return a->name().compare (b->name()) < 0;
+	}
+};
+
 gint
 MixerStrip::output_press (GdkEventButton *ev)
 {
-        using namespace Menu_Helpers;
+	using namespace Menu_Helpers;
 	if (!_session->engine().connected()) {
-	        MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
+		MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
 		msg.run ();
 		return true;
 	}
@@ -687,14 +693,25 @@ MixerStrip::output_press (GdkEventButton *ev)
 		output_menu_bundles.clear ();
 
 		citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
+
+		for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+			citems.push_back (
+				MenuElem (
+					string_compose ("Add %1 port", (*i).to_i18n_string()),
+					sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i)
+					)
+				);
+		}
+		
 		citems.push_back (SeparatorElem());
+		uint32_t const n_with_separator = citems.size ();
 
 		ARDOUR::BundleList current = _route->output()->bundles_connected ();
 
 		boost::shared_ptr<ARDOUR::BundleList> b = _session->bundles ();
 
 		/* give user bundles first chance at being in the menu */
-		
+
 		for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
 			if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
 				maybe_add_bundle_to_output_menu (*i, current);
@@ -706,13 +723,15 @@ MixerStrip::output_press (GdkEventButton *ev)
 				maybe_add_bundle_to_output_menu (*i, current);
 			}
 		}
-		
+
 		boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
-		for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+		RouteList copy = *routes;
+		copy.sort (RouteCompareByName ());
+		for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
 			maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current);
 		}
 
-		if (citems.size() == 2) {
+		if (citems.size() == n_with_separator) {
 			/* no routes added; remove the separator */
 			citems.pop_back ();
 		}
@@ -722,7 +741,7 @@ MixerStrip::output_press (GdkEventButton *ev)
 	}
 
 	default:
-	        break;
+		break;
 	}
 	return TRUE;
 }
@@ -731,7 +750,7 @@ void
 MixerStrip::edit_output_configuration ()
 {
 	if (output_selector == 0) {
-		
+
 		boost::shared_ptr<Send> send;
 		boost::shared_ptr<IO> output;
 
@@ -740,11 +759,11 @@ MixerStrip::edit_output_configuration ()
 				output = send->output();
 			} else {
 				output = _route->output ();
-			} 
+			}
 		} else {
 			output = _route->output ();
 		}
-		
+
 		output_selector = new IOSelectorWindow (_session, output);
 	}
 
@@ -779,12 +798,12 @@ MixerStrip::input_press (GdkEventButton *ev)
 	citems.clear();
 
 	if (!_session->engine().connected()) {
-	        MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
+		MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
 		msg.run ();
 		return true;
 	}
 
-	if (_session->actively_recording() && _route->record_enabled()) 
+	if (_session->actively_recording() && _route->record_enabled())
 		return true;
 
 	switch (ev->button) {
@@ -796,7 +815,19 @@ MixerStrip::input_press (GdkEventButton *ev)
 	case 3:
 	{
 		citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
+
+		for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+			citems.push_back (
+				MenuElem (
+					string_compose ("Add %1 port", (*i).to_i18n_string()),
+					sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i)
+					)
+				);
+		}
+
 		citems.push_back (SeparatorElem());
+		uint32_t const n_with_separator = citems.size ();
+		
 		input_menu_bundles.clear ();
 
 		ARDOUR::BundleList current = _route->input()->bundles_connected ();
@@ -804,7 +835,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 		boost::shared_ptr<ARDOUR::BundleList> b = _session->bundles ();
 
 		/* give user bundles first chance at being in the menu */
-		
+
 		for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
 			if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
 				maybe_add_bundle_to_input_menu (*i, current);
@@ -816,13 +847,15 @@ MixerStrip::input_press (GdkEventButton *ev)
 				maybe_add_bundle_to_input_menu (*i, current);
 			}
 		}
-		
+
 		boost::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
-		for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+		RouteList copy = *routes;
+		copy.sort (RouteCompareByName ());
+		for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
 			maybe_add_bundle_to_input_menu ((*i)->output()->bundle(), current);
 		}
 
-		if (citems.size() == 2) {
+		if (citems.size() == n_with_separator) {
 			/* no routes added; remove the separator */
 			citems.pop_back ();
 		}
@@ -831,7 +864,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 		break;
 	}
 	default:
-	        break;
+		break;
 	}
 	return TRUE;
 }
@@ -873,7 +906,7 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR:
 {
 	using namespace Menu_Helpers;
 
- 	if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs()) {
+ 	if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) {
  		return;
  	}
 
@@ -907,7 +940,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
 {
 	using namespace Menu_Helpers;
 
- 	if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs()) {
+ 	if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) {
  		return;
  	}
 
@@ -921,7 +954,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
 	}
 
 	output_menu_bundles.push_back (b);
-	
+
 	MenuList& citems = output_menu.items();
 
 	std::string n = b->name ();
@@ -945,7 +978,7 @@ MixerStrip::update_diskstream_display ()
 			input_selector->hide_all ();
 		}
 
-		show_route_color ();
+		route_color_changed ();
 
 	} else {
 
@@ -965,16 +998,12 @@ MixerStrip::connect_to_pan ()
 		return;
 	}
 
-	boost::shared_ptr<ARDOUR::AutomationControl> pan_control
-		= boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
-				_route->panner()->control(Evoral::Parameter(PanAutomation)));
+	boost::shared_ptr<Pannable> p = _route->pannable ();
 
-	if (pan_control) {
-		pan_control->alist()->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context());
-		pan_control->alist()->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context());
-	}
+	p->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context());
+	p->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context());
 
-	panners.panner_changed (this);
+	panners.panshell_changed ();
 }
 
 
@@ -1022,7 +1051,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 {
 	uint32_t io_count;
 	uint32_t io_index;
-	Port *port;
+	boost::shared_ptr<Port> port;
 	vector<string> port_connections;
 
 	uint32_t total_connection_count = 0;
@@ -1033,7 +1062,6 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
 	ostringstream label;
 	string label_string;
-	char * label_cstr;
 
 	bool have_label = false;
 	bool each_io_has_one_connection = true;
@@ -1047,21 +1075,22 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 	ostringstream tooltip;
 	char * tooltip_cstr;
 
-	tooltip << route->name();
-
 	if (for_input) {
 		io_count = route->n_inputs().n_total();
+		tooltip << string_compose (_("<b>INPUT</b> to %1"), route->name());
 	} else {
 		io_count = route->n_outputs().n_total();
+		tooltip << string_compose (_("<b>OUTPUT</b> from %1"), route->name());
 	}
 
+
 	for (io_index = 0; io_index < io_count; ++io_index) {
 		if (for_input) {
 			port = route->input()->nth (io_index);
 		} else {
 			port = route->output()->nth (io_index);
 		}
-		
+
 		port_connections.clear ();
 		port->get_connections(port_connections);
 		io_connection_count = 0;
@@ -1139,7 +1168,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 	}
 
 	if (each_io_has_one_connection) {
-		if ((total_connection_count == ardour_connection_count)) {
+		if (total_connection_count == ardour_connection_count) {
 			// all connections are to the same track in ardour
 			// "ardour:Master/" -> "Master"
 			string::size_type slash = ardour_track_name.find("/");
@@ -1173,20 +1202,17 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
 	switch (width) {
 	case Wide:
-		label_string = label.str().substr(0, 6);
+		label_string = label.str().substr(0, 7);
 		break;
 	case Narrow:
 		label_string = label.str().substr(0, 3);
 		break;
   	}
 
-	label_cstr = new char[label_string.size() + 1];
-	strcpy(label_cstr, label_string.c_str());
-
 	if (for_input) {
-		input_label.set_text (label_cstr);
+		input_button.set_text (label_string);
 	} else {
-		output_label.set_text (label_cstr);
+		output_button.set_text (label_string);
 	}
 }
 
@@ -1218,104 +1244,111 @@ MixerStrip::diskstream_changed ()
 }
 
 void
-MixerStrip::input_changed (IOChange /*change*/, void */*src*/)
+MixerStrip::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost::weak_ptr<Port> wb)
 {
-	Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_input_display, this));
-	set_width_enum (_width, this);
-}
+	boost::shared_ptr<Port> a = wa.lock ();
+	boost::shared_ptr<Port> b = wb.lock ();
 
-void
-MixerStrip::output_changed (IOChange /*change*/, void */*src*/)
-{
-	Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_output_display, this));
-	set_width_enum (_width, this);
-}
+	if ((a && _route->input()->has_port (a)) || (b && _route->input()->has_port (b))) {
+		update_input_display ();
+		set_width_enum (_width, this);
+	}
 
+	if ((a && _route->output()->has_port (a)) || (b && _route->output()->has_port (b))) {
+		update_output_display ();
+		set_width_enum (_width, this);
+	}
+}
 
 void
-MixerStrip::comment_editor_done_editing()
+MixerStrip::setup_comment_button ()
 {
-	string str =  comment_area->get_buffer()->get_text();
-	if (_route->comment() != str) {
-		_route->set_comment (str, this);
-
-		switch (_width) {
-
-		case Wide:
-			if (! str.empty()) {
-			        comment_button.modify_bg (STATE_NORMAL, color());
-				((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
-			} else {
-			        comment_button.unset_bg (STATE_NORMAL);
-				((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
-			}
-			break;
+	switch (_width) {
 
-		case Narrow:
-			if (! str.empty()) {
-			        comment_button.modify_bg (STATE_NORMAL, color());
-				((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
-			} else {
-			        comment_button.unset_bg (STATE_NORMAL);
-				((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
-			}
-			break;
+	case Wide:
+		if (_route->comment().empty ()) {
+			_comment_button.unset_bg (STATE_NORMAL);
+			_comment_button.set_text (_("Comments"));
+		} else {
+			_comment_button.modify_bg (STATE_NORMAL, color ());
+			_comment_button.set_text (_("*Comments*"));
 		}
+		break;
 
-		ARDOUR_UI::instance()->set_tip (comment_button,
-				str.empty() ? _("Click to Add/Edit Comments") : str);
+	case Narrow:
+		if (_route->comment().empty ()) {
+			_comment_button.unset_bg (STATE_NORMAL);
+			_comment_button.set_text (_("Cmt"));
+		} else {
+			_comment_button.modify_bg (STATE_NORMAL, color ());
+			_comment_button.set_text (_("*Cmt*"));
+		}
+		break;
 	}
 
+	ARDOUR_UI::instance()->set_tip (
+		_comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
+		);
 }
 
 void
-MixerStrip::comment_button_clicked ()
+MixerStrip::comment_editor_done_editing ()
 {
-	if (comment_window == 0) {
-		setup_comment_editor ();
+	string const str = comment_area->get_buffer()->get_text();
+	if (str == _route->comment ()) {
+		return;
 	}
 
-    int x, y, cw_width, cw_height;
+	_route->set_comment (str, this);
+	setup_comment_button ();
+}
 
-	if (comment_window->is_visible()) {
-		comment_window->hide ();
+void
+MixerStrip::toggle_comment_editor ()
+{
+	if (ignore_toggle) {
 		return;
 	}
 
-	comment_window->get_size (cw_width, cw_height);
-	comment_window->get_position(x, y);
-	comment_window->move(x, y - (cw_height / 2) - 45);
-	/*
-	   half the dialog height minus the comments button height
-	   with some window decoration fudge thrown in.
-	*/
-
-	comment_window->show();
-	comment_window->present();
+	if (comment_window && comment_window->is_visible ()) {
+		comment_window->hide ();
+	} else {
+		open_comment_editor ();
+	}
 }
 
 void
-MixerStrip::setup_comment_editor ()
+MixerStrip::open_comment_editor ()
 {
+	if (comment_window == 0) {
+		setup_comment_editor ();
+	}
+
 	string title;
 	title = _route->name();
 	title += _(": comment editor");
 
-	comment_window = new ArdourDialog (title, false);
+	comment_window->set_title (title);
+	comment_window->present();
+}
+
+void
+MixerStrip::setup_comment_editor ()
+{
+	comment_window = new ArdourWindow (""); // title will be reset to show route
 	comment_window->set_position (Gtk::WIN_POS_MOUSE);
 	comment_window->set_skip_taskbar_hint (true);
 	comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing));
+	comment_window->set_default_size (400, 200);
 
 	comment_area = manage (new TextView());
 	comment_area->set_name ("MixerTrackCommentArea");
-	comment_area->set_size_request (110, 178);
 	comment_area->set_wrap_mode (WRAP_WORD);
 	comment_area->set_editable (true);
 	comment_area->get_buffer()->set_text (_route->comment());
 	comment_area->show ();
 
-	comment_window->get_vbox()->pack_start (*comment_area);
-	comment_window->get_action_area()->hide();
+	comment_window->add (*comment_area);
 }
 
 void
@@ -1332,12 +1365,6 @@ MixerStrip::comment_changed (void *src)
 	}
 }
 
-void
-MixerStrip::set_route_group (RouteGroup *rg)
-{
-	rg->add (_route);
-}
-
 bool
 MixerStrip::select_route_group (GdkEventButton *ev)
 {
@@ -1354,10 +1381,12 @@ MixerStrip::select_route_group (GdkEventButton *ev)
 			plist->add (Properties::solo, true);
 
 			group_menu = new RouteGroupMenu (_session, plist);
-			group_menu->GroupSelected.connect (sigc::mem_fun (*this, &MixerStrip::set_route_group));
 		}
 
-		group_menu->popup (1, ev->time);
+		WeakRouteList r;
+		r.push_back (route ());
+		group_menu->build (r);
+		group_menu->menu()->popup (1, ev->time);
 	}
 
 	return true;
@@ -1371,44 +1400,31 @@ MixerStrip::route_group_changed ()
 	RouteGroup *rg = _route->route_group();
 
 	if (rg) {
-                group_label.set_text (PBD::short_version (rg->name(), 5));
+		group_button.set_text (PBD::short_version (rg->name(), 5));
 	} else {
 		switch (_width) {
 		case Wide:
-			group_label.set_text (_("Grp"));
+			group_button.set_text (_("Grp"));
 			break;
 		case Narrow:
-			group_label.set_text (_("~G"));
+			group_button.set_text (_("~G"));
 			break;
 		}
 	}
 }
 
-
 void
-MixerStrip::route_gui_changed (string what_changed, void*)
-{
-	ENSURE_GUI_THREAD (*this, &MixerStrip::route_gui_changed, what_changed, ignored)
-
-	if (what_changed == "color") {
-		if (set_color_from_route () == 0) {
-			show_route_color ();
-		}
-	}
-}
-
-void
-MixerStrip::show_route_color ()
+MixerStrip::route_color_changed ()
 {
 	name_button.modify_bg (STATE_NORMAL, color());
 	top_event_box.modify_bg (STATE_NORMAL, color());
-	route_active_changed ();
+	reset_strip_style ();
 }
 
 void
 MixerStrip::show_passthru_color ()
 {
-	route_active_changed ();
+	reset_strip_style ();
 }
 
 void
@@ -1420,13 +1436,18 @@ MixerStrip::build_route_ops_menu ()
 
 	MenuList& items = route_ops_menu->items();
 
-	items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
+	items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::open_comment_editor)));
+	if (!_route->is_master()) {
+		items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
+	}
 	items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
 	rename_menu_item = &items.back();
+
 	items.push_back (SeparatorElem());
-	items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun (*this, &RouteUI::toggle_route_active)));
-	route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
-	route_active_menu_item->set_active (_route->active());
+	items.push_back (CheckMenuElem (_("Active")));
+	CheckMenuItem* i = dynamic_cast<CheckMenuItem *> (&items.back());
+	i->set_active (_route->active());
+	i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), !_route->active(), false));
 
 	items.push_back (SeparatorElem());
 
@@ -1440,25 +1461,26 @@ MixerStrip::build_route_ops_menu ()
 	if (!Profile->get_sae()) {
 		items.push_back (SeparatorElem());
 		items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
-        }
+	}
 
 	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
+	items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false)));
 }
 
 gboolean
 MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-	if (ev->button == 3) {
+	/* show menu for either button 1 or 3, so as not to confuse people
+	   and also not hide stuff from them.
+	*/
+
+	if (ev->button == 3 || ev->button == 1) {
 		list_route_operations ();
 
 		/* do not allow rename if the track is record-enabled */
 		rename_menu_item->set_sensitive (!_route->record_enabled());
 		route_ops_menu->popup (1, ev->time);
-
-	} else if (ev->button == 1) {
-                revert_to_default_display ();
-        }
+	}
 
 	return false;
 }
@@ -1466,9 +1488,8 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
 void
 MixerStrip::list_route_operations ()
 {
-	if (route_ops_menu == 0) {
-		build_route_ops_menu ();
-	}
+	delete route_ops_menu;
+	build_route_ops_menu ();
 }
 
 void
@@ -1485,30 +1506,66 @@ MixerStrip::set_selected (bool yn)
 	global_frame.queue_draw ();
 }
 
+void
+MixerStrip::property_changed (const PropertyChange& what_changed)
+{
+	RouteUI::property_changed (what_changed);
+
+	if (what_changed.contains (ARDOUR::Properties::name)) {
+		name_changed ();
+	}
+}
+
 void
 MixerStrip::name_changed ()
 {
 	switch (_width) {
 	case Wide:
-		RouteUI::property_changed (PropertyChange (ARDOUR::Properties::name));
+		name_button.set_text (_route->name());
 		break;
 	case Narrow:
-	        name_label.set_text (PBD::short_version (_route->name(), 5));
+		name_button.set_text (PBD::short_version (_route->name(), 5));
 		break;
 	}
+
+	ARDOUR_UI::instance()->set_tip (name_button, _route->name());
 }
 
 void
-MixerStrip::width_clicked ()
+MixerStrip::name_button_resized (Gtk::Allocation& alloc)
 {
-	switch (_width) {
-	case Wide:
-		set_width_enum (Narrow, this);
-		break;
-	case Narrow:
-		set_width_enum (Wide, this);
-		break;
+	name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE);
+}
+
+bool
+MixerStrip::width_button_pressed (GdkEventButton* ev)
+{
+	if (ev->button != 1) {
+		return false;
 	}
+	
+	if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)) && _mixer_owned) {
+		switch (_width) {
+		case Wide:
+			_mixer.set_strip_width (Narrow);
+			break;
+
+		case Narrow:
+			_mixer.set_strip_width (Wide);
+			break;
+		}
+	} else {
+		switch (_width) {
+		case Wide:
+			set_width_enum (Narrow, this);
+			break;
+		case Narrow:
+			set_width_enum (Wide, this);
+			break;
+		}
+	}
+
+	return true;
 }
 
 void
@@ -1575,13 +1632,6 @@ MixerStrip::hide_processor_editor (boost::weak_ptr<Processor> p)
 	}
 }
 
-void
-MixerStrip::route_active_changed ()
-{
-	RouteUI::route_active_changed ();
-	reset_strip_style ();
-}
-
 void
 MixerStrip::reset_strip_style ()
 {
@@ -1590,14 +1640,14 @@ MixerStrip::reset_strip_style ()
 		gpm.set_fader_name ("SendStripBase");
 
 	} else {
-		
+
 		if (is_midi_track()) {
 			if (_route->active()) {
 				set_name ("MidiTrackStripBase");
-				gpm.set_meter_strip_name ("MidiTrackStripBase");
+				gpm.set_meter_strip_name ("MidiTrackMetrics");
 			} else {
 				set_name ("MidiTrackStripBaseInactive");
-				gpm.set_meter_strip_name ("MidiTrackStripBaseInactive");
+				gpm.set_meter_strip_name ("MidiTrackMetricsInactive");
 			}
 			gpm.set_fader_name ("MidiTrackFader");
 		} else if (is_audio_track()) {
@@ -1618,17 +1668,12 @@ MixerStrip::reset_strip_style ()
 				gpm.set_meter_strip_name ("AudioBusMetricsInactive");
 			}
 			gpm.set_fader_name ("AudioBusFader");
-			
+
 			/* (no MIDI busses yet) */
 		}
 	}
 }
 
-RouteGroup*
-MixerStrip::route_group() const
-{
-	return _route->route_group();
-}
 
 void
 MixerStrip::engine_stopped ()
@@ -1640,66 +1685,59 @@ MixerStrip::engine_running ()
 {
 }
 
-/** Called when the metering point has changed */
-void
-MixerStrip::meter_changed ()
+string
+MixerStrip::meter_point_string (MeterPoint mp)
 {
-	ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed)
-
-	switch (_route->meter_point()) {
+	switch (mp) {
 	case MeterInput:
-		meter_point_label.set_text (_("input"));
+		return _("in");
 		break;
 
 	case MeterPreFader:
-		meter_point_label.set_text (_("pre"));
+		return _("pre");
 		break;
 
 	case MeterPostFader:
-		meter_point_label.set_text (_("post"));
+		return _("post");
+		break;
+
+	case MeterOutput:
+		return _("out");
 		break;
 
 	case MeterCustom:
-		meter_point_label.set_text (_("custom"));
+	default:
+		return _("custom");
 		break;
 	}
+}
 
+/** Called when the metering point has changed */
+void
+MixerStrip::meter_changed ()
+{
+	meter_point_button.set_text (meter_point_string (_route->meter_point()));
 	gpm.setup_meters ();
 	// reset peak when meter point changes
 	gpm.reset_peak_display();
 }
 
+/** The bus that we are displaying sends to has changed, or been turned off.
+ *  @param send_to New bus that we are displaying sends to, or 0.
+ */
 void
-MixerStrip::switch_io (boost::shared_ptr<Route> target)
+MixerStrip::bus_send_display_changed (boost::shared_ptr<Route> send_to)
 {
-	/* don't respond to switch IO signal outside of the mixer window */
+	RouteUI::bus_send_display_changed (send_to);
 
-	if (!_mixer_owned) {
-		return;
-	}
+	if (send_to) {
+		boost::shared_ptr<Send> send = _route->internal_send_for (send_to);
 
-	if (_route == target || _route->is_master()) {
-		/* don't change the display for the target or the master bus */
-		return;
-	} else if (!is_track() && show_sends_button) {
-		/* make sure our show sends button is inactive, and we no longer blink,
-		   since we're not the target.
-		*/
-		send_blink_connection.disconnect ();
-		show_sends_button->set_active (false);
-		show_sends_button->set_state (STATE_NORMAL);
-	}
-
-	if (!target) {
-		/* switch back to default */
-		revert_to_default_display ();
-		return;
-	}
-
-	boost::shared_ptr<Send> send = _route->internal_send_for (target);
-
-	if (send) {
-		show_send (send);
+		if (send) {
+			show_send (send);
+		} else {
+			revert_to_default_display ();
+		}
 	} else {
 		revert_to_default_display ();
 	}
@@ -1710,13 +1748,31 @@ MixerStrip::drop_send ()
 {
 	boost::shared_ptr<Send> current_send;
 
-	if (_current_delivery && (current_send = boost::dynamic_pointer_cast<Send>(_current_delivery))) {
+	if (_current_delivery && ((current_send = boost::dynamic_pointer_cast<Send>(_current_delivery)) != 0)) {
 		current_send->set_metering (false);
 	}
 
 	send_gone_connection.disconnect ();
 	input_button.set_sensitive (true);
 	output_button.set_sensitive (true);
+	group_button.set_sensitive (true);
+	set_invert_sensitive (true);
+	meter_point_button.set_sensitive (true);
+	mute_button->set_sensitive (true);
+	solo_button->set_sensitive (true);
+	rec_enable_button->set_sensitive (true);
+	solo_isolated_led->set_sensitive (true);
+	solo_safe_led->set_sensitive (true);
+	monitor_input_button->set_sensitive (true);
+	monitor_disk_button->set_sensitive (true);
+	_comment_button.set_sensitive (true);
+}
+
+void
+MixerStrip::set_current_delivery (boost::shared_ptr<Delivery> d)
+{
+	_current_delivery = d;
+	DeliveryChanged (_current_delivery);
 }
 
 void
@@ -1726,7 +1782,7 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
 
 	drop_send ();
 
-	_current_delivery = send;
+	set_current_delivery (send);
 
 	send->set_metering (true);
 	_current_delivery->DropReferences.connect (send_gone_connection, invalidator (*this), boost::bind (&MixerStrip::revert_to_default_display, this), gui_context());
@@ -1734,10 +1790,21 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
 	gain_meter().set_controls (_route, send->meter(), send->amp());
 	gain_meter().setup_meters ();
 
-	panner_ui().set_panner (_current_delivery->panner());
+	panner_ui().set_panner (_current_delivery->panner_shell(), _current_delivery->panner());
 	panner_ui().setup_pan ();
 
 	input_button.set_sensitive (false);
+	group_button.set_sensitive (false);
+	set_invert_sensitive (false);
+	meter_point_button.set_sensitive (false);
+	mute_button->set_sensitive (false);
+	solo_button->set_sensitive (false);
+	rec_enable_button->set_sensitive (false);
+	solo_isolated_led->set_sensitive (false);
+	solo_safe_led->set_sensitive (false);
+	monitor_input_button->set_sensitive (false);
+	monitor_disk_button->set_sensitive (false);
+	_comment_button.set_sensitive (false);
 
 	if (boost::dynamic_pointer_cast<InternalSend>(send)) {
 		output_button.set_sensitive (false);
@@ -1749,18 +1816,14 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
 void
 MixerStrip::revert_to_default_display ()
 {
-	if (show_sends_button) {
-		show_sends_button->set_active (false);
-	}
-
 	drop_send ();
 
-	_current_delivery = _route->main_outs();
+	set_current_delivery (_route->main_outs ());
 
 	gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp());
 	gain_meter().setup_meters ();
 
-	panner_ui().set_panner (_route->main_outs()->panner());
+	panner_ui().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner());
 	panner_ui().setup_pan ();
 
 	reset_strip_style ();
@@ -1769,183 +1832,261 @@ MixerStrip::revert_to_default_display ()
 void
 MixerStrip::set_button_names ()
 {
-        switch (_width) {
+	switch (_width) {
 	case Wide:
-		rec_enable_button_label.set_text (_("Rec"));
-		mute_button_label.set_text (_("Mute"));
-                if (_route && _route->solo_safe()) {
-                        solo_button_label.set_text (X_("!"));
-                } else {
-                        if (!Config->get_solo_control_is_listen_control()) {
-                                solo_button_label.set_text (_("Solo"));
-                        } else {
-                                switch (Config->get_listen_position()) {
-                                case AfterFaderListen:
-                                        solo_button_label.set_text (_("AFL"));
-                                        break;
-                                case PreFaderListen:
-                                        solo_button_label.set_text (_("PFL"));
-                                        break;
-                                }
-                        }
-                }
+		rec_enable_button->set_text (_("Rec"));
+		mute_button->set_text (_("Mute"));
+		monitor_input_button->set_text (_("In"));
+		monitor_disk_button->set_text (_("Disk"));
+
+		if (_route && _route->solo_safe()) {
+			if (solo_safe_pixbuf == 0) {
+				solo_safe_pixbuf = ::get_icon("solo-safe-icon");
+			}
+			solo_button->set_image (solo_safe_pixbuf);
+			solo_button->set_text (string());
+		} else {
+			solo_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
+			if (!Config->get_solo_control_is_listen_control()) {
+				solo_button->set_text (_("Solo"));
+			} else {
+				switch (Config->get_listen_position()) {
+				case AfterFaderListen:
+					solo_button->set_text (_("AFL"));
+					break;
+				case PreFaderListen:
+					solo_button->set_text (_("PFL"));
+					break;
+				}
+			}
+		}
 		break;
 
 	default:
-		rec_enable_button_label.set_text (_("R"));
-		mute_button_label.set_text (_("M"));
-                if (_route && _route->solo_safe()) {
-                        solo_button_label.set_text (X_("!"));
-                        if (!Config->get_solo_control_is_listen_control()) {
-                                solo_button_label.set_text (_("S"));
-                        } else {
-                                switch (Config->get_listen_position()) {
-                                case AfterFaderListen:
-                                        solo_button_label.set_text (_("A"));
-                                        break;
-                                case PreFaderListen:
-                                        solo_button_label.set_text (_("P"));
-                                        break;
-                                }
-                        }
-                }
+		rec_enable_button->set_text (_("R"));
+		mute_button->set_text (_("M"));
+		monitor_input_button->set_text (_("I"));
+		monitor_disk_button->set_text (_("D"));
+		if (_route && _route->solo_safe()) {
+			solo_button->remove ();
+			if (solo_safe_pixbuf == 0) {
+				solo_safe_pixbuf =::get_icon("solo-safe-icon");
+			}
+			solo_button->set_image (solo_safe_pixbuf);
+			solo_button->set_text (string());
+		} else {
+			solo_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
+			if (!Config->get_solo_control_is_listen_control()) {
+				solo_button->set_text (_("S"));
+			} else {
+				switch (Config->get_listen_position()) {
+				case AfterFaderListen:
+					solo_button->set_text (_("A"));
+					break;
+				case PreFaderListen:
+					solo_button->set_text (_("P"));
+					break;
+				}
+			}
+		}
 		break;
 
 	}
 }
 
-bool
-MixerStrip::on_key_press_event (GdkEventKey* ev)
+
+PluginSelector*
+MixerStrip::plugin_selector()
 {
-	GdkEventButton fake;
-	fake.type = GDK_BUTTON_PRESS;
-	fake.button = 1;
-	fake.state = ev->state;
+	return _mixer.plugin_selector();
+}
 
-	switch (ev->keyval) {
-	case GDK_m:
-		mute_press (&fake);
-		return true;
-		break;
+void
+MixerStrip::hide_things ()
+{
+	processor_box.hide_things ();
+}
 
-	case GDK_s:
-		solo_press (&fake);
-		return true;
-		break;
+bool
+MixerStrip::input_active_button_press (GdkEventButton*)
+{
+	/* nothing happens on press */
+	return true;
+}
 
-	case GDK_r:
-                cerr << "Stole that r\n";
-		rec_enable_press (&fake);
-		return true;
-		break;
+bool
+MixerStrip::input_active_button_release (GdkEventButton* ev)
+{
+	boost::shared_ptr<MidiTrack> mt = midi_track ();
 
-	case GDK_e:
-		show_sends_press (&fake);
+	if (!mt) {
 		return true;
-		break;
+	}
 
-	case GDK_g:
-		if (ev->state & Keyboard::PrimaryModifier) {
-			step_gain_down ();
+	if (mt->input_active()) {
+		if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
+			/* turn all other tracks using this input off */
+			_session->set_exclusive_input_active (mt, false);
 		} else {
-			step_gain_up ();
+			mt->set_input_active (false);
 		}
-		return true;
-		break;
 
-	case GDK_0:
-		if (_route) {
-			_route->set_gain (1.0, this);
+	} else {
+		if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
+			/* turn all other tracks using this input on */
+			_session->set_exclusive_input_active (mt, true);
+		} else {
+			mt->set_input_active (true);
 		}
-		return true;
+	}
 
-	default:
-		break;
+	return true;
+}
+
+void
+MixerStrip::midi_input_status_changed ()
+{
+	if (midi_input_enable_button) {
+		boost::shared_ptr<MidiTrack> mt = midi_track ();
+		assert (mt);
+		midi_input_enable_button->set_active (mt->input_active ());
 	}
+}
 
-	return false;
+string
+MixerStrip::state_id () const
+{
+	return string_compose ("strip %1", _route->id().to_s());
 }
 
+void
+MixerStrip::parameter_changed (string p)
+{
+	if (p == _visibility.get_state_name()) {
+		/* The user has made changes to the mixer strip visibility, so get
+		   our VisibilityGroup to reflect these changes in our widgets.
+		*/
+		_visibility.set_state (Config->get_mixer_strip_visibility ());
+	}
+}
 
-bool
-MixerStrip::on_key_release_event (GdkEventKey* ev)
+/** Called to decide whether the solo isolate / solo lock button visibility should
+ *  be overridden from that configured by the user.  We do this for the master bus.
+ *
+ *  @return optional value that is present if visibility state should be overridden.
+ */
+boost::optional<bool>
+MixerStrip::override_solo_visibility () const
 {
-	GdkEventButton fake;
-	fake.type = GDK_BUTTON_RELEASE;
-	fake.button = 1;
-	fake.state = ev->state;
+	if (_route && _route->is_master ()) {
+		return boost::optional<bool> (false);
+	}
+	
+	return boost::optional<bool> ();
+}
 
-	switch (ev->keyval) {
-	case GDK_m:
-		mute_release (&fake);
-		return true;
-		break;
+void
+MixerStrip::add_input_port (DataType t)
+{
+	_route->input()->add_port ("", this, t);
+}
 
-	case GDK_s:
-		solo_release (&fake);
-		return true;
-		break;
+void
+MixerStrip::add_output_port (DataType t)
+{
+	_route->output()->add_port ("", this, t);
+}
 
-	case GDK_r:
-                cerr << "Stole that r\n";
-		rec_enable_release (&fake);
-		return true;
-		break;
+void
+MixerStrip::route_active_changed ()
+{
+	reset_strip_style ();
+}
 
-	case GDK_e:
-		show_sends_release (&fake);
-		return true;
-		break;
+void
+MixerStrip::copy_processors ()
+{
+	processor_box.processor_operation (ProcessorBox::ProcessorsCopy);
+}
 
-	case GDK_g:
-		return true;
-		break;
+void
+MixerStrip::cut_processors ()
+{
+	processor_box.processor_operation (ProcessorBox::ProcessorsCut);
+}
 
-	default:
-		break;
-	}
+void
+MixerStrip::paste_processors ()
+{
+	processor_box.processor_operation (ProcessorBox::ProcessorsPaste);
+}
 
-	return false;
+void
+MixerStrip::select_all_processors ()
+{
+	processor_box.processor_operation (ProcessorBox::ProcessorsSelectAll);
 }
 
-bool
-MixerStrip::on_enter_notify_event (GdkEventCrossing*)
+void
+MixerStrip::delete_processors ()
 {
-	Keyboard::magic_widget_grab_focus ();
+	processor_box.processor_operation (ProcessorBox::ProcessorsDelete);
+}
 
-	if (!panners._bar_spinner_active) {
-		/* This next grab_focus() causes a focus-out event to be sent to, amongst
-		 * other things, panner BarControllers.  When they receive it, they abort
-		 * the use of any SpinButton that might be in use to change pan settings.
-		 * Hence we have this horrific hack which stops the grab_focus () call
-		 * happening if a bar spinner is active.
-		 */
-		grab_focus ();
-	}
-	return false;
+void
+MixerStrip::toggle_processors ()
+{
+	processor_box.processor_operation (ProcessorBox::ProcessorsToggleActive);
+}
+
+void
+MixerStrip::ab_plugins ()
+{
+	processor_box.processor_operation (ProcessorBox::ProcessorsAB);
 }
 
 bool
-MixerStrip::on_leave_notify_event (GdkEventCrossing* ev)
+MixerStrip::level_meter_button_press (GdkEventButton* ev)
 {
-	switch (ev->detail) {
-	case GDK_NOTIFY_INFERIOR:
-		break;
-	default:
-		Keyboard::magic_widget_drop_focus ();
+	if (ev->button == 3) {
+		popup_level_meter_menu (ev);
+		return true;
 	}
 
 	return false;
 }
 
 void
-MixerStrip::mono_button_clicked ()
+MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
 {
-	panners.set_mono (_mono_button.get_active ());
+	using namespace Gtk::Menu_Helpers;
+
+	Gtk::Menu* m = manage (new Menu);
+	MenuList& items = m->items ();
+
+	RadioMenuItem::Group group;
+
+	add_level_meter_item (items, group, _("Input"), MeterInput);
+	add_level_meter_item (items, group, _("Pre-fader"), MeterPreFader);
+	add_level_meter_item (items, group, _("Post-fader"), MeterPostFader);
+	add_level_meter_item (items, group, _("Output"), MeterOutput);
+	add_level_meter_item (items, group, _("Custom"), MeterCustom);
+
+	m->popup (ev->button, ev->time);
 }
 
-PluginSelector*
-MixerStrip::plugin_selector()
+void
+MixerStrip::add_level_meter_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterPoint point)
 {
-	return _mixer.plugin_selector();
+	using namespace Menu_Helpers;
+	
+	items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_point), point)));
+	RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
+	i->set_active (_route->meter_point() == point);
+}
+
+void
+MixerStrip::set_meter_point (MeterPoint p)
+{
+	_route->set_meter_point (p);
 }