X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=b5ae269c7fb65864bd16f60df36bd108496bf0ab;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=ae5a0023c1cda12f1b98a1108dd488829cd04958;hpb=803853b4a43582f8d89542d0b3ec58e972826f64;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index ae5a0023c1..b5ae269c7f 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -34,9 +34,11 @@
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/bindable_button.h>
 
+#include "ardour/amp.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/internal_send.h"
+#include "ardour/io.h"
 #include "ardour/meter.h"
 #include "ardour/midi_track.h"
 #include "ardour/pannable.h"
@@ -51,8 +53,9 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 #include "ardour/user_bundle.h"
+#include "ardour/vca.h"
+#include "ardour/vca_manager.h"
 
-#include "ardour_ui.h"
 #include "ardour_window.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
@@ -65,8 +68,10 @@
 #include "gui_thread.h"
 #include "route_group_menu.h"
 #include "meter_patterns.h"
+#include "tooltips.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
@@ -77,11 +82,10 @@ using namespace std;
 using namespace ArdourMeter;
 
 MixerStrip* MixerStrip::_entered_mixer_strip;
-
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
-	: AxisView(sess)
+	: SessionHandlePtr (sess)
 	, RouteUI (sess)
 	, _mixer(mx)
 	, _mixer_owned (in_mixer)
@@ -94,9 +98,13 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 	, mute_solo_table (1, 2)
 	, bottom_button_table (1, 3)
 	, meter_point_button (_("pre"))
+	, monitor_section_button (0)
 	, midi_input_enable_button (0)
+	, _plugin_insert_cnt (0)
 	, _comment_button (_("Comments"))
+	, trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
 	, _visibility (X_("mixer-element-visibility"))
+	, control_slave_ui (sess)
 {
 	init ();
 
@@ -110,7 +118,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 }
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt, bool in_mixer)
-	: AxisView(sess)
+	: SessionHandlePtr (sess)
 	, RouteUI (sess)
 	, _mixer(mx)
 	, _mixer_owned (in_mixer)
@@ -123,9 +131,12 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
 	, mute_solo_table (1, 2)
 	, bottom_button_table (1, 3)
 	, meter_point_button (_("pre"))
+	, monitor_section_button (0)
 	, midi_input_enable_button (0)
 	, _comment_button (_("Comments"))
+	, trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
 	, _visibility (X_("mixer-element-visibility"))
+	, control_slave_ui (sess)
 {
 	init ();
 	set_route (rt);
@@ -150,15 +161,17 @@ MixerStrip::init ()
 	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_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::StripWidth));
-	ARDOUR_UI::instance()->set_tip (width_button, t);
 
-	hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::CloseCross));
-	ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
+	width_button.set_icon (ArdourIcon::StripWidth);
+	hide_button.set_tweaks (ArdourButton::Square);
+	set_tooltip (width_button, t);
+
+	hide_button.set_icon (ArdourIcon::CloseCross);
+	hide_button.set_tweaks (ArdourButton::Square);
+	set_tooltip (&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_box.pack_start (input_button, true, true);
@@ -166,14 +179,14 @@ MixerStrip::init ()
 	output_button.set_text (_("Output"));
 	output_button.set_name ("mixer strip button");
 
-	ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), "");
+	set_tooltip (&meter_point_button, _("Click to select metering point"));
 	meter_point_button.set_name ("mixer strip button");
 
 	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));
 
 	solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
@@ -234,7 +247,7 @@ MixerStrip::init ()
 			button_size_group->add_widget (*monitor_input_button);
 		}
 	}
-	
+
 	mute_solo_table.set_homogeneous (true);
 	mute_solo_table.set_spacings (2);
 
@@ -247,11 +260,22 @@ MixerStrip::init ()
 	name_button.set_text_ellipsize (Pango::ELLIPSIZE_END);
 	name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized));
 
-	ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
+	set_tooltip (&group_button, _("Mix group"));
 	group_button.set_name ("mixer strip button");
 
 	_comment_button.set_name (X_("mixer strip button"));
+	_comment_button.set_text_ellipsize (Pango::ELLIPSIZE_END);
 	_comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor));
+	_comment_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::comment_button_resized));
+
+	// TODO implement ArdourKnob::on_size_request properly
+#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))
+	trim_control.set_size_request (PX_SCALE(19), PX_SCALE(19));
+#undef PX_SCALE
+	trim_control.set_tooltip_prefix (_("Trim: "));
+	trim_control.set_name ("trim knob");
+	trim_control.set_no_show_all (true);
+	input_button_box.pack_start (trim_control, false, false);
 
 	global_vpacker.set_border_width (1);
 	global_vpacker.set_spacing (0);
@@ -262,7 +286,6 @@ MixerStrip::init ()
 	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 (number_label, true, true);
@@ -275,6 +298,7 @@ MixerStrip::init ()
 	number_label.set_fixed_colors (0x80808080, 0x80808080);
 	number_label.set_alignment (.5, .5);
 	number_label.set_fallthrough_to_parent (true);
+	number_label.set_tweaks (ArdourButton::OccasionalText);
 
 	global_vpacker.set_spacing (2);
 	if (!ARDOUR::Profile->get_trx()) {
@@ -289,6 +313,7 @@ MixerStrip::init ()
 	global_vpacker.pack_start (solo_iso_table, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (control_slave_ui, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK);
 	if (!ARDOUR::Profile->get_trx()) {
 		global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
@@ -370,9 +395,10 @@ MixerStrip::init ()
 	_visibility.add (&solo_iso_table, X_("SoloIsoLock"), _("Solo Iso / Lock"), false);
 	_visibility.add (&output_button, X_("Output"), _("Output"), false);
 	_visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
+	_visibility.add (&control_slave_ui, X_("VCA"), _("VCA Assigns"), false);
 
 	parameter_changed (X_("mixer-element-visibility"));
-	ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &MixerStrip::parameter_changed));
+	UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &MixerStrip::parameter_changed));
 	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());
 
@@ -395,7 +421,7 @@ 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();
@@ -418,10 +444,19 @@ MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev)
 		//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;
 }
 
+string
+MixerStrip::name() const
+{
+	if (_route) {
+		return _route->name();
+	}
+	return string();
+}
+
 void
 MixerStrip::set_route (boost::shared_ptr<Route> rt)
 {
@@ -443,9 +478,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	if (group_button.get_parent()) {
 		bottom_button_table.remove (group_button);
 	}
-	
+
 	RouteUI::set_route (rt);
 
+	control_slave_ui.set_stripable (boost::dynamic_pointer_cast<Stripable> (rt));
+
 	/* ProcessorBox needs access to _route so that it can read
 	   GUI object state.
 	*/
@@ -456,7 +493,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	/* unpack these from the parent and stuff them into our own
 	   table
 	*/
-	
+
 	if (gpm.peak_display.get_parent()) {
 		gpm.peak_display.get_parent()->remove (gpm.peak_display);
 	}
@@ -465,7 +502,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, EXPAND|FILL, EXPAND);
 
@@ -478,13 +515,25 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	}
 
 	if (route()->is_master()) {
-		mute_solo_table.attach (*mute_button, 0, 2, 0, 1);
 		solo_button->hide ();
 		mute_button->show ();
 		rec_mon_table.hide ();
 		if (solo_iso_table.get_parent()) {
 			solo_iso_table.get_parent()->remove(solo_iso_table);
 		}
+		if (monitor_section_button == 0) {
+			Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
+			_session->MonitorChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_changed, this), gui_context());
+
+			monitor_section_button = manage (new ArdourButton);
+			monitor_changed ();
+			monitor_section_button->set_related_action (act);
+			set_tooltip (monitor_section_button, _("Show/Hide Monitoring Section"));
+			mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1);
+			monitor_section_button->show();
+			monitor_section_button->unset_flags (Gtk::CAN_FOCUS);
+		}
+		parameter_changed ("use-monitor-bus");
 	} else {
 		bottom_button_table.attach (group_button, 1, 2, 0, 1);
 		mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
@@ -514,14 +563,24 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		monitor_disk_button->hide ();
 	}
 
+	if (route()->trim() && route()->trim()->active()) {
+		trim_control.show ();
+		trim_control.set_controllable (route()->trim()->gain_control());
+	} else {
+		trim_control.hide ();
+		boost::shared_ptr<Controllable> none;
+		trim_control.set_controllable (none);
+	}
+
 	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_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::DinMidi));
+			midi_input_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+			midi_input_enable_button->set_icon (ArdourIcon::DinMidi);
 			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"));
+			set_tooltip (midi_input_enable_button, _("Enable/Disable MIDI input"));
 		} else {
 			input_button_box.remove (*midi_input_enable_button);
 		}
@@ -546,7 +605,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	if (is_track ()) {
 
 		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_mixbus()) {
@@ -575,7 +633,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	route_ops_menu = 0;
 
 	_route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context());
-	_route->input()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_output_display, this), gui_context());
+	_route->input()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_input_display, this), gui_context());
 	_route->output()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_output_display, this), gui_context());
 	_route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context());
 
@@ -591,7 +649,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	}
 
 	_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 ();
 
@@ -600,8 +657,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	update_mute_display ();
 	update_solo_display ();
 	name_changed ();
-	comment_changed (0);
+	comment_changed ();
 	route_group_changed ();
+	update_track_number_visibility ();
 
 	connect_to_pan ();
 	panners.setup_pan ();
@@ -646,6 +704,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	gpm.gain_automation_state_button.show();
 
 	parameter_changed ("mixer-element-visibility");
+	map_frozen();
 
 	show ();
 }
@@ -681,6 +740,8 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
 	set_button_names ();
 
+	const float scale = std::max(1.f, UIConfiguration::instance().get_ui_scale());
+
 	switch (w) {
 	case Wide:
 
@@ -700,8 +761,12 @@ MixerStrip::set_width_enum (Width w, void* owner)
 					panners.astate_string(_route->panner()->automation_state()));
 		}
 
-
-		set_size_request (max (110, gpm.get_gm_width()+5), -1);
+		{
+			// panners expect an even number of horiz. pixels
+			int width = rintf (max (110.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1;
+			width &= ~1;
+			set_size_request (width, -1);
+		}
 		break;
 
 	case Narrow:
@@ -723,7 +788,12 @@ MixerStrip::set_width_enum (Width w, void* owner)
 			panners.short_astate_string(_route->panner()->automation_state()));
 		}
 
-		set_size_request (max (60, gpm.get_gm_width() + 10), -1);
+		{
+			// panners expect an even number of horiz. pixels
+			int width = rintf (max (60.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1;
+			width &= ~1;
+			set_size_request (width, -1);
+		}
 		break;
 	}
 
@@ -764,7 +834,7 @@ MixerStrip::output_release (GdkEventButton *ev)
 		edit_output_configuration ();
 		break;
 	}
-	
+
 	return false;
 }
 
@@ -825,17 +895,19 @@ MixerStrip::output_press (GdkEventButton *ev)
 			citems.pop_back ();
 		}
 
-		citems.push_back (SeparatorElem());
+		if (!ARDOUR::Profile->get_mixbus()) {
+			citems.push_back (SeparatorElem());
 
-		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)
-					)
-				);
+			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());
 		citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::edit_output_configuration)));
 
@@ -881,7 +953,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 		return true;
 	}
 
-	if (_session->actively_recording() && _route->record_enabled())
+	if (_session->actively_recording() && is_track() && track()->rec_enable_control()->get_value())
 		return true;
 
 	switch (ev->button) {
@@ -895,7 +967,7 @@ MixerStrip::input_press (GdkEventButton *ev)
 
 		citems.push_back (SeparatorElem());
 		uint32_t const n_with_separator = citems.size ();
-		
+
 		input_menu_bundles.clear ();
 
 		ARDOUR::BundleList current = _route->input()->bundles_connected ();
@@ -988,9 +1060,9 @@ 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() || *b == *_route->output()->bundle()) {
- 		return;
- 	}
+	if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) {
+		return;
+	}
 
 	list<boost::shared_ptr<Bundle> >::iterator i = input_menu_bundles.begin ();
 	while (i != input_menu_bundles.end() && b->has_same_ports (*i) == false) {
@@ -1016,9 +1088,9 @@ 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() || *b == *_route->input()->bundle()) {
- 		return;
- 	}
+	if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) {
+		return;
+	}
 
 	list<boost::shared_ptr<Bundle> >::iterator i = output_menu_bundles.begin ();
 	while (i != output_menu_bundles.end() && b->has_same_ports (*i) == false) {
@@ -1138,6 +1210,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 {
 	uint32_t io_count;
 	uint32_t io_index;
+	boost::shared_ptr<IO> io;
 	boost::shared_ptr<Port> port;
 	vector<string> port_connections;
 
@@ -1146,6 +1219,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 	uint32_t ardour_connection_count = 0;
 	uint32_t system_connection_count = 0;
 	uint32_t other_connection_count = 0;
+	uint32_t typed_connection_count = 0;
 
 	ostringstream label;
 
@@ -1160,34 +1234,83 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
 	ostringstream tooltip;
 	char * tooltip_cstr;
-	
-	//to avoid confusion, the button caption should only show connections that match the datatype of the track
+
+	/* To avoid confusion, the button caption only shows connections that match the expected datatype
+	 *
+	 * First of all, if the user made only connections to a given type, we should use that one since
+	 * it is very probably what the user expects. If there are several connections types, then show
+	 * audio ones as primary, which matches expectations for both audio tracks with midi control and
+	 * synthesisers. This first heuristic can be expressed with these two rules:
+	 * A) If there are connected audio ports, consider audio as primary type.
+	 * B) Else, if there are connected midi ports, consider midi as primary type.
+	 *
+	 * If there are no connected ports, then we choose the primary type based on the type of existing
+	 * but unconnected ports. Again:
+	 * C) If there are audio ports, consider audio as primary type.
+	 * D) Else, if there are midi ports, consider midi as primary type. */
+
 	DataType dt = DataType::AUDIO;
-	if ( boost::dynamic_pointer_cast<MidiTrack>(route) != 0 )
-		dt = DataType::MIDI;
+	bool match = false;
 
 	if (for_input) {
-		io_count = route->n_inputs().n_total();
-		tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name()));
+		io = route->input();
 	} else {
-		io_count = route->n_outputs().n_total();
-		tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Glib::Markup::escape_text(route->name()));
+		io = route->output();
 	}
 
-
+	io_count = io->n_ports().n_total();
 	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 = io->nth (io_index);
+		if (port->connected()) {
+			match = true;
+			if (port->type() == DataType::AUDIO) {
+				/* Rule A) applies no matter the remaining ports */
+				dt = DataType::AUDIO;
+				break;
+			}
+			if (port->type() == DataType::MIDI) {
+				/* Rule B) is a good candidate... */
+				dt = DataType::MIDI;
+				/* ...but continue the loop to check remaining ports for rule A) */
+			}
 		}
-		
-		//ignore any port connections that don't match our DataType
-		if (port->type() != dt)
-			continue;  
+	}
+
+	if (!match) {
+		/* Neither rule A) nor rule B) matched */
+		if ( io->n_ports().n_audio() > 0 ) {
+			/* Rule C */
+			dt = DataType::AUDIO;
+		} else if ( io->n_ports().n_midi() > 0 ) {
+			/* Rule D */
+			dt = DataType::MIDI;
+		}
+	}
+
+	if ( dt == DataType::MIDI ) {
+		tooltip << _("MIDI ");
+	}
+
+	if (for_input) {
+		tooltip << string_compose (_("<b>INPUT</b> to %1"), Gtkmm2ext::markup_escape_text (route->name()));
+	} else {
+		tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Gtkmm2ext::markup_escape_text (route->name()));
+	}
+
+	for (io_index = 0; io_index < io_count; ++io_index) {
+		port = io->nth (io_index);
 
 		port_connections.clear ();
 		port->get_connections(port_connections);
+
+		//ignore any port connections that don't match our DataType
+		if (port->type() != dt) {
+			if (!port_connections.empty()) {
+				++typed_connection_count;
+			}
+			continue;
+		}
+
 		io_connection_count = 0;
 
 		if (!port_connections.empty()) {
@@ -1200,15 +1323,15 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 				}
 
 				if (io_connection_count == 0) {
-					tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1))
+					tooltip << endl << Gtkmm2ext::markup_escape_text (port->name().substr(port->name().find("/") + 1))
 						<< " -> "
-						<< Glib::Markup::escape_text( pn.empty() ? connection_name : pn );
+						<< Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn );
 				} else {
 					tooltip << ", "
-						<< Glib::Markup::escape_text( pn.empty() ? connection_name : pn );
+						<< Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn );
 				}
 
-				if (connection_name.find("ardour:") == 0) {
+				if (connection_name.find(RouteUI::program_port_prefix) == 0) {
 					if (ardour_track_name.empty()) {
 						// "ardour:Master/in 1" -> "ardour:Master/"
 						string::size_type slash = connection_name.find("/");
@@ -1291,18 +1414,21 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 	strcpy(tooltip_cstr, tooltip.str().c_str());
 
 	if (for_input) {
-		ARDOUR_UI::instance()->set_tip (&input_button, tooltip_cstr, "");
-  	} else {
-		ARDOUR_UI::instance()->set_tip (&output_button, tooltip_cstr, "");
+		set_tooltip (&input_button, tooltip_cstr);
+	} else {
+		set_tooltip (&output_button, tooltip_cstr);
 	}
 
+	delete [] tooltip_cstr;
+
 	if (each_io_has_one_connection) {
 		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("/");
 			if (slash != string::npos) {
-				label << ardour_track_name.substr(7, slash - 7);
+				const size_t ppps = RouteUI::program_port_prefix.size (); // "ardour:"
+				label << ardour_track_name.substr (ppps, slash - ppps);
 				have_label = true;
 			}
 		}
@@ -1327,6 +1453,9 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 			// Odd configuration
 			label << "*" << total_connection_count << "*";
 		}
+		if (typed_connection_count > 0) {
+			label << "\u2295"; // circled plus
+		}
 	}
 
 	if (for_input) {
@@ -1340,7 +1469,7 @@ void
 MixerStrip::update_input_display ()
 {
 	update_io_button (_route, _width, true);
-  	panners.setup_pan ();
+	panners.setup_pan ();
 
 	if (has_audio_outputs ()) {
 		panners.show_all ();
@@ -1354,8 +1483,8 @@ void
 MixerStrip::update_output_display ()
 {
 	update_io_button (_route, _width, false);
-  	gpm.setup_meters ();
-  	panners.setup_pan ();
+	gpm.setup_meters ();
+	panners.setup_pan ();
 
 	if (has_audio_outputs ()) {
 		panners.show_all ();
@@ -1402,33 +1531,27 @@ MixerStrip::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost::wea
 void
 MixerStrip::setup_comment_button ()
 {
-	switch (_width) {
+	std::string comment = _route->comment();
 
-	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;
+	set_tooltip (_comment_button, comment.empty() ? _("Click to add/edit comments") : _route->comment());
 
-	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;
+	if (comment.empty ()) {
+		_comment_button.set_name ("generic button");
+		_comment_button.set_text (_width  == Wide ? _("Comments") : _("Cmt"));
+		return;
 	}
 
-	ARDOUR_UI::instance()->set_tip (
-		_comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
-		);
+	_comment_button.set_name ("comment button");
 
+	string::size_type pos = comment.find_first_of (" \t\n");
+	if (pos != string::npos) {
+		comment = comment.substr (0, pos);
+	}
+	if (comment.empty()) {
+		_comment_button.set_text (_width  == Wide ? _("Comments") : _("Cmt"));
+	} else {
+		_comment_button.set_text (comment);
+	}
 }
 
 bool
@@ -1442,9 +1565,9 @@ MixerStrip::select_route_group (GdkEventButton *ev)
 
 			PropertyList* plist = new PropertyList();
 
-			plist->add (Properties::gain, true);
-			plist->add (Properties::mute, true);
-			plist->add (Properties::solo, true);
+			plist->add (Properties::group_gain, true);
+			plist->add (Properties::group_mute, true);
+			plist->add (Properties::group_solo, true);
 
 			group_menu = new RouteGroupMenu (_session, plist);
 		}
@@ -1493,6 +1616,18 @@ MixerStrip::show_passthru_color ()
 	reset_strip_style ();
 }
 
+
+void
+MixerStrip::help_count_plugins (boost::weak_ptr<Processor> p)
+{
+	boost::shared_ptr<Processor> processor (p.lock ());
+	if (!processor || !processor->display_to_user()) {
+		return;
+	}
+	if (boost::dynamic_pointer_cast<PluginInsert> (processor)) {
+		++_plugin_insert_cnt;
+	}
+}
 void
 MixerStrip::build_route_ops_menu ()
 {
@@ -1525,8 +1660,22 @@ MixerStrip::build_route_ops_menu ()
 	i->set_sensitive(! _session->transport_rolling());
 	i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), !_route->active(), false));
 
-	items.push_back (SeparatorElem());
+	if (!Profile->get_mixbus ()) {
+		items.push_back (SeparatorElem());
+		items.push_back (CheckMenuElem (_("Strict I/O")));
+		i = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
+		i->set_active (_route->strict_io());
+		i->signal_activate().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*_route, &Route::set_strict_io), !_route->strict_io())));
+	}
+
+	_plugin_insert_cnt = 0;
+	_route->foreach_processor (sigc::mem_fun (*this, &MixerStrip::help_count_plugins));
+	if (_plugin_insert_cnt > 0) {
+		items.push_back (SeparatorElem());
+		items.push_back (MenuElem (_("Pin Connections..."), sigc::mem_fun (*this, &RouteUI::manage_pins)));
+	}
 
+	items.push_back (SeparatorElem());
 	items.push_back (MenuElem (_("Adjust Latency..."), sigc::mem_fun (*this, &RouteUI::adjust_latency)));
 
 	items.push_back (SeparatorElem());
@@ -1534,14 +1683,28 @@ MixerStrip::build_route_ops_menu ()
 	denormal_menu_item = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
 	denormal_menu_item->set_active (_route->denormal_protection());
 
-	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)));
-	}
+	if (_route) {
+		/* note that this relies on selection being shared across editor and
+		   mixer (or global to the backend, in the future), which is the only
+		   sane thing for users anyway.
+		*/
 
-	items.push_back (SeparatorElem());
-	/* gah, this is wrong ... it will operate on the wrong selection */
-	items.push_front (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks)));
+		RouteTimeAxisView* rtav = PublicEditor::instance().get_route_view_by_route_id (_route->id());
+		if (rtav) {
+			Selection& selection (PublicEditor::instance().get_selection());
+			if (!selection.selected (rtav)) {
+				selection.set (rtav);
+			}
+
+			if (!_route->is_master()) {
+				items.push_back (SeparatorElem());
+				items.push_back (MenuElem (_("Duplicate..."), sigc::mem_fun (*this, &RouteUI::duplicate_selected_routes)));
+			}
+
+			items.push_back (SeparatorElem());
+			items.push_back (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks)));
+		}
+	}
 }
 
 gboolean
@@ -1551,7 +1714,7 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
 		list_route_operations ();
 
 		/* do not allow rename if the track is record-enabled */
-		rename_menu_item->set_sensitive (!_route->record_enabled());
+		rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
 		route_ops_menu->popup (1, ev->time);
 
 		return true;
@@ -1567,7 +1730,7 @@ MixerStrip::name_button_button_release (GdkEventButton* ev)
 		list_route_operations ();
 
 		/* do not allow rename if the track is record-enabled */
-		rename_menu_item->set_sensitive (!_route->record_enabled());
+		rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
 		route_ops_menu->popup (1, ev->time);
 	}
 
@@ -1581,9 +1744,9 @@ MixerStrip::number_button_button_press (GdkEventButton* ev)
 		list_route_operations ();
 
 		/* do not allow rename if the track is record-enabled */
-		rename_menu_item->set_sensitive (!_route->record_enabled());
+		rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
 		route_ops_menu->popup (1, ev->time);
-		
+
 		return true;
 	}
 
@@ -1601,24 +1764,24 @@ void
 MixerStrip::set_selected (bool yn)
 {
 	AxisView::set_selected (yn);
-	if (_selected) {
+
+	if (selected()) {
 		global_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
 		global_frame.set_name ("MixerStripSelectedFrame");
 	} else {
 		global_frame.set_shadow_type (Gtk::SHADOW_IN);
 		global_frame.set_name ("MixerStripFrame");
 	}
+
 	global_frame.queue_draw ();
-	
+
 //	if (!yn)
 //		processor_box.deselect_all_processors();
 }
 
 void
-MixerStrip::property_changed (const PropertyChange& what_changed)
+MixerStrip::route_property_changed (const PropertyChange& what_changed)
 {
-	RouteUI::property_changed (what_changed);
-
 	if (what_changed.contains (ARDOUR::Properties::name)) {
 		name_changed ();
 	}
@@ -1636,7 +1799,7 @@ MixerStrip::name_changed ()
 			break;
 	}
 
-	ARDOUR_UI::instance()->set_tip (name_button, _route->name());
+	set_tooltip (name_button, _route->name());
 
 	if (_session->config.get_track_name_number()) {
 		const int64_t track_number = _route->track_number ();
@@ -1668,13 +1831,19 @@ MixerStrip::name_button_resized (Gtk::Allocation& alloc)
 	name_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
 }
 
+void
+MixerStrip::comment_button_resized (Gtk::Allocation& alloc)
+{
+	_comment_button.set_layout_ellipsize_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:
@@ -1739,7 +1908,10 @@ MixerStrip::map_frozen ()
 			// XXX need some way, maybe, to retoggle redirect editors
 			break;
 		}
+	} else {
+		processor_box.set_sensitive (true);
 	}
+	RouteUI::map_frozen ();
 }
 
 void
@@ -1819,19 +1991,19 @@ MixerStrip::meter_point_string (MeterPoint mp)
 		case MeterInput:
 			return _("In");
 			break;
-			
+
 		case MeterPreFader:
 			return _("Pre");
 			break;
-			
+
 		case MeterPostFader:
 			return _("Post");
 			break;
-			
+
 		case MeterOutput:
 			return _("Out");
 			break;
-			
+
 		case MeterCustom:
 		default:
 			return _("Custom");
@@ -1843,19 +2015,19 @@ MixerStrip::meter_point_string (MeterPoint mp)
 		case MeterInput:
 			return S_("Meter|In");
 			break;
-			
+
 		case MeterPreFader:
 			return S_("Meter|Pr");
 			break;
-			
+
 		case MeterPostFader:
 			return S_("Meter|Po");
 			break;
-			
+
 		case MeterOutput:
 			return S_("Meter|O");
 			break;
-			
+
 		case MeterCustom:
 		default:
 			return S_("Meter|C");
@@ -1867,6 +2039,18 @@ MixerStrip::meter_point_string (MeterPoint mp)
 	return string();
 }
 
+/** Called when the monitor-section state */
+void
+MixerStrip::monitor_changed ()
+{
+	assert (monitor_section_button);
+	if (_session->monitor_active()) {
+		monitor_section_button->set_name ("master monitor section button active");
+	} else {
+		monitor_section_button->set_name ("master monitor section button normal");
+	}
+}
+
 /** Called when the metering point has changed */
 void
 MixerStrip::meter_changed ()
@@ -1915,12 +2099,13 @@ MixerStrip::drop_send ()
 	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);
+	RouteUI::check_rec_enable_sensitivity ();
+	set_button_names (); // update solo button visual state
 }
 
 void
@@ -1943,7 +2128,7 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
 	send->set_metering (true);
 	_current_delivery->DropReferences.connect (send_gone_connection, invalidator (*this), boost::bind (&MixerStrip::revert_to_default_display, this), gui_context());
 
-	gain_meter().set_controls (_route, send->meter(), send->amp());
+	gain_meter().set_controls (_route, send->meter(), send->amp(), send->gain_control());
 	gain_meter().setup_meters ();
 
 	uint32_t const in = _current_delivery->pans_required();
@@ -1982,7 +2167,7 @@ MixerStrip::revert_to_default_display ()
 
 	set_current_delivery (_route->main_outs ());
 
-	gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp());
+	gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp(), _route->gain_control());
 	gain_meter().setup_meters ();
 
 	panner_ui().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner());
@@ -2007,8 +2192,11 @@ MixerStrip::set_button_names ()
 		mute_button->set_text (_("Mute"));
 		monitor_input_button->set_text (_("In"));
 		monitor_disk_button->set_text (_("Disk"));
+		if (monitor_section_button) {
+			monitor_section_button->set_text (_("Mon"));
+		}
 
-		if (_route && _route->solo_safe()) {
+		if (_route && _route->solo_safe_control()->solo_safe()) {
 			solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
 		} else {
 			solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
@@ -2033,8 +2221,11 @@ MixerStrip::set_button_names ()
 		mute_button->set_text (S_("Mute|M"));
 		monitor_input_button->set_text (S_("MonitorInput|I"));
 		monitor_disk_button->set_text (S_("MonitorDisk|D"));
+		if (monitor_section_button) {
+			monitor_section_button->set_text (S_("Mon|O"));
+		}
 
-		if (_route && _route->solo_safe()) {
+		if (_route && _route->solo_safe_control()->solo_safe()) {
 			solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
 		} else {
 			solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
@@ -2125,10 +2316,29 @@ MixerStrip::parameter_changed (string p)
 		/* The user has made changes to the mixer strip visibility, so get
 		   our VisibilityGroup to reflect these changes in our widgets.
 		*/
-		_visibility.set_state (ARDOUR_UI::config()->get_mixer_strip_visibility ());
-	}
-	else if (p == "track-name-number") {
+		_visibility.set_state (UIConfiguration::instance().get_mixer_strip_visibility ());
+	} else if (p == "track-name-number") {
 		name_changed ();
+	} else if (p == "use-monitor-bus") {
+		if (monitor_section_button) {
+			if (mute_button->get_parent()) {
+				mute_button->get_parent()->remove(*mute_button);
+			}
+			if (monitor_section_button->get_parent()) {
+				monitor_section_button->get_parent()->remove(*monitor_section_button);
+			}
+			if (Config->get_use_monitor_bus ()) {
+				mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
+				mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1);
+				mute_button->show();
+				monitor_section_button->show();
+			} else {
+				mute_solo_table.attach (*mute_button, 0, 2, 0, 1);
+				mute_button->show();
+			}
+		}
+	} else if (p == "track-name-number") {
+		update_track_number_visibility();
 	}
 }
 
@@ -2143,7 +2353,7 @@ MixerStrip::override_solo_visibility () const
 	if (_route && _route->is_master ()) {
 		return boost::optional<bool> (false);
 	}
-	
+
 	return boost::optional<bool> ();
 }
 
@@ -2254,6 +2464,7 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
 	items.push_back (SeparatorElem());
 
 	add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+	add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak0dB), MeterPeak0dB);
 	add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterKrms),  MeterKrms);
 	add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
 	add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);
@@ -2300,7 +2511,7 @@ MixerStrip::add_level_meter_item_point (Menu_Helpers::MenuList& items,
 		RadioMenuItem::Group& group, string const & name, MeterPoint point)
 {
 	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);
@@ -2318,7 +2529,7 @@ MixerStrip::add_level_meter_item_type (Menu_Helpers::MenuList& items,
 		RadioMenuItem::Group& group, string const & name, MeterType type)
 {
 	using namespace Menu_Helpers;
-	
+
 	items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_type), type)));
 	RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
 	i->set_active (_route->meter_type() == type);
@@ -2330,3 +2541,45 @@ MixerStrip::set_meter_type (MeterType t)
 	if (_suspend_menu_callbacks) return;
 	gpm.set_type (t);
 }
+
+void
+MixerStrip::update_track_number_visibility ()
+{
+	DisplaySuspender ds;
+	bool show_label = _session->config.get_track_name_number();
+
+	if (_route && _route->is_master()) {
+		show_label = false;
+	}
+
+	if (show_label) {
+		number_label.show ();
+		// see ArdourButton::on_size_request(), we should probably use a global size-group here instead.
+		// except the width of the number label is subtracted from the name-hbox, so we
+		// need to explictly calculate it anyway until the name-label & entry become ArdourWidgets.
+		int tnw = (2 + std::max(2u, _session->track_number_decimals())) * number_label.char_pixel_width();
+		if (tnw & 1) --tnw;
+		number_label.set_size_request(tnw, -1);
+		number_label.show ();
+	} else {
+		number_label.hide ();
+	}
+}
+
+Gdk::Color
+MixerStrip::color () const
+{
+	return route_color ();
+}
+
+bool
+MixerStrip::marked_for_display () const
+{
+	return !_route->presentation_info().hidden();
+}
+
+bool
+MixerStrip::set_marked_for_display (bool yn)
+{
+	return RouteUI::mark_hidden (!yn);
+}