X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_ui.cc;h=e06355637e9251afd3d61a13fead54137ed31b52;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=eb3e2ae1f0e77afd02d58e89b4a089b04e11e514;hpb=0ae8dd4bdbcdea626f66ddf0f73be5e10070b786;p=ardour.git

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index eb3e2ae1f0..e06355637e 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -17,6 +17,8 @@
 
 */
 
+#include <boost/algorithm/string.hpp>
+
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/doi.h>
@@ -25,54 +27,65 @@
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 
-#include "ardour/route_group.h"
-#include "ardour/dB.h"
 #include "pbd/memento_command.h"
 #include "pbd/stacktrace.h"
 #include "pbd/controllable.h"
 #include "pbd/enumwriter.h"
 
-#include "ardour_ui.h"
-#include "editor.h"
-#include "route_ui.h"
-#include "ardour_button.h"
-#include "keyboard.h"
-#include "utils.h"
-#include "prompter.h"
-#include "gui_thread.h"
-#include "ardour_dialog.h"
-#include "latency_gui.h"
-#include "mixer_strip.h"
-#include "automation_time_axis.h"
-#include "route_time_axis.h"
-#include "group_tabs.h"
-
+#include "ardour/dB.h"
+#include "ardour/route_group.h"
+#include "ardour/solo_isolate_control.h"
+#include "ardour/vca.h"
+#include "ardour/vca_manager.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/midi_track.h"
+#include "ardour/monitor_control.h"
 #include "ardour/internal_send.h"
+#include "ardour/profile.h"
+#include "ardour/phase_control.h"
 #include "ardour/send.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
 #include "ardour/template_utils.h"
 
-#include "i18n.h"
+#include "ardour_button.h"
+#include "ardour_dialog.h"
+#include "ardour_ui.h"
+#include "automation_time_axis.h"
+#include "editor.h"
+#include "group_tabs.h"
+#include "gui_object.h"
+#include "gui_thread.h"
+#include "keyboard.h"
+#include "latency_gui.h"
+#include "mixer_strip.h"
+#include "plugin_pin_dialog.h"
+#include "prompter.h"
+#include "rgb_macros.h"
+#include "route_time_axis.h"
+#include "route_ui.h"
+#include "timers.h"
+#include "ui_config.h"
+#include "utils.h"
+
+
+#include "pbd/i18n.h"
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
+using namespace std;
 
 uint32_t RouteUI::_max_invert_buttons = 3;
 PBD::Signal1<void, boost::shared_ptr<Route> > RouteUI::BusSendDisplayChanged;
 boost::weak_ptr<Route> RouteUI::_showing_sends_to;
-
-static const int _button_vpad = 2;
+std::string RouteUI::program_port_prefix;
 
 RouteUI::RouteUI (ARDOUR::Session* sess)
-	: AxisView(sess)
-	, mute_menu(0)
+	: mute_menu(0)
 	, solo_menu(0)
 	, sends_menu(0)
 	, record_menu(0)
@@ -82,23 +95,36 @@ RouteUI::RouteUI (ARDOUR::Session* sess)
 	, output_selector (0)
 	, _invert_menu(0)
 {
-	if (sess) init ();
+	if (program_port_prefix.empty()) {
+		// compare to gtk2_ardour/port_group.cc
+		string lpn (PROGRAM_NAME);
+		boost::to_lower (lpn);
+		program_port_prefix = lpn + ":"; // e.g. "ardour:"
+	}
+
+	if (sess) {
+		init ();
+	}
 }
 
 RouteUI::~RouteUI()
 {
+	if (_route) {
+		ARDOUR_UI::instance()->gui_object_state->remove_node (route_state_id());
+	}
+
 	_route.reset (); /* drop reference to route, so that it can be cleaned up */
 	route_connections.drop_connections ();
 
 	delete solo_menu;
 	delete mute_menu;
 	delete sends_menu;
-        delete record_menu;
+	delete record_menu;
 	delete comment_window;
 	delete input_selector;
 	delete output_selector;
 	delete _invert_menu;
-	
+
 	send_blink_connection.disconnect ();
 	rec_blink_connection.disconnect ();
 }
@@ -110,20 +136,21 @@ RouteUI::init ()
 	mute_menu = 0;
 	solo_menu = 0;
 	sends_menu = 0;
-        record_menu = 0;
+	record_menu = 0;
 	_invert_menu = 0;
 	pre_fader_mute_check = 0;
 	post_fader_mute_check = 0;
 	listen_mute_check = 0;
 	main_mute_check = 0;
-        solo_safe_check = 0;
-        solo_isolated_check = 0;
-        solo_isolated_led = 0;
-        solo_safe_led = 0;
+	solo_safe_check = 0;
+	solo_isolated_check = 0;
+	solo_isolated_led = 0;
+	solo_safe_led = 0;
 	_solo_release = 0;
 	_mute_release = 0;
 	denormal_menu_item = 0;
-        step_edit_item = 0;
+	step_edit_item = 0;
+	rec_safe_item = 0;
 	multiple_mute_change = false;
 	multiple_solo_change = false;
 	_i_am_the_modifier = 0;
@@ -144,11 +171,11 @@ RouteUI::init ()
 
 	rec_enable_button = manage (new ArdourButton);
 	rec_enable_button->set_name ("record enable button");
-	rec_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::RecButton));
+	rec_enable_button->set_icon (ArdourIcon::RecButton);
 	UI::instance()->set_tip (rec_enable_button, _("Enable recording on this track"), "");
 
-	if (ARDOUR_UI::config()->get_blink_rec_arm()) {
-		rec_blink_connection = ARDOUR_UI::instance()->Blink.connect (sigc::mem_fun (*this, &RouteUI::blink_rec_display));
+	if (UIConfiguration::instance().get_blink_rec_arm()) {
+		rec_blink_connection = Timers::blink_connect (sigc::mem_fun (*this, &RouteUI::blink_rec_display));
 	}
 
 	show_sends_button = manage (new ArdourButton);
@@ -160,7 +187,7 @@ RouteUI::init ()
 	monitor_input_button->set_text (_("In"));
 	UI::instance()->set_tip (monitor_input_button, _("Monitor input"), "");
 	monitor_input_button->set_no_show_all (true);
-	
+
 	monitor_disk_button = manage (new ArdourButton (ArdourButton::default_elements));
 	monitor_disk_button->set_name ("monitor button");
 	monitor_disk_button->set_text (_("Disk"));
@@ -184,7 +211,7 @@ RouteUI::init ()
 	solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false);
 	mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false);
 	mute_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false);
-	
+
 	monitor_input_button->set_distinct_led_click (false);
 	monitor_disk_button->set_distinct_led_click (false);
 
@@ -225,7 +252,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 	_route = rp;
 
 	if (set_color_from_route()) {
-		set_color (unique_random_color());
+		set_color (gdk_color_to_rgba (AxisView::unique_random_color ()));
 	}
 
 	if (self_destruct) {
@@ -242,39 +269,42 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 	solo_button->set_controllable (_route->solo_control());
 
 	_route->active_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_active_changed, this), gui_context());
-	_route->mute_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::mute_changed, this, _1), gui_context());
 
-	_route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::comment_changed, this, _1), gui_context());
+	_route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::comment_changed, this), gui_context());
+
+	_route->mute_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_mute_display, this), gui_context());
+	_route->solo_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context());
+	_route->solo_safe_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context());
+	_route->solo_isolate_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context());
+	_route->phase_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::polarity_changed, this), gui_context());
 
-	_route->solo_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context());
-	_route->solo_safe_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context());
-	_route->listen_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context());
-	_route->solo_isolated_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context());
 	if (is_track()) {
+		track()->FreezeChange.connect (*this, invalidator (*this), boost::bind (&RouteUI::map_frozen, this), gui_context());
 		track()->TrackModeChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::track_mode_changed, this), gui_context());
 		track_mode_changed();
 	}
 
-	_route->phase_invert_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::polarity_changed, this), gui_context());
-	_route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::property_changed, this, _1), gui_context());
+
+	_route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_property_changed, this, _1), gui_context());
+	_route->presentation_info().PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_gui_changed, this, _1), gui_context ());
 
 	_route->io_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::setup_invert_buttons, this), gui_context ());
-	_route->gui_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_gui_changed, this, _1), gui_context ());
 
 	if (_session->writable() && is_track()) {
 		boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
 
-		t->RecordEnableChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_rec_enable_changed, this), gui_context());
-		
+		t->rec_enable_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_rec_enable_changed, this), gui_context());
+		t->rec_safe_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_rec_enable_changed, this), gui_context());
+
 		rec_enable_button->show();
- 		rec_enable_button->set_controllable (t->rec_enable_control());
+		rec_enable_button->set_controllable (t->rec_enable_control());
 
                 if (is_midi_track()) {
                         midi_track()->StepEditStatusChange.connect (route_connections, invalidator (*this),
                                                                     boost::bind (&RouteUI::step_edit_changed, this, _1), gui_context());
                 }
 
-	} 
+	}
 
 	/* this will work for busses and tracks, and needs to be called to
 	   set up the name entry/name label display.
@@ -282,7 +312,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 
 	if (is_track()) {
 		boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
-		t->MonitoringChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::monitoring_changed, this), gui_context());
+		t->monitoring_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_monitoring_display, this), gui_context());
 
 		update_monitoring_display ();
 	}
@@ -309,7 +339,14 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 	update_mute_display ();
 	update_solo_display ();
 
+	if (!UIConfiguration::instance().get_blink_rec_arm()) {
+		blink_rec_display(true); // set initial rec-en button state
+	}
+
+	check_rec_enable_sensitivity ();
+	maybe_add_route_print_mgr ();
 	route_color_changed();
+	route_gui_changed (PropertyChange (Properties::selected));
 }
 
 void
@@ -332,7 +369,7 @@ RouteUI::mute_press (GdkEventButton* ev)
 	//if this is a binding action, let the ArdourButton handle it
 	if ( BindingProxy::is_bind_action(ev) )
 		return false;
-			
+
 	multiple_mute_change = false;
 
 	if (Keyboard::is_context_menu_event (ev)) {
@@ -342,7 +379,7 @@ RouteUI::mute_press (GdkEventButton* ev)
 		}
 
 		mute_menu->popup(0,ev->time);
-		
+
 		return true;
 
 	} else {
@@ -350,7 +387,7 @@ RouteUI::mute_press (GdkEventButton* ev)
 		if (Keyboard::is_button2_event (ev)) {
 			// button2-click is "momentary"
 
-			_mute_release = new SoloMuteRelease (_route->muted ());
+			_mute_release = new SoloMuteRelease (_route->mute_control()->muted ());
 		}
 
 		if (ev->button == 1 || Keyboard::is_button2_event (ev)) {
@@ -364,7 +401,7 @@ RouteUI::mute_press (GdkEventButton* ev)
 				 * elements of the list we need to work
 				 * on a copy.
 				 */
-					
+
 				boost::shared_ptr<RouteList> copy (new RouteList);
 
 				*copy = *_session->get_routes ();
@@ -382,32 +419,36 @@ RouteUI::mute_press (GdkEventButton* ev)
 				}
 
 				DisplaySuspender ds;
-				_session->set_mute (copy, !_route->muted());
+				_session->set_controls (route_list_to_control_list (copy, &Stripable::mute_control), _route->muted_by_self() ? 0.0 : 1.0, Controllable::UseGroup);
 
 			} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
-				/* Primary-button1 applies change to the mix group even if it is not active
+				/* Primary-button1 inverts the implication of
+				   the group being active. If the group is
+				   active (for mute), then this modifier means
+				   "do not apply to mute". If the group is
+				   inactive (for mute), then this modifier
+				   means "apply to route". This is all
+				   accomplished by passing just the actual
+				   route, along with the InverseGroup group
+				   control disposition.
+
 				   NOTE: Primary-button2 is MIDI learn.
 				*/
 
 				boost::shared_ptr<RouteList> rl;
 
-				if (ev->button == 1) { 
+				if (ev->button == 1) {
 
-					if (_route->route_group()) {
-							
-						rl = _route->route_group()->route_list();
-							
-						if (_mute_release) {
-							_mute_release->routes = rl;
-						}
-					} else {
-						rl.reset (new RouteList);
-						rl->push_back (_route);
+					rl.reset (new RouteList);
+					rl->push_back (_route);
+
+					if (_mute_release) {
+						_mute_release->routes = rl;
 					}
 
 					DisplaySuspender ds;
-					_session->set_mute (rl, !_route->muted(), Session::rt_cleanup, true);
+					_session->set_controls (route_list_to_control_list (rl, &Stripable::mute_control), _route->muted_by_self() ? 0.0 : 1.0, Controllable::InverseGroup);
 				}
 
 			} else {
@@ -416,13 +457,12 @@ RouteUI::mute_press (GdkEventButton* ev)
 
 				boost::shared_ptr<RouteList> rl (new RouteList);
 				rl->push_back (_route);
-					
+
 				if (_mute_release) {
 					_mute_release->routes = rl;
 				}
 
-				_session->set_mute (rl, !_route->muted());
-
+				_route->mute_control()->set_value (!_route->muted_by_self(), Controllable::UseGroup);
 			}
 		}
 	}
@@ -435,7 +475,7 @@ RouteUI::mute_release (GdkEventButton* /*ev*/)
 {
 	if (_mute_release){
 		DisplaySuspender ds;
-		_session->set_mute (_mute_release->routes, _mute_release->active, Session::rt_cleanup, true);
+		_session->set_controls (route_list_to_control_list (_mute_release->routes, &Stripable::mute_control), _mute_release->active, Controllable::UseGroup);
 		delete _mute_release;
 		_mute_release = 0;
 	}
@@ -470,7 +510,7 @@ RouteUI::edit_output_configuration ()
 		output_selector->present ();
 	}
 
-	output_selector->set_keep_above (true);
+	//output_selector->set_keep_above (true);
 }
 
 void
@@ -486,7 +526,7 @@ RouteUI::edit_input_configuration ()
 		input_selector->present ();
 	}
 
-	input_selector->set_keep_above (true);
+	//input_selector->set_keep_above (true);
 }
 
 bool
@@ -501,7 +541,7 @@ RouteUI::solo_press(GdkEventButton* ev)
 	//if this is a binding action, let the ArdourButton handle it
 	if ( BindingProxy::is_bind_action(ev) )
 		return false;
-			
+
 	multiple_solo_change = false;
 
 	if (Keyboard::is_context_menu_event (ev)) {
@@ -535,11 +575,7 @@ RouteUI::solo_press(GdkEventButton* ev)
 				}
 
 				DisplaySuspender ds;
-				if (Config->get_solo_control_is_listen_control()) {
-					_session->set_listen (_session->get_routes(), !_route->listening_via_monitor(),  Session::rt_cleanup, true);
-				} else {
-					_session->set_solo (_session->get_routes(), !_route->self_soloed(),  Session::rt_cleanup, true);
-				}
+				_session->set_controls (route_list_to_control_list (_session->get_routes(), &Stripable::solo_control), !_route->solo_control()->get_value(), Controllable::UseGroup);
 
 			} else if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
 
@@ -563,14 +599,14 @@ RouteUI::solo_press(GdkEventButton* ev)
 					/* ??? we need a just_one_listen() method */
 				} else {
 					DisplaySuspender ds;
-					_session->set_just_one_solo (_route, true);
+					_route->solo_control()->set_value (1.0, Controllable::NoGroup);
 				}
 
 			} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
 
 				// shift-click: toggle solo isolated status
 
-				_route->set_solo_isolated (!_route->solo_isolated(), this);
+				_route->solo_isolate_control()->set_value (_route->solo_isolate_control()->get_value() ? 0.0 : 1.0, Controllable::UseGroup);
 				delete _solo_release;
 				_solo_release = 0;
 
@@ -586,28 +622,36 @@ RouteUI::solo_press(GdkEventButton* ev)
 
 				boost::shared_ptr<RouteList> rl;
 
-				if (ev->button == 1) { 
+				if (ev->button == 1) {
 
-					if (_route->route_group()) {
-							
-						rl = _route->route_group()->route_list();
-							
-						if (_solo_release) {
-							_solo_release->routes = rl;
-						}
-					} else {
-						rl.reset (new RouteList);
-						rl->push_back (_route);
+					/* Primary-button1 inverts the implication of
+					   the group being active. If the group is
+					   active (for solo), then this modifier means
+					   "do not apply to solo". If the group is
+					   inactive (for mute), then this modifier
+					   means "apply to route". This is all
+					   accomplished by passing just the actual
+					   route, along with the InverseGroup group
+					   control disposition.
+
+					   NOTE: Primary-button2 is MIDI learn.
+					*/
+
+					rl.reset (new RouteList);
+					rl->push_back (_route);
+
+					if (_solo_release) {
+						_solo_release->routes = rl;
 					}
 
 					DisplaySuspender ds;
-					if (Config->get_solo_control_is_listen_control()) {
-						_session->set_listen (rl, !_route->listening_via_monitor(),  Session::rt_cleanup, true);
-					} else {
-						_session->set_solo (rl, !_route->self_soloed(),  Session::rt_cleanup, true);
-					}
+
+					_session->set_controls (route_list_to_control_list (rl, &Stripable::solo_control), !_route->self_soloed(), Controllable::InverseGroup);
 				}
 
+				delete _solo_release;
+				_solo_release = 0;
+
 			} else {
 
 				/* click: solo this route */
@@ -620,11 +664,7 @@ RouteUI::solo_press(GdkEventButton* ev)
 				}
 
 				DisplaySuspender ds;
-				if (Config->get_solo_control_is_listen_control()) {
-					_session->set_listen (rl, !_route->listening_via_monitor());
-				} else {
-					_session->set_solo (rl, !_route->self_soloed());
-				}
+				_session->set_controls (route_list_to_control_list (rl, &Stripable::solo_control), !_route->self_soloed(), Controllable::UseGroup);
 			}
 		}
 	}
@@ -641,11 +681,7 @@ RouteUI::solo_release (GdkEventButton* /*ev*/)
 
 		} else {
 			DisplaySuspender ds;
-			if (Config->get_solo_control_is_listen_control()) {
-				_session->set_listen (_solo_release->routes, _solo_release->active, Session::rt_cleanup, true);
-			} else {
-				_session->set_solo (_solo_release->routes, _solo_release->active, Session::rt_cleanup, true);
-			}
+			_session->set_controls (route_list_to_control_list (_solo_release->routes, &Stripable::solo_control), _solo_release->active ? 1.0 : 0.0, Controllable::UseGroup);
 		}
 
 		delete _solo_release;
@@ -665,34 +701,34 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 	//if this is a binding action, let the ArdourButton handle it
 	if ( BindingProxy::is_bind_action(ev) )
 		return false;
-			
+
 	if (!_session->engine().connected()) {
 	        MessageDialog msg (_("Not connected to AudioEngine - cannot engage record"));
 		msg.run ();
 		return false;
 	}
 
-        if (is_midi_track()) {
+	if (is_midi_track()) {
 
-                /* rec-enable button exits from step editing */
+		/* rec-enable button exits from step editing */
 
-                if (midi_track()->step_editing()) {
+		if (midi_track()->step_editing()) {
 			midi_track()->set_step_editing (false);
 			return false;
-                }
-        }
+		}
+	}
 
 	if (is_track() && rec_enable_button) {
 
 		if (Keyboard::is_button2_event (ev)) {
-			
+
 			//rec arm does not have a momentary mode
 			return false;
 
 		} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
 
 			DisplaySuspender ds;
-			_session->set_record_enabled (_session->get_routes(), !_route->record_enabled());
+			_session->set_controls (route_list_to_control_list (_session->get_routes(), &Stripable::rec_enable_control), !track()->rec_enable_control()->get_value(), Controllable::NoGroup);
 
 		} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
@@ -703,18 +739,12 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 			if (ev->button == 1) {
 
 				boost::shared_ptr<RouteList> rl;
-				
-				if (_route->route_group()) {
-					
-					rl = _route->route_group()->route_list();
-					
-				} else {
-					rl.reset (new RouteList);
-					rl->push_back (_route);
-				}
+
+				rl.reset (new RouteList);
+				rl->push_back (_route);
 
 				DisplaySuspender ds;
-				_session->set_record_enabled (rl, !_route->record_enabled(), Session::rt_cleanup, true);
+				_session->set_controls (route_list_to_control_list (rl, &Stripable::rec_enable_control), !track()->rec_enable_control()->get_value(), Controllable::InverseGroup);
 			}
 
 		} else if (Keyboard::is_context_menu_event (ev)) {
@@ -723,22 +753,14 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 
 		} else {
 
-			boost::shared_ptr<RouteList> rl (new RouteList);
-			rl->push_back (route());
-			DisplaySuspender ds;
-			_session->set_record_enabled (rl, !_route->record_enabled());
+			boost::shared_ptr<Track> trk = track();
+			trk->rec_enable_control()->set_value (!trk->rec_enable_control()->get_value(), Controllable::UseGroup);
 		}
 	}
 
 	return false;
 }
 
-void
-RouteUI::monitoring_changed ()
-{
-	update_monitoring_display ();
-}
-
 void
 RouteUI::update_monitoring_display ()
 {
@@ -754,7 +776,7 @@ RouteUI::update_monitoring_display ()
 
 	MonitorState ms = t->monitoring_state();
 
-	if (t->monitoring_choice() & MonitorInput) {
+	if (t->monitoring_control()->monitoring_choice() & MonitorInput) {
 		monitor_input_button->set_active_state (Gtkmm2ext::ExplicitActive);
 	} else {
 		if (ms & MonitoringInput) {
@@ -764,7 +786,7 @@ RouteUI::update_monitoring_display ()
 		}
 	}
 
-	if (t->monitoring_choice() & MonitorDisk) {
+	if (t->monitoring_control()->monitoring_choice() & MonitorDisk) {
 		monitor_disk_button->set_active_state (Gtkmm2ext::ExplicitActive);
 	} else {
 		if (ms & MonitoringDisk) {
@@ -801,7 +823,7 @@ RouteUI::monitor_disk_release (GdkEventButton* ev)
 
 bool
 RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
-{	
+{
 	if (ev->button != 1) {
 		return false;
 	}
@@ -814,21 +836,21 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
 
 	MonitorChoice mc;
 	boost::shared_ptr<RouteList> rl;
-	
-	/* XXX for now, monitoring choices are orthogonal. cue monitoring 
+
+	/* XXX for now, monitoring choices are orthogonal. cue monitoring
 	   will follow in 3.X but requires mixing the input and playback (disk)
 	   signal together, which requires yet more buffers.
 	*/
 
-	if (t->monitoring_choice() & monitor_choice) {
-		mc = MonitorChoice (t->monitoring_choice() & ~monitor_choice);
+	if (t->monitoring_control()->monitoring_choice() & monitor_choice) {
+		mc = MonitorChoice (t->monitoring_control()->monitoring_choice() & ~monitor_choice);
 	} else {
 		/* this line will change when the options are non-orthogonal */
 		// mc = MonitorChoice (t->monitoring_choice() | monitor_choice);
 		mc = monitor_choice;
 	}
 
-	if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {	
+	if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
 		rl = _session->get_routes ();
 
 	} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
@@ -844,7 +866,7 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
 	}
 
 	DisplaySuspender ds;
-	_session->set_monitoring (rl, mc, Session::rt_cleanup, true);		
+	_session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::UseGroup);
 
 	return false;
 }
@@ -852,79 +874,102 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
 void
 RouteUI::build_record_menu ()
 {
-        if (record_menu) {
-                return;
-        }
-
-        /* no rec-button context menu for non-MIDI tracks
-         */
+	if (!record_menu) {
+		record_menu = new Menu;
+		record_menu->set_name ("ArdourContextMenu");
+		using namespace Menu_Helpers;
+		MenuList& items = record_menu->items();
 
-        if (is_midi_track()) {
-                record_menu = new Menu;
-                record_menu->set_name ("ArdourContextMenu");
+		items.push_back (CheckMenuElem (_("Rec-Safe"), sigc::mem_fun (*this, &RouteUI::toggle_rec_safe)));
+		rec_safe_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
 
-                using namespace Menu_Helpers;
-                MenuList& items = record_menu->items();
+		if (is_midi_track()) {
+			items.push_back (SeparatorElem());
+			items.push_back (CheckMenuElem (_("Step Entry"), sigc::mem_fun (*this, &RouteUI::toggle_step_edit)));
+			step_edit_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
+		}
+	}
 
-                items.push_back (CheckMenuElem (_("Step Entry"), sigc::mem_fun (*this, &RouteUI::toggle_step_edit)));
-                step_edit_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
+	if (step_edit_item) {
+		if (track()->rec_enable_control()->get_value()) {
+			step_edit_item->set_sensitive (false);
+		}
+		step_edit_item->set_active (midi_track()->step_editing());
+	}
+	if (rec_safe_item) {
+		rec_safe_item->set_sensitive (!_route->rec_enable_control()->get_value());
+		rec_safe_item->set_active (_route->rec_safe_control()->get_value());
+	}
+}
 
-                if (_route->record_enabled()) {
-                        step_edit_item->set_sensitive (false);
-                }
+void
+RouteUI::toggle_step_edit ()
+{
+	if (!is_midi_track() || track()->rec_enable_control()->get_value()) {
+		return;
+	}
 
-                step_edit_item->set_active (midi_track()->step_editing());
-        }
+	midi_track()->set_step_editing (step_edit_item->get_active());
 }
 
 void
-RouteUI::toggle_step_edit ()
+RouteUI::toggle_rec_safe ()
 {
-        if (!is_midi_track() || _route->record_enabled()) {
-                return;
-        }
+	boost::shared_ptr<AutomationControl> rs = _route->rec_safe_control();
+
+	if (!rs) {
+		return;
+	}
+
+	/* This check is made inside the control too, but dong it here can't
+	 * hurt.
+	 */
+
+	if (_route->rec_enable_control()->get_value()) {
+		return;
+	}
 
-        midi_track()->set_step_editing (step_edit_item->get_active());
+	rs->set_value (rec_safe_item->get_active (), Controllable::UseGroup);
 }
 
 void
 RouteUI::step_edit_changed (bool yn)
 {
-        if (yn) {
-                if (rec_enable_button) {
-                        rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
-                }
+	if (yn) {
+		if (rec_enable_button) {
+			rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
+		}
 
-                start_step_editing ();
+		start_step_editing ();
 
-                if (step_edit_item) {
-                        step_edit_item->set_active (true);
-                }
+		if (step_edit_item) {
+			step_edit_item->set_active (true);
+		}
 
-        } else {
+	} else {
 
-                if (rec_enable_button) {
-                        rec_enable_button->unset_active_state ();
-                }
+		if (rec_enable_button) {
+			rec_enable_button->unset_active_state ();
+		}
 
-                stop_step_editing ();
+		stop_step_editing ();
 
-                if (step_edit_item) {
-                        step_edit_item->set_active (false);
-                }
-        }
+		if (step_edit_item) {
+			step_edit_item->set_active (false);
+		}
+	}
 }
 
 bool
 RouteUI::rec_enable_release (GdkEventButton* ev)
 {
-        if (Keyboard::is_context_menu_event (ev)) {
-                build_record_menu ();
-                if (record_menu) {
-                        record_menu->popup (1, ev->time);
-                }
-                return false;
-        }
+	if (Keyboard::is_context_menu_event (ev)) {
+		build_record_menu ();
+		if (record_menu) {
+			record_menu->popup (1, ev->time);
+		}
+		return false;
+	}
 
 	return false;
 }
@@ -1078,41 +1123,42 @@ RouteUI::send_blink (bool onoff)
 }
 
 Gtkmm2ext::ActiveState
-RouteUI::solo_active_state (boost::shared_ptr<Route> r)
+RouteUI::solo_active_state (boost::shared_ptr<Stripable> s)
 {
-	if (r->is_master() || r->is_monitor()) {
+	boost::shared_ptr<SoloControl> sc = s->solo_control();
+
+	if (!sc) {
 		return Gtkmm2ext::Off;
 	}
 
-	if (Config->get_solo_control_is_listen_control()) {
-
-		if (r->listening_via_monitor()) {
-			return Gtkmm2ext::ExplicitActive;
-		} else {
-			return Gtkmm2ext::Off;
-		}
-
+	if (!sc->can_solo()) {
+		return Gtkmm2ext::Off;
 	}
 
-	if (r->soloed()) {
-                if (!r->self_soloed()) {
-                        return Gtkmm2ext::ImplicitActive;
-                } else {
-                        return Gtkmm2ext::ExplicitActive;
-                }
+
+	if (sc->self_soloed()) {
+		return Gtkmm2ext::ExplicitActive;
+	} else if (sc->soloed_by_others()) {
+		return Gtkmm2ext::ImplicitActive;
 	} else {
 		return Gtkmm2ext::Off;
 	}
 }
 
 Gtkmm2ext::ActiveState
-RouteUI::solo_isolate_active_state (boost::shared_ptr<Route> r)
+RouteUI::solo_isolate_active_state (boost::shared_ptr<Stripable> s)
 {
-	if (r->is_master() || r->is_monitor()) {
+	boost::shared_ptr<SoloIsolateControl> sc = s->solo_isolate_control();
+
+	if (!sc) {
+		return Gtkmm2ext::Off;
+	}
+
+	if (s->is_master() || s->is_monitor()) {
 		return Gtkmm2ext::Off;
 	}
 
-	if (r->solo_isolated()) {
+	if (sc->solo_isolated()) {
 		return Gtkmm2ext::ExplicitActive;
 	} else {
 		return Gtkmm2ext::Off;
@@ -1120,13 +1166,19 @@ RouteUI::solo_isolate_active_state (boost::shared_ptr<Route> r)
 }
 
 Gtkmm2ext::ActiveState
-RouteUI::solo_safe_active_state (boost::shared_ptr<Route> r)
+RouteUI::solo_safe_active_state (boost::shared_ptr<Stripable> s)
 {
-	if (r->is_master() || r->is_monitor()) {
+	boost::shared_ptr<SoloSafeControl> sc = s->solo_safe_control();
+
+	if (!sc) {
 		return Gtkmm2ext::Off;
 	}
 
-	if (r->solo_safe()) {
+	if (s->is_master() || s->is_monitor()) {
+		return Gtkmm2ext::Off;
+	}
+
+	if (sc->solo_safe()) {
 		return Gtkmm2ext::ExplicitActive;
 	} else {
 		return Gtkmm2ext::Off;
@@ -1136,13 +1188,13 @@ RouteUI::solo_safe_active_state (boost::shared_ptr<Route> r)
 void
 RouteUI::update_solo_display ()
 {
-	bool yn = _route->solo_safe ();
+	bool yn = _route->solo_safe_control()->solo_safe ();
 
 	if (solo_safe_check && solo_safe_check->get_active() != yn) {
 		solo_safe_check->set_active (yn);
 	}
 
-	yn = _route->solo_isolated ();
+	yn = _route->solo_isolate_control()->solo_isolated ();
 
 	if (solo_isolated_check && solo_isolated_check->get_active() != yn) {
 		solo_isolated_check->set_active (yn);
@@ -1151,7 +1203,7 @@ RouteUI::update_solo_display ()
         set_button_names ();
 
         if (solo_isolated_led) {
-		if (_route->solo_isolated()) {
+	        if (_route->solo_isolate_control()->solo_isolated()) {
 			solo_isolated_led->set_active_state (Gtkmm2ext::ExplicitActive);
 		} else {
 			solo_isolated_led->unset_active_state ();
@@ -1159,7 +1211,7 @@ RouteUI::update_solo_display ()
         }
 
         if (solo_safe_led) {
-		if (_route->solo_safe()) {
+	        if (_route->solo_safe_control()->solo_safe()) {
 			solo_safe_led->set_active_state (Gtkmm2ext::ExplicitActive);
 		} else {
 			solo_safe_led->unset_active_state ();
@@ -1171,36 +1223,35 @@ RouteUI::update_solo_display ()
         /* some changes to solo status can affect mute display, so catch up
          */
 
-        update_mute_display ();
-}
-
-void
-RouteUI::solo_changed_so_update_mute ()
-{
 	update_mute_display ();
 }
 
 void
-RouteUI::mute_changed(void* /*src*/)
+RouteUI::solo_changed_so_update_mute ()
 {
 	update_mute_display ();
 }
 
 ActiveState
-RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
+RouteUI::mute_active_state (Session*, boost::shared_ptr<Stripable> s)
 {
-	if (r->is_monitor()) {
-		return ActiveState(0);
+	boost::shared_ptr<MuteControl> mc = s->mute_control();
+
+	if (s->is_monitor()) {
+		return Gtkmm2ext::Off;
 	}
 
+	if (!mc) {
+		return Gtkmm2ext::Off;
+	}
 
 	if (Config->get_show_solo_mutes() && !Config->get_solo_control_is_listen_control ()) {
 
-		if (r->muted ()) {
+		if (mc->muted_by_self ()) {
 			/* full mute */
 			return Gtkmm2ext::ExplicitActive;
-		} else if (!r->is_master() && s->soloing() && !r->soloed() && !r->solo_isolated()) {
-			/* master is NEVER muted by others */
+		} else if (mc->muted_by_others_soloing () || mc->muted_by_masters ()) {
+			/* this will reflect both solo mutes AND master mutes */
 			return Gtkmm2ext::ImplicitActive;
 		} else {
 			/* no mute at all */
@@ -1209,9 +1260,12 @@ RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
 
 	} else {
 
-		if (r->muted()) {
+		if (mc->muted_by_self()) {
 			/* full mute */
 			return Gtkmm2ext::ExplicitActive;
+		} else if (mc->muted_by_masters ()) {
+			/* this shows only master mutes, not mute-by-others-soloing */
+			return Gtkmm2ext::ImplicitActive;
 		} else {
 			/* no mute at all */
 			return Gtkmm2ext::Off;
@@ -1231,17 +1285,17 @@ RouteUI::update_mute_display ()
         mute_button->set_active_state (mute_active_state (_session, _route));
 }
 
+
 void
 RouteUI::route_rec_enable_changed ()
 {
-	blink_rec_display(true);  //this lets the button change "immediately" rather than wait for the next blink
-	update_monitoring_display ();
+	blink_rec_display (true);  //this lets the button change "immediately" rather than wait for the next blink
 }
 
 void
 RouteUI::session_rec_enable_changed ()
 {
-	update_monitoring_display ();
+	blink_rec_display (true);  //this lets the button change "immediately" rather than wait for the next blink
 }
 
 void
@@ -1250,11 +1304,16 @@ RouteUI::blink_rec_display (bool blinkOn)
 	if (!rec_enable_button || !_route) {
 		return;
 	}
+
 	if (boost::dynamic_pointer_cast<Send>(_current_delivery)) {
 		return;
 	}
 
-	if (_route->record_enabled()) {
+	if (!is_track()) {
+		return;
+	}
+
+	if (track()->rec_enable_control()->get_value()) {
                 switch (_session->record_status ()) {
                 case Session::Recording:
                         rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
@@ -1262,12 +1321,12 @@ RouteUI::blink_rec_display (bool blinkOn)
 
                 case Session::Disabled:
                 case Session::Enabled:
-                        if ( ARDOUR_UI::config()->get_blink_rec_arm() )
-							rec_enable_button->set_active_state ( blinkOn ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off );
-						else
-							rec_enable_button->set_active_state ( ImplicitActive );
+	                if (UIConfiguration::instance().get_blink_rec_arm()) {
+	                        rec_enable_button->set_active_state ( blinkOn ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off );
+	                } else {
+	                        rec_enable_button->set_active_state ( ImplicitActive );
+	                }
                         break;
-
                 }
 
                 if (step_edit_item) {
@@ -1282,7 +1341,6 @@ RouteUI::blink_rec_display (bool blinkOn)
                 }
 	}
 
-
 	check_rec_enable_sensitivity ();
 }
 
@@ -1297,14 +1355,14 @@ RouteUI::build_solo_menu (void)
 	Gtk::CheckMenuItem* check;
 
 	check = new Gtk::CheckMenuItem(_("Solo Isolate"));
-	check->set_active (_route->solo_isolated());
+	check->set_active (_route->solo_isolate_control()->solo_isolated());
 	check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_isolated), check));
 	items.push_back (CheckMenuElem(*check));
         solo_isolated_check = dynamic_cast<Gtk::CheckMenuItem*>(&items.back());
 	check->show_all();
 
 	check = new Gtk::CheckMenuItem(_("Solo Safe"));
-	check->set_active (_route->solo_safe());
+	check->set_active (_route->solo_safe_control()->solo_safe());
 	check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_safe), check));
 	items.push_back (CheckMenuElem(*check));
         solo_safe_check = dynamic_cast<Gtk::CheckMenuItem*>(&items.back());
@@ -1358,16 +1416,16 @@ RouteUI::build_mute_menu(void)
 void
 RouteUI::init_mute_menu(MuteMaster::MutePoint mp, Gtk::CheckMenuItem* check)
 {
-	check->set_active (_route->mute_points() & mp);
+	check->set_active (_route->mute_control()->mute_points() & mp);
 }
 
 void
 RouteUI::toggle_mute_menu(MuteMaster::MutePoint mp, Gtk::CheckMenuItem* check)
 {
 	if (check->get_active()) {
-		_route->set_mute_points (MuteMaster::MutePoint (_route->mute_points() | mp));
+		_route->mute_control()->set_mute_points (MuteMaster::MutePoint (_route->mute_control()->mute_points() | mp));
 	} else {
-		_route->set_mute_points (MuteMaster::MutePoint (_route->mute_points() & ~mp));
+		_route->mute_control()->set_mute_points (MuteMaster::MutePoint (_route->mute_control()->mute_points() & ~mp));
 	}
 }
 
@@ -1377,7 +1435,7 @@ RouteUI::muting_change ()
 	ENSURE_GUI_THREAD (*this, &RouteUI::muting_change)
 
 	bool yn;
-	MuteMaster::MutePoint current = _route->mute_points ();
+	MuteMaster::MutePoint current = _route->mute_control()->mute_points ();
 
 	yn = (current & MuteMaster::PreFader);
 
@@ -1412,7 +1470,7 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev)
 	}
 
 	bool view = solo_isolated_led->active_state();
-	bool model = _route->solo_isolated();
+	bool model = _route->solo_isolate_control()->solo_isolated();
 
 	/* called BEFORE the view has changed */
 
@@ -1422,10 +1480,15 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev)
 			if (model) {
 				/* disable isolate for all routes */
 				DisplaySuspender ds;
-				_session->set_solo_isolated (_session->get_routes(), false, Session::rt_cleanup, true);
+				_session->set_controls (route_list_to_control_list (_session->get_routes(), &Stripable::solo_isolate_control), 0.0, Controllable::NoGroup);
+			} else {
+				/* enable isolate for all routes */
+				DisplaySuspender ds;
+				_session->set_controls (route_list_to_control_list (_session->get_routes(), &Stripable::solo_isolate_control), 1.0, Controllable::NoGroup);
 			}
 
 		} else {
+
 			if (model == view) {
 
 				/* flip just this route */
@@ -1433,7 +1496,7 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev)
 				boost::shared_ptr<RouteList> rl (new RouteList);
 				rl->push_back (_route);
 				DisplaySuspender ds;
-				_session->set_solo_isolated (rl, !view, Session::rt_cleanup, true);
+				_session->set_controls (route_list_to_control_list (rl, &Stripable::solo_isolate_control), view ? 0.0 : 1.0, Controllable::NoGroup);
 			}
 		}
 	}
@@ -1444,9 +1507,38 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev)
 bool
 RouteUI::solo_safe_button_release (GdkEventButton* ev)
 {
+	if (ev->type == GDK_2BUTTON_PRESS || ev->type == GDK_3BUTTON_PRESS) {
+		return true;
+	}
+
+	bool view = solo_safe_led->active_state();
+	bool model = _route->solo_safe_control()->solo_safe();
+
 	if (ev->button == 1) {
-		_route->set_solo_safe (!solo_safe_led->active_state(), this);
+		if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
+			boost::shared_ptr<RouteList> rl (_session->get_routes());
+			if (model) {
+				/* disable solo safe for all routes */
+				DisplaySuspender ds;
+				for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+					(*i)->solo_safe_control()->set_value (0.0, Controllable::NoGroup);
+				}
+			} else {
+				/* enable solo safe for all routes */
+				DisplaySuspender ds;
+				for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+					(*i)->solo_safe_control()->set_value (1.0, Controllable::NoGroup);
+				}
+			}
+		}
+		else {
+			if (model == view) {
+				/* flip just this route */
+				_route->solo_safe_control()->set_value (view ? 0.0 : 1.0, Controllable::NoGroup);
+			}
+		}
 	}
+
 	return false;
 }
 
@@ -1454,19 +1546,19 @@ void
 RouteUI::toggle_solo_isolated (Gtk::CheckMenuItem* check)
 {
         bool view = check->get_active();
-        bool model = _route->solo_isolated();
+        bool model = _route->solo_isolate_control()->solo_isolated();
 
         /* called AFTER the view has changed */
 
         if (model != view) {
-                _route->set_solo_isolated (view, this);
+	        _route->solo_isolate_control()->set_value (view ? 1.0 : 0.0, Controllable::UseGroup);
         }
 }
 
 void
 RouteUI::toggle_solo_safe (Gtk::CheckMenuItem* check)
 {
-	_route->set_solo_safe (check->get_active(), this);
+	_route->solo_safe_control()->set_value (check->get_active() ? 1.0 : 0.0, Controllable::UseGroup);
 }
 
 /** Ask the user to choose a colour, and then apply that color to my route
@@ -1475,10 +1567,11 @@ void
 RouteUI::choose_color ()
 {
 	bool picked;
-	Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &_color);
+	Gdk::Color c (gdk_color_from_rgb (_route->presentation_info().color()));
+	Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &c);
 
 	if (picked) {
-		set_color(color);
+		set_color (gdk_color_to_rgba (color));
 	}
 }
 
@@ -1486,22 +1579,9 @@ RouteUI::choose_color ()
  *  the route is in a group which shares its color with its routes.
  */
 void
-RouteUI::set_color (const Gdk::Color & c)
+RouteUI::set_color (uint32_t c)
 {
-	/* leave _color alone in the group case so that tracks can retain their
-	 * own pre-group colors.
-	 */
-
-	char buf[64];
-	_color = c;
-	snprintf (buf, sizeof (buf), "%d:%d:%d", c.get_red(), c.get_green(), c.get_blue());
-	
-	/* note: we use the route state ID here so that color is the same for both
-	   the time axis view and the mixer strip
-	*/
-	
-	gui_object_state().set_property<string> (route_state_id(), X_("color"), buf);
-	_route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
+	_route->presentation_info().set_color (c);
 }
 
 /** @return GUI state ID for things that are common to the route in all its representations */
@@ -1514,81 +1594,11 @@ RouteUI::route_state_id () const
 int
 RouteUI::set_color_from_route ()
 {
-	const string str = gui_object_state().get_string (route_state_id(), X_("color"));
-
-	if (str.empty()) {
-		return 1;
+	if (_route->presentation_info().color_set()) {
+		return 0; /* nothing to do */
 	}
 
-	int r, g, b;
-
-	sscanf (str.c_str(), "%d:%d:%d", &r, &g, &b);
-
-	_color.set_red (r);
-	_color.set_green (g);
-	_color.set_blue (b);
-
-	return 0;
-}
-
-void
-RouteUI::remove_this_route (bool apply_to_selection)
-{
-	if (apply_to_selection) {
-		ARDOUR_UI::instance()->the_editor().get_selection().tracks.foreach_route_ui (boost::bind (&RouteUI::remove_this_route, _1, false));
-	} else {
-		if ((route()->is_master() || route()->is_monitor()) &&
-		    !Config->get_allow_special_bus_removal()) {
-			MessageDialog msg (_("That would be bad news ...."),
-					   false,
-					   Gtk::MESSAGE_INFO,
-                                   Gtk::BUTTONS_OK);
-			msg.set_secondary_text (string_compose (_(
-"Removing the master or monitor bus is such a bad idea\n\
-that %1 is not going to allow it.\n\
-\n\
-If you really want to do this sort of thing\n\
-edit your ardour.rc file to set the\n\
-\"allow-special-bus-removal\" option to be \"yes\""), PROGRAM_NAME));
-
-			msg.present ();
-			msg.run ();
-			return;
-		}
-
-		vector<string> choices;
-		string prompt;
-
-		if (is_track()) {
-			prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\n\nYou may also lose the playlist used by this track.\n\n(This action cannot be undone, and the session file will be overwritten)"), _route->name());
-		} else {
-			prompt  = string_compose (_("Do you really want to remove bus \"%1\" ?\n\n(This action cannot be undone, and the session file will be overwritten)"), _route->name());
-		}
-
-		choices.push_back (_("No, do nothing."));
-		choices.push_back (_("Yes, remove it."));
-
-		string title;
-		if (is_track()) {
-			title = _("Remove track");
-		} else {
-			title = _("Remove bus");
-		}
-
-		Choice prompter (title, prompt, choices);
-
-		if (prompter.run () == 1) {
-			Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (&RouteUI::idle_remove_this_route), this));
-		}
-	}
-}
-
-gint
-RouteUI::idle_remove_this_route (RouteUI *rui)
-{
-	DisplaySuspender ds;
-	rui->_session->remove_route (rui->route());
-	return false;
+	return 1; /* pick a color */
 }
 
 /** @return true if this name should be used for the route, otherwise false */
@@ -1598,12 +1608,12 @@ RouteUI::verify_new_route_name (const std::string& name)
 	if (name.find (':') == string::npos) {
 		return true;
 	}
-	
+
 	MessageDialog colon_msg (
 		_("The use of colons (':') is discouraged in track and bus names.\nDo you want to use this new name?"),
 		false, MESSAGE_QUESTION, BUTTONS_NONE
 		);
-	
+
 	colon_msg.add_button (_("Use the new name"), Gtk::RESPONSE_ACCEPT);
 	colon_msg.add_button (_("Re-edit the name"), Gtk::RESPONSE_CANCEL);
 
@@ -1656,14 +1666,6 @@ RouteUI::route_rename ()
 
 }
 
-void
-RouteUI::property_changed (const PropertyChange& what_changed)
-{
-	if (what_changed.contains (ARDOUR::Properties::name)) {
-		name_label.set_text (_route->name());
-	}
-}
-
 void
 RouteUI::toggle_comment_editor ()
 {
@@ -1713,17 +1715,13 @@ RouteUI::setup_comment_editor ()
 }
 
 void
-RouteUI::comment_changed (void *src)
+RouteUI::comment_changed ()
 {
-	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;
+	ignore_comment_edit = true;
+	if (comment_area) {
+		comment_area->get_buffer()->set_text (_route->comment());
 	}
+	ignore_comment_edit = false;
 }
 
 void
@@ -1749,6 +1747,12 @@ RouteUI::set_route_active (bool a, bool apply_to_selection)
 	}
 }
 
+void
+RouteUI::duplicate_selected_routes ()
+{
+	ARDOUR_UI::instance()->start_duplicate_routes();
+}
+
 void
 RouteUI::toggle_denormal_protection ()
 {
@@ -1826,28 +1830,15 @@ RouteUI::has_audio_outputs () const
 	return (_route->n_outputs().n_audio() > 0);
 }
 
-string
-RouteUI::name() const
-{
-	return _route->name();
-}
-
 void
 RouteUI::map_frozen ()
 {
 	ENSURE_GUI_THREAD (*this, &RouteUI::map_frozen)
 
- 	AudioTrack* at = dynamic_cast<AudioTrack*>(_route.get());
+	AudioTrack* at = dynamic_cast<AudioTrack*>(_route.get());
 
 	if (at) {
-		switch (at->freeze_state()) {
-		case AudioTrack::Frozen:
-			rec_enable_button->set_sensitive (false);
-			break;
-		default:
-			rec_enable_button->set_sensitive (true);
-			break;
-		}
+		check_rec_enable_sensitivity ();
 	}
 }
 
@@ -1857,52 +1848,90 @@ RouteUI::adjust_latency ()
 	LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session->frame_rate(), AudioEngine::instance()->samples_per_cycle());
 }
 
-void
-RouteUI::save_as_template ()
+bool
+RouteUI::process_save_template_prompter (ArdourPrompter& prompter, const std::string& dir)
 {
 	std::string path;
 	std::string safe_name;
-	string name;
+	std::string name;
 
-	path = ARDOUR::user_route_template_directory ();
+	prompter.get_result (name, true);
 
-	if (g_mkdir_with_parents (path.c_str(), 0755)) {
-		error << string_compose (_("Cannot create route template directory %1"), path) << endmsg;
-		return;
+	safe_name = legalize_for_path (name);
+	safe_name += template_suffix;
+
+	path = Glib::build_filename (dir, safe_name);
+
+	if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
+		bool overwrite = overwrite_file_dialog (prompter,
+		                                        _("Confirm Template Overwrite"),
+							_("A template already exists with that name. Do you want to overwrite it?"));
+
+		if (!overwrite) {
+			return false;
+		}
 	}
 
-	Prompter p (true); // modal
+	_route->save_as_template (path, name);
+
+	return true;
+}
+
+void
+RouteUI::save_as_template ()
+{
+	std::string dir;
 
-	p.set_title (_("Save As Template"));
-	p.set_prompt (_("Template name:"));
-	p.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
-	switch (p.run()) {
-	case RESPONSE_ACCEPT:
-		break;
-	default:
+	dir = ARDOUR::user_route_template_directory ();
+
+	if (g_mkdir_with_parents (dir.c_str(), 0755)) {
+		error << string_compose (_("Cannot create route template directory %1"), dir) << endmsg;
 		return;
 	}
 
-	p.hide ();
-	p.get_result (name, true);
-
-	safe_name = legalize_for_path (name);
-	safe_name += template_suffix;
+	ArdourPrompter prompter (true); // modal
 
-	path = Glib::build_filename (path, safe_name);
+	prompter.set_title (_("Save As Template"));
+	prompter.set_prompt (_("Template name:"));
+	prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
 
-	_route->save_as_template (path, name);
+	bool finished = false;
+	while (!finished) {
+		switch (prompter.run()) {
+		case RESPONSE_ACCEPT:
+			finished = process_save_template_prompter (prompter, dir);
+			break;
+		default:
+			finished = true;
+			break;
+		}
+	}
 }
 
 void
 RouteUI::check_rec_enable_sensitivity ()
 {
+	if (!rec_enable_button) {
+		assert (0); // This should not happen
+		return;
+	}
+	if (!_session->writable()) {
+		rec_enable_button->set_sensitive (false);
+		return;
+	}
+
 	if (_session->transport_rolling() && rec_enable_button->active_state() && Config->get_disable_disarm_during_roll()) {
 		rec_enable_button->set_sensitive (false);
+	} else if (is_audio_track ()  && track()->freeze_state() == AudioTrack::Frozen) {
+		rec_enable_button->set_sensitive (false);
 	} else {
 		rec_enable_button->set_sensitive (true);
 	}
-
+	if (_route && _route->rec_safe_control () && _route->rec_safe_control()->get_value()) {
+		rec_enable_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
+	} else {
+		rec_enable_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
+	}
 	update_monitoring_display ();
 }
 
@@ -1918,11 +1947,12 @@ RouteUI::parameter_changed (string const & p)
 	} else if (p == "auto-input") {
 		update_monitoring_display ();
 	} else if (p == "blink-rec-arm") {
-		if (ARDOUR_UI::config()->get_blink_rec_arm()) {
+		if (UIConfiguration::instance().get_blink_rec_arm()) {
 			rec_blink_connection.disconnect ();
-			rec_blink_connection = ARDOUR_UI::instance()->Blink.connect (sigc::mem_fun (*this, &RouteUI::blink_rec_display));
+			rec_blink_connection = Timers::blink_connect (sigc::mem_fun (*this, &RouteUI::blink_rec_display));
 		} else {
 			rec_blink_connection.disconnect ();
+			RouteUI::blink_rec_display(false);
 		}
 	}
 }
@@ -1930,80 +1960,25 @@ RouteUI::parameter_changed (string const & p)
 void
 RouteUI::step_gain_up ()
 {
-	_route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.1), this);
+	_route->gain_control()->set_value (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.1), Controllable::UseGroup);
 }
 
 void
 RouteUI::page_gain_up ()
 {
-	_route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.5), this);
+	_route->gain_control()->set_value (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.5), Controllable::UseGroup);
 }
 
 void
 RouteUI::step_gain_down ()
 {
-	_route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.1), this);
+	_route->gain_control()->set_value (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.1), Controllable::UseGroup);
 }
 
 void
 RouteUI::page_gain_down ()
 {
-	_route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), this);
-}
-
-void
-RouteUI::open_remote_control_id_dialog ()
-{
-	ArdourDialog dialog (_("Remote Control ID"));
-	SpinButton* spin = 0;
-
-	dialog.get_vbox()->set_border_width (18);
-
-	if (Config->get_remote_model() == UserOrdered) {
-		uint32_t const limit = _session->ntracks() + _session->nbusses () + 4;
-		
-		HBox* hbox = manage (new HBox);
-		hbox->set_spacing (6);
-		hbox->pack_start (*manage (new Label (_("Remote control ID:"))));
-		spin = manage (new SpinButton);
-		spin->set_digits (0);
-		spin->set_increments (1, 10);
-		spin->set_range (0, limit);
-		spin->set_value (_route->remote_control_id());
-		hbox->pack_start (*spin);
-		dialog.get_vbox()->pack_start (*hbox);
-		
-		dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL);
-		dialog.add_button (Stock::APPLY, RESPONSE_ACCEPT);
-	} else {
-		Label* l = manage (new Label());
-		if (_route->is_master() || _route->is_monitor()) {
-			l->set_markup (string_compose (_("The remote control ID of %1 is: %2\n\n\n"
-							 "The remote control ID of %3 cannot be changed."),
-						       Glib::Markup::escape_text (_route->name()),
-						       _route->remote_control_id(),
-						       (_route->is_master() ? _("the master bus") : _("the monitor bus"))));
-		} else {
-			l->set_markup (string_compose (_("The remote control ID of %5 is: %2\n\n\n"
-							 "Remote Control IDs are currently determined by track/bus ordering in %6.\n\n"
-							 "%3Use the User Interaction tab of the Preferences window if you want to change this%4"),
-						       (is_track() ? _("track") : _("bus")),
-						       _route->remote_control_id(),
-						       "<span size=\"small\" style=\"italic\">",
-						       "</span>",
-						       Glib::Markup::escape_text (_route->name()),
-						       PROGRAM_NAME));
-		}
-		dialog.get_vbox()->pack_start (*l);
-		dialog.add_button (Stock::OK, RESPONSE_CANCEL);
-	}
-
-	dialog.show_all ();
-	int const r = dialog.run ();
-
-	if (r == RESPONSE_ACCEPT && spin) {
-		_route->set_remote_control_id (spin->get_value_as_int ());
-	}
+	_route->gain_control()->set_value (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), Controllable::UseGroup);
 }
 
 void
@@ -2041,9 +2016,9 @@ RouteUI::setup_invert_buttons ()
 		}
 
 		if (N <= _max_invert_buttons) {
-			UI::instance()->set_tip (*b, string_compose (_("Left-click to invert (phase reverse) channel %1 of this track.  Right-click to show menu."), i + 1));
+			UI::instance()->set_tip (*b, string_compose (_("Left-click to invert polarity of channel %1 of this track. Right-click to show menu."), i + 1));
 		} else {
-			UI::instance()->set_tip (*b, _("Click to show a menu of channels for inversion (phase reverse)"));
+			UI::instance()->set_tip (*b, _("Click to show a menu of channels to invert polarity"));
 		}
 
 		_invert_buttons.push_back (b);
@@ -2065,10 +2040,10 @@ RouteUI::set_invert_button_state ()
 		*/
 
 		ArdourButton* b = _invert_buttons.front ();
-		
-		if (_route->phase_invert().count() == _route->phase_invert().size()) {
+
+		if (_route->phase_control()->count() == _route->phase_control()->size()) {
 			b->set_active_state (Gtkmm2ext::ExplicitActive);
-		} else if (_route->phase_invert().any()) {
+		} else if (_route->phase_control()->any()) {
 			b->set_active_state (Gtkmm2ext::ImplicitActive);
 		} else {
 			b->set_active_state (Gtkmm2ext::Off);
@@ -2080,9 +2055,9 @@ RouteUI::set_invert_button_state ()
 
 		int j = 0;
 		for (vector<ArdourButton*>::iterator i = _invert_buttons.begin(); i != _invert_buttons.end(); ++i, ++j) {
-			(*i)->set_active (_route->phase_invert (j));
+			(*i)->set_active (_route->phase_control()->inverted (j));
 		}
-		
+
 	}
 }
 
@@ -2093,7 +2068,7 @@ RouteUI::invert_release (GdkEventButton* ev, uint32_t i)
 		uint32_t const N = _route->input()->n_ports().n_audio ();
 		if (N <= _max_invert_buttons) {
 			/* left-click inverts phase so long as we have a button per channel */
-			_route->set_phase_invert (i, !_invert_buttons[i]->get_active());
+			_route->phase_control()->set_phase_invert (i, !_invert_buttons[i]->get_active());
 			return false;
 		}
 	}
@@ -2114,7 +2089,7 @@ RouteUI::invert_press (GdkEventButton* ev)
 		*/
 		return false;
 	}
-	
+
 	delete _invert_menu;
 	_invert_menu = new Menu;
 	_invert_menu->set_name ("ArdourContextMenu");
@@ -2124,7 +2099,7 @@ RouteUI::invert_press (GdkEventButton* ev)
 		items.push_back (CheckMenuElem (string_compose (X_("Ø%1"), i + 1), sigc::bind (sigc::mem_fun (*this, &RouteUI::invert_menu_toggled), i)));
 		Gtk::CheckMenuItem* e = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
 		++_i_am_the_modifier;
-		e->set_active (_route->phase_invert (i));
+		e->set_active (_route->phase_control()->inverted (i));
 		--_i_am_the_modifier;
 	}
 
@@ -2140,7 +2115,8 @@ RouteUI::invert_menu_toggled (uint32_t c)
 		return;
 	}
 
-	_route->set_phase_invert (c, !_route->phase_invert (c));
+
+	_route->phase_control()->set_phase_invert (c, !_route->phase_control()->inverted (c));
 }
 
 void
@@ -2161,9 +2137,9 @@ RouteUI::request_redraw ()
 
 /** The Route's gui_changed signal has been emitted */
 void
-RouteUI::route_gui_changed (string what_changed)
+RouteUI::route_gui_changed (PropertyChange const& what_changed)
 {
-	if (what_changed == "color") {
+	if (what_changed.contains (Properties::color)) {
 		if (set_color_from_route () == 0) {
 			route_color_changed ();
 		}
@@ -2177,10 +2153,10 @@ RouteUI::track_mode_changed (void)
 	switch (track()->mode()) {
 		case ARDOUR::NonLayered:
 		case ARDOUR::Normal:
-			rec_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::RecButton));
+			rec_enable_button->set_icon (ArdourIcon::RecButton);
 			break;
 		case ARDOUR::Destructive:
-			rec_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::RecButton|ArdourButton::RecTapeMode));
+			rec_enable_button->set_icon (ArdourIcon::RecTapeMode);
 			break;
 	}
 	rec_enable_button->queue_draw();
@@ -2189,18 +2165,55 @@ RouteUI::track_mode_changed (void)
 /** @return the color that this route should use; it maybe its own,
     or it maybe that of its route group.
 */
+
 Gdk::Color
-RouteUI::color () const
+RouteUI::route_color () const
 {
+	Gdk::Color c;
 	RouteGroup* g = _route->route_group ();
-	
+	string p;
+
 	if (g && g->is_color()) {
-		Gdk::Color c;
 		set_color_from_rgba (c, GroupTabs::group_color (g));
-		return c;
+	} else {
+
+		/* deal with older 4.x color, which was stored in the GUI object state */
+
+		string p = ARDOUR_UI::instance()->gui_object_state->get_string (route_state_id(), X_("color"));
+
+		if (!p.empty()) {
+
+			/* old v4.x or earlier session. Use this information */
+
+			int red, green, blue;
+			char colon;
+
+			stringstream ss (p);
+
+			/* old color format version was:
+
+			   16bit value for red:16 bit value for green:16 bit value for blue
+
+			   decode to rgb ..
+			*/
+
+			ss >> red;
+			ss >> colon;
+			ss >> green;
+			ss >> colon;
+			ss >> blue;
+
+			red >>= 2;
+			green >>= 2;
+			blue >>= 2;
+
+			_route->presentation_info().set_color (RGBA_TO_UINT (red, green, blue, 255));
+		}
+
+		set_color_from_rgba (c, _route->presentation_info().color());
 	}
 
-	return _color;
+	return c;
 }
 
 void
@@ -2215,7 +2228,7 @@ RouteUI::bus_send_display_changed (boost::shared_ptr<Route> send_to)
 {
 	if (_route == send_to) {
 		show_sends_button->set_active (true);
-		send_blink_connection = ARDOUR_UI::instance()->Blink.connect (sigc::mem_fun (*this, &RouteUI::send_blink));
+		send_blink_connection = Timers::blink_connect (sigc::mem_fun (*this, &RouteUI::send_blink));
 	} else {
 		show_sends_button->set_active (false);
 		send_blink_connection.disconnect ();
@@ -2227,3 +2240,108 @@ RouteUI::route_group() const
 {
 	return _route->route_group();
 }
+
+
+RoutePinWindowProxy::RoutePinWindowProxy(std::string const &name, boost::shared_ptr<ARDOUR::Route> route)
+	: WM::ProxyBase (name, string())
+	, _route (boost::weak_ptr<Route> (route))
+{
+	route->DropReferences.connect (going_away_connection, MISSING_INVALIDATOR, boost::bind (&RoutePinWindowProxy::route_going_away, this), gui_context());
+}
+
+RoutePinWindowProxy::~RoutePinWindowProxy()
+{
+	_window = 0;
+}
+
+ARDOUR::SessionHandlePtr*
+RoutePinWindowProxy::session_handle ()
+{
+	ArdourWindow* aw = dynamic_cast<ArdourWindow*> (_window);
+	if (aw) { return aw; }
+	return 0;
+}
+
+Gtk::Window*
+RoutePinWindowProxy::get (bool create)
+{
+	boost::shared_ptr<Route> r = _route.lock ();
+	if (!r) {
+		return 0;
+	}
+
+	if (!_window) {
+		if (!create) {
+			return 0;
+		}
+		_window = new PluginPinDialog (r);
+		ArdourWindow* aw = dynamic_cast<ArdourWindow*> (_window);
+		if (aw) {
+			aw->set_session (_session);
+		}
+		_window->show_all ();
+	}
+	return _window;
+}
+
+void
+RoutePinWindowProxy::route_going_away ()
+{
+	delete _window;
+	_window = 0;
+	WM::Manager::instance().remove (this);
+	going_away_connection.disconnect();
+}
+
+void
+RouteUI::maybe_add_route_print_mgr ()
+{
+	if (_route->pinmgr_proxy ()) {
+		return;
+	}
+	RoutePinWindowProxy* wp = new RoutePinWindowProxy (
+			string_compose ("RPM-%1", _route->id()), _route);
+	wp->set_session (_session);
+
+	const XMLNode* ui_xml = _session->extra_xml (X_("UI"));
+	if (ui_xml) {
+		wp->set_state (*ui_xml, 0);
+	}
+
+#if 0
+	void* existing_ui = _route->pinmgr_proxy ();
+	if (existing_ui) {
+		wp->use_window (*(reinterpret_cast<Gtk::Window*>(existing_ui)));
+	}
+#endif
+	_route->set_pingmgr_proxy (wp);
+
+	WM::Manager::instance().register_window (wp);
+}
+
+void
+RouteUI::manage_pins ()
+{
+	RoutePinWindowProxy* proxy = _route->pinmgr_proxy ();
+	if (proxy) {
+		proxy->get (true);
+		proxy->present();
+	}
+}
+
+bool
+RouteUI::mark_hidden (bool yn)
+{
+	if (yn != _route->presentation_info().hidden()) {
+		_route->presentation_info().set_hidden (yn);
+		return true; // things changed
+	}
+	return false;
+}
+
+boost::shared_ptr<Stripable>
+RouteUI::stripable () const
+{
+	return _route;
+}
+