X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=71813e84f7a2dca4bf2ec1e110474c0e8b21200b;hb=7b3914c7302b512c103efc3369a8e93ed87c86d0;hp=c0751d27275041de61983462b69108b296bc62d1;hpb=05f3adaba3eb42ba407864dd04064472e68948a6;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index c0751d2727..71813e84f7 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -76,9 +76,12 @@ using namespace Gtkmm2ext;
 using namespace std;
 using namespace ArdourMeter;
 
-int MixerStrip::scrollbar_height = 0;
+MixerStrip* MixerStrip::_entered_mixer_strip;
+
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
+static const int _button_vpad = 4;
+
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 	: AxisView(sess)
 	, RouteUI (sess)
@@ -88,7 +91,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 	, gpm (sess, 250)
 	, panners (sess)
 	, button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
-	, button_table (3, 1)
 	, rec_mon_table (2, 2)
 	, solo_iso_table (1, 2)
 	, mute_solo_table (1, 2)
@@ -96,7 +98,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 	, meter_point_button (_("pre"))
 	, midi_input_enable_button (0)
 	, _comment_button (_("Comments"))
-	, _visibility (X_("mixer-strip-visibility"))
+	, _visibility (X_("mixer-element-visibility"))
 {
 	init ();
 
@@ -118,7 +120,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
 	, gpm (sess, 250)
 	, panners (sess)
 	, button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
-	, button_table (3, 1)
 	, rec_mon_table (2, 2)
 	, solo_iso_table (1, 2)
 	, mute_solo_table (1, 2)
@@ -126,7 +127,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
 	, meter_point_button (_("pre"))
 	, midi_input_enable_button (0)
 	, _comment_button (_("Comments"))
-	, _visibility (X_("mixer-strip-visibility"))
+	, _visibility (X_("mixer-element-visibility"))
 {
 	init ();
 	set_route (rt);
@@ -135,15 +136,11 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
 void
 MixerStrip::init ()
 {
-	int button_table_row = 0;
-
-	input_selector = 0;
-	output_selector = 0;
+	_entered_mixer_strip= 0;
 	group_menu = 0;
 	route_ops_menu = 0;
 	ignore_comment_edit = false;
 	ignore_toggle = false;
-	comment_window = 0;
 	comment_area = 0;
 	_width_owner = 0;
 	spacer = 0;
@@ -162,28 +159,23 @@ MixerStrip::init ()
 	hide_button.set_image(::get_icon("hide"));
 	ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
 
+	input_button_box.set_spacing(2);
+	
 	input_button.set_text (_("Input"));
 	input_button.set_name ("mixer strip button");
-	input_button.set_size_request (-1, 20);
 	input_button_box.pack_start (input_button, true, true);
 
 	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, _("Click to select metering point"), "");
 	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".
-	*/
-	set_size_request_to_display_given_text (meter_point_button, _("tupni"), 5, 5);
-
 	bottom_button_table.attach (meter_point_button, 2, 3, 0, 1);
 
 	meter_point_button.signal_button_press_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_press), false);
 	meter_point_button.signal_button_release_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_release), false);
-
+	
 	hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
 	monitor_input_button->set_diameter (3);
@@ -195,7 +187,7 @@ MixerStrip::init ()
         solo_isolated_led->set_no_show_all (true);
         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));
+        solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false);
 	UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
 
         solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
@@ -204,11 +196,11 @@ MixerStrip::init ()
         solo_safe_led->set_no_show_all (true);
         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));
+        solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false);
 	UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
 
-	solo_safe_led->set_text (_("lock"));
-	solo_isolated_led->set_text (_("iso"));
+	solo_safe_led->set_text (_("Lock"));
+	solo_isolated_led->set_text (_("Iso"));
 
 	solo_iso_table.set_homogeneous (true);
 	solo_iso_table.set_spacings (2);
@@ -221,93 +213,84 @@ MixerStrip::init ()
 	rec_mon_table.set_homogeneous (true);
 	rec_mon_table.set_row_spacings (2);
 	rec_mon_table.set_col_spacings (2);
-	if (!ARDOUR::Profile->get_trx()) {
+	if (ARDOUR::Profile->get_mixbus()) {
+		rec_mon_table.resize (1, 3);
+		rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
+		rec_mon_table.attach (*monitor_disk_button, 2, 3, 0, 1);
+	} else if (!ARDOUR::Profile->get_trx()) {
 		rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
 		rec_mon_table.attach (*monitor_disk_button, 1, 2, 1, 2);
 	}
 	rec_mon_table.show ();
 
-	button_table.set_homogeneous (false);
-	button_table.set_spacings (2);
-
 	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);
-	}
 
-	if (!ARDOUR::Profile->get_trx()) {
-		button_table.attach (name_button, 0, 1, button_table_row, button_table_row+1);
-		button_table_row++;
-		button_table.attach (input_button_box, 0, 2, button_table_row, button_table_row+1);
-		button_table_row++;
-		button_table.attach (_invert_button_box, 0, 2, button_table_row, button_table_row+1);
-		button_table_row++;
+	if (!ARDOUR::Profile->get_mixbus()) {
+		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);
+		}
 	}
-
+	
 	mute_solo_table.set_homogeneous (true);
 	mute_solo_table.set_spacings (2);
 
 	bottom_button_table.set_spacings (2);
-	bottom_button_table.set_homogeneous (false);
-	button_table_row = 0;
-	bottom_button_table.attach (group_button, 0, 1, button_table_row, button_table_row+1);
-	bottom_button_table.attach (gpm.gain_automation_state_button, 1, 2, button_table_row, button_table_row+1);
-	button_table_row++;
+	bottom_button_table.set_homogeneous (true);
+	bottom_button_table.attach (group_button, 1, 2, 0, 1);
+	bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1);
 
 	name_button.set_name ("mixer strip 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_button.set_size_request (-1, 20);
 
 	ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
 	group_button.set_name ("mixer strip button");
-	Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
 
 	_comment_button.set_name (X_("mixer strip button"));
-	_comment_button.signal_clicked.connect (sigc::mem_fun (*this, &MixerStrip::toggle_comment_editor));
+	_comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor));
 
-	global_vpacker.set_border_width (0);
+	global_vpacker.set_border_width (1);
 	global_vpacker.set_spacing (0);
 
 	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_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.set_border_width (1);
+	width_hide_box.set_spacing (2);
 	width_hide_box.pack_start (width_button, false, true);
-	width_hide_box.pack_start (top_event_box, true, true);
+	width_hide_box.pack_start (number_label, true, true);
 	width_hide_box.pack_end (hide_button, false, true);
 
 	number_label.set_text ("-");
+	number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
 	number_label.set_no_show_all ();
 	number_label.set_name ("tracknumber label");
 	number_label.set_fixed_colors (0x80808080, 0x80808080);
-	number_label.set_elements (ArdourButton::Element(ArdourButton::Body | ArdourButton::Text));
 	number_label.set_alignment (.5, .5);
-	top_event_box.add (number_label);
-
-	whvbox.pack_start (width_hide_box, true, true);
+	number_label.set_fallthrough_to_parent (true);
 
 	global_vpacker.set_spacing (2);
 	if (!ARDOUR::Profile->get_trx()) {
-		global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
-		global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (width_hide_box, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (input_button_box, Gtk::PACK_SHRINK);
+		global_vpacker.pack_start (_invert_button_box, Gtk::PACK_SHRINK);
 		global_vpacker.pack_start (processor_box, true, true);
 	}
 	global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
@@ -341,12 +324,16 @@ MixerStrip::init ()
 	_session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context());
 
 	input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false);
+	input_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::input_release), false);
+
 	output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false);
+	output_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::output_release), false);
 
-	/* ditto for this button and busses */
+	number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::number_button_button_press), false);
 
-	number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
 	name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
+	name_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_release), false);
+
 	group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::select_route_group), false);
 
 	_width = (Width) -1;
@@ -381,19 +368,22 @@ MixerStrip::init ()
 	   must be the same as those used in RCOptionEditor so that the configuration changes
 	   are recognised when they occur.
 	*/
+	_visibility.add (&input_button_box, X_("Input"), _("Input"), false);
 	_visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert"), false);
 	_visibility.add (&rec_mon_table, X_("RecMon"), _("Record & Monitor"), false);
 	_visibility.add (&solo_iso_table, X_("SoloIsoLock"), _("Solo Iso / Lock"), false);
-	_visibility.add (&group_button, X_("Group"), _("Group"), false);
-	_visibility.add (&meter_point_button, X_("MeterPoint"), _("Meter Point"), false);
 	_visibility.add (&output_button, X_("Output"), _("Output"), false);
 	_visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
 
-	parameter_changed (X_("mixer-strip-visibility"));
+	parameter_changed (X_("mixer-element-visibility"));
 
 	Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context());
 	_session->config.ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context());
 
+	//watch for mouse enter/exit so we can do some stuff
+	signal_enter_notify_event().connect (sigc::mem_fun(*this, &MixerStrip::mixer_strip_enter_event ));
+	signal_leave_notify_event().connect (sigc::mem_fun(*this, &MixerStrip::mixer_strip_leave_event ));
+
 	gpm.LevelMeterButtonPress.connect_same_thread (_level_meter_connection, boost::bind (&MixerStrip::level_meter_button_press, this, _1));
 }
 
@@ -401,9 +391,39 @@ MixerStrip::~MixerStrip ()
 {
 	CatchDeletion (this);
 
-	delete input_selector;
-	delete output_selector;
-	delete comment_window;
+	if (this ==_entered_mixer_strip)
+		_entered_mixer_strip = NULL;
+}
+
+bool
+MixerStrip::mixer_strip_enter_event (GdkEventCrossing* /*ev*/)
+{
+	_entered_mixer_strip = this;
+	
+	//although we are triggering on the "enter", to the user it will appear that it is happenin on the "leave"
+	//because the mixerstrip control is a parent that encompasses the strip
+	deselect_all_processors();
+
+	return false;
+}
+
+bool
+MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev)
+{
+	//if we have moved outside our strip, but not into a child view, then deselect ourselves
+	if ( !(ev->detail == GDK_NOTIFY_INFERIOR) ) {
+		_entered_mixer_strip= 0;
+
+		//clear keyboard focus in the gain display.  this is cheesy but fixes a longstanding "bug" where the user starts typing in the gain entry, and leaves it active, thereby prohibiting other keybindings from working
+		gpm.gain_display.set_sensitive(false);
+		gpm.show_gain();
+		gpm.gain_display.set_sensitive(true);
+
+		//if we leave this mixer strip we need to clear out any selections
+		//processor_box.processor_display.select_none();  //but this doesn't work, because it gets triggered when (for example) you open the menu or start a drag
+	}
+	
+	return false;
 }
 
 void
@@ -424,7 +444,10 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	if (monitor_disk_button->get_parent()) {
 		rec_mon_table.remove (*monitor_disk_button);
 	}
-
+	if (group_button.get_parent()) {
+		bottom_button_table.remove (group_button);
+	}
+	
 	RouteUI::set_route (rt);
 
 	/* ProcessorBox needs access to _route so that it can read
@@ -437,12 +460,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	mute_changed (0);
 	update_solo_display ();
 
-	delete input_selector;
-	input_selector = 0;
-
-	delete output_selector;
-	output_selector = 0;
-
 	revert_to_default_display ();
 
 	/* unpack these from the parent and stuff them into our own
@@ -459,7 +476,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	gpm.set_type (rt->meter_type());
 	
 	mute_solo_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND);
-	mute_solo_table.attach (gpm.peak_display,1,2,1,2);
+	mute_solo_table.attach (gpm.peak_display,1,2,1,2, EXPAND|FILL, EXPAND);
 
 	if (solo_button->get_parent()) {
 		mute_solo_table.remove (*solo_button);
@@ -475,6 +492,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		mute_button->show ();
 		rec_mon_table.hide ();
 	} else {
+		bottom_button_table.attach (group_button, 1, 2, 0, 1);
 		mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
 		mute_solo_table.attach (*solo_button, 1, 2, 0, 1);
 		mute_button->show ();
@@ -482,17 +500,16 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		rec_mon_table.show ();
 	}
 
-	if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {
+	if (_mixer_owned && route()->is_master() ) {
 
-		if (scrollbar_height == 0) {
-			HScrollbar scrollbar;
-			Gtk::Requisition requisition(scrollbar.size_request ());
-			scrollbar_height = requisition.height;
-		}
+		HScrollbar scrollbar;
+		Gtk::Requisition requisition(scrollbar.size_request ());
+		int scrollbar_height = requisition.height;
 
 		spacer = manage (new EventBox);
-		spacer->set_size_request (-1, scrollbar_height);
+		spacer->set_size_request (-1, scrollbar_height+2);
 		global_vpacker.pack_start (*spacer, false, false);
+		spacer->show();
 	}
 
 	if (is_track()) {
@@ -534,11 +551,14 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
 	if (is_track ()) {
 
-		rec_mon_table.attach (*rec_enable_button, 0, 1, 0, 2);
+		rec_mon_table.attach (*rec_enable_button, 0, 1, 0, ARDOUR::Profile->get_mixbus() ? 1 : 2);
 		rec_enable_button->set_sensitive (_session->writable());
 		rec_enable_button->show();
 
-		if (ARDOUR::Profile->get_trx()) {
+		if (ARDOUR::Profile->get_mixbus()) {
+			rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
+			rec_mon_table.attach (*monitor_disk_button, 2, 3, 0, 1);
+		} else if (ARDOUR::Profile->get_trx()) {
 			rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 2);
 		} else {
 			rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
@@ -576,7 +596,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context());
 	}
 
-	_route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::comment_changed, this, _1), gui_context());
+	_route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::setup_comment_button, this), gui_context());
 	_route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context());
 
 	set_stuff_from_route ();
@@ -616,13 +636,10 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	gpm.gain_display.show ();
 	gpm.peak_display.show ();
 
-	top_event_box.show();
 	width_button.show();
 	width_hide_box.show();
-	whvbox.show ();
 	global_frame.show();
 	global_vpacker.show();
-	button_table.show();
 	mute_solo_table.show();
 	bottom_button_table.show();
 	gpm.show_all ();
@@ -634,7 +651,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	group_button.show();
 	gpm.gain_automation_state_button.show();
 
-	parameter_changed ("mixer-strip-visibility");
+	parameter_changed ("mixer-element-visibility");
 
 	show ();
 }
@@ -674,8 +691,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
 	case Wide:
 
 		if (show_sends_button)  {
-			show_sends_button->set_text (_("Aux\nSends"));
-			show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER);
+			show_sends_button->set_text (_("Aux"));
 		}
 
 		gpm.gain_automation_style_button.set_text (
@@ -691,8 +707,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
 		}
 
 
-		Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
-		set_size_request (-1, -1);
+		set_size_request (max (110, gpm.get_gm_width()+5), -1);
 		break;
 
 	case Narrow:
@@ -714,8 +729,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
 			panners.short_astate_string(_route->panner()->automation_state()));
 		}
 
-		Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
-		set_size_request (max (50, gpm.get_gm_width()), -1);
+		set_size_request (max (60, gpm.get_gm_width() + 10), -1);
 		break;
 	}
 
@@ -748,6 +762,18 @@ struct RouteCompareByName {
 	}
 };
 
+gint
+MixerStrip::output_release (GdkEventButton *ev)
+{
+	switch (ev->button) {
+	case 1:
+		edit_output_configuration ();
+		break;
+	}
+	
+	return false;
+}
+
 gint
 MixerStrip::output_press (GdkEventButton *ev)
 {
@@ -762,8 +788,7 @@ MixerStrip::output_press (GdkEventButton *ev)
 	switch (ev->button) {
 
 	case 1:
-		edit_output_configuration ();
-		break;
+		return false;  //wait for the mouse-up to pop the dialog
 
 	case 3:
 	{
@@ -825,51 +850,22 @@ MixerStrip::output_press (GdkEventButton *ev)
 	return TRUE;
 }
 
-void
-MixerStrip::edit_output_configuration ()
+gint
+MixerStrip::input_release (GdkEventButton *ev)
 {
-	if (output_selector == 0) {
-
-		boost::shared_ptr<Send> send;
-		boost::shared_ptr<IO> output;
-
-		if ((send = boost::dynamic_pointer_cast<Send>(_current_delivery)) != 0) {
-			if (!boost::dynamic_pointer_cast<InternalSend>(send)) {
-				output = send->output();
-			} else {
-				output = _route->output ();
-			}
-		} else {
-			output = _route->output ();
-		}
+	switch (ev->button) {
 
-		output_selector = new IOSelectorWindow (_session, output);
-	}
+	case 1:
+		edit_input_configuration ();
+		break;
+	default:
+		break;
 
-	if (output_selector->is_visible()) {
-		output_selector->get_toplevel()->get_window()->raise();
-	} else {
-		output_selector->present ();
 	}
 
-	output_selector->set_keep_above (true);
+	return false;
 }
 
-void
-MixerStrip::edit_input_configuration ()
-{
-	if (input_selector == 0) {
-		input_selector = new IOSelectorWindow (_session, _route->input());
-	}
-
-	if (input_selector->is_visible()) {
-		input_selector->get_toplevel()->get_window()->raise();
-	} else {
-		input_selector->present ();
-	}
-
-	input_selector->set_keep_above (true);
-}
 
 gint
 MixerStrip::input_press (GdkEventButton *ev)
@@ -892,8 +888,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 	switch (ev->button) {
 
 	case 1:
-		edit_input_configuration ();
-		break;
+		return false;  //don't handle the mouse-down here.  wait for mouse-up to pop the menu
 
 	case 3:
 	{
@@ -1396,79 +1391,7 @@ MixerStrip::setup_comment_button ()
 	ARDOUR_UI::instance()->set_tip (
 		_comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
 		);
-}
-
-void
-MixerStrip::comment_editor_done_editing ()
-{
-	string const str = comment_area->get_buffer()->get_text();
-	if (str == _route->comment ()) {
-		return;
-	}
 
-	_route->set_comment (str, this);
-	setup_comment_button ();
-}
-
-void
-MixerStrip::toggle_comment_editor ()
-{
-	if (ignore_toggle) {
-		return;
-	}
-
-	if (comment_window && comment_window->is_visible ()) {
-		comment_window->hide ();
-	} else {
-		open_comment_editor ();
-	}
-}
-
-void
-MixerStrip::open_comment_editor ()
-{
-	if (comment_window == 0) {
-		setup_comment_editor ();
-	}
-
-	string title;
-	title = _route->name();
-	title += _(": comment editor");
-
-	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_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_wrap_mode (WRAP_WORD);
-	comment_area->set_editable (true);
-	comment_area->get_buffer()->set_text (_route->comment());
-	comment_area->show ();
-
-	comment_window->add (*comment_area);
-}
-
-void
-MixerStrip::comment_changed (void *src)
-{
-	ENSURE_GUI_THREAD (*this, &MixerStrip::comment_changed, src)
-
-	if (src != this) {
-		ignore_comment_edit = true;
-		if (comment_area) {
-			comment_area->get_buffer()->set_text (_route->comment());
-		}
-		ignore_comment_edit = false;
-	}
 }
 
 bool
@@ -1523,7 +1446,6 @@ void
 MixerStrip::route_color_changed ()
 {
 	name_button.modify_bg (STATE_NORMAL, color());
-	top_event_box.modify_bg (STATE_NORMAL, color());
 	number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
 	reset_strip_style ();
 }
@@ -1543,7 +1465,16 @@ MixerStrip::build_route_ops_menu ()
 
 	MenuList& items = route_ops_menu->items();
 
-	items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::open_comment_editor)));
+	items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &RouteUI::choose_color)));
+
+	items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &RouteUI::open_comment_editor)));
+
+	items.push_back (MenuElem (_("Inputs..."), sigc::mem_fun (*this, &RouteUI::edit_input_configuration)));
+
+	items.push_back (MenuElem (_("Outputs..."), sigc::mem_fun (*this, &RouteUI::edit_output_configuration)));
+
+	items.push_back (SeparatorElem());
+
 	if (!_route->is_master()) {
 		items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
 	}
@@ -1578,16 +1509,44 @@ MixerStrip::build_route_ops_menu ()
 gboolean
 MixerStrip::name_button_button_press (GdkEventButton* ev)
 {
-	/* 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) {
+		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);
+
+		return true;
+	}
+
+	return false;
+}
+
+gboolean
+MixerStrip::name_button_button_release (GdkEventButton* ev)
+{
+	if (ev->button == 1) {
+		list_route_operations ();
 
-	if (ev->button == 3 || ev->button == 1) {
+		/* 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);
+	}
+
+	return false;
+}
+
+gboolean
+MixerStrip::number_button_button_press (GdkEventButton* ev)
+{
+	if (  ev->button == 3 ) {
 		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);
+		
+		return true;
 	}
 
 	return false;
@@ -1613,10 +1572,8 @@ MixerStrip::set_selected (bool yn)
 	}
 	global_frame.queue_draw ();
 	
-	if (!yn) {  //if deselected, clear keyboard focus in the gain display.  this is cheesy but fixes a longstanding bug
-		gpm.gain_display.set_sensitive(false);
-		gpm.gain_display.set_sensitive(true);
-	}
+//	if (!yn)
+//		processor_box.deselect_all_processors();
 }
 
 void
@@ -1638,18 +1595,15 @@ MixerStrip::name_changed ()
 			const int64_t track_number = _route->track_number ();
 			if (track_number == 0) {
 				number_label.set_text ("-");
-				number_label.hide();
 			} else {
 				number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
-				number_label.show();
 			}
 		} else {
-			number_label.hide();
+			number_label.set_text ("");
 		}
 		name_button.set_text (_route->name());
 		break;
 	case Narrow:
-		number_label.hide();
 		if (_session->config.get_track_name_number()) {
 			name_button.set_markup(track_number_to_string (_route->track_number (), " ",
 						PBD::short_version (_route->name (), 5)));
@@ -1817,48 +1771,48 @@ MixerStrip::meter_point_string (MeterPoint mp)
 	case Wide:
 		switch (mp) {
 		case MeterInput:
-			return _("in");
+			return _("In");
 			break;
 			
 		case MeterPreFader:
-			return _("pre");
+			return _("Pre");
 			break;
 			
 		case MeterPostFader:
-			return _("post");
+			return _("Post");
 			break;
 			
 		case MeterOutput:
-			return _("out");
+			return _("Out");
 			break;
 			
 		case MeterCustom:
 		default:
-			return _("custom");
+			return _("Custom");
 			break;
 		}
 		break;
 	case Narrow:
 		switch (mp) {
 		case MeterInput:
-			return _("in");
+			return _("In");
 			break;
 			
 		case MeterPreFader:
-			return _("pr");
+			return _("Pr");
 			break;
 			
 		case MeterPostFader:
-			return _("po");
+			return _("Po");
 			break;
 			
 		case MeterOutput:
-			return _("o");
+			return _("O");
 			break;
 			
 		case MeterCustom:
 		default:
-			return _("c");
+			return _("C");
 			break;
 		}
 		break;
@@ -2004,7 +1958,6 @@ MixerStrip::set_button_names ()
 {
 	switch (_width) {
 	case Wide:
-		rec_enable_button->set_text (_("Rec"));
 		mute_button->set_text (_("Mute"));
 		monitor_input_button->set_text (_("In"));
 		monitor_disk_button->set_text (_("Disk"));
@@ -2026,12 +1979,11 @@ MixerStrip::set_button_names ()
 				break;
 			}
 		}
-		solo_isolated_led->set_text (_("iso"));
-		solo_safe_led->set_text (_("lock"));
+		solo_isolated_led->set_text (_("Iso"));
+		solo_safe_led->set_text (_("Lock"));
 		break;
 
 	default:
-		rec_enable_button->set_text (_("R"));
 		mute_button->set_text (_("M"));
 		monitor_input_button->set_text (_("I"));
 		monitor_disk_button->set_text (_("D"));
@@ -2054,7 +2006,7 @@ MixerStrip::set_button_names ()
 			}
 		}
 
-		solo_isolated_led->set_text (_("i"));
+		solo_isolated_led->set_text (_("I"));
 		solo_safe_led->set_text (_("L"));
 		break;
 	}
@@ -2192,9 +2144,15 @@ MixerStrip::select_all_processors ()
 }
 
 void
+MixerStrip::deselect_all_processors ()
+{
+	processor_box.processor_operation (ProcessorBox::ProcessorsSelectNone);
+}
+
+bool
 MixerStrip::delete_processors ()
 {
-	processor_box.processor_operation (ProcessorBox::ProcessorsDelete);
+	return processor_box.processor_operation (ProcessorBox::ProcessorsDelete);
 }
 
 void