use modified API name in GUI
[ardour.git] / gtk2_ardour / route_ui.cc
index c1f62f3a20e13c9d186bd237f2447f2d9392b049..dd36aa05c981df70dcc1885751390c675b7ba038 100644 (file)
 
 */
 
+#include <map>
 #include <boost/algorithm/string.hpp>
 
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/doi.h>
-#include <gtkmm2ext/bindable_button.h>
-#include <gtkmm2ext/barcontroller.h>
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/utils.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/memento_command.h"
 #include "pbd/stacktrace.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_ui.h"
-#include "editor.h"
-#include "route_ui.h"
-#include "ardour_button.h"
-#include "keyboard.h"
-#include "utils.h"
-#include "plugin_pin_dialog.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 "timers.h"
-#include "ui_config.h"
-
 #include "ardour/audio_track.h"
+#include "ardour/audio_port.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/panner_shell.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 "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/doi.h"
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/utils.h"
+
+#include "widgets/ardour_button.h"
+#include "widgets/binding_proxy.h"
+#include "widgets/prompter.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 "patch_change_widget.h"
+#include "plugin_pin_dialog.h"
+#include "rgb_macros.h"
+#include "route_time_axis.h"
+#include "route_ui.h"
+#include "save_template_dialog.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 ArdourWidgets;
 using namespace PBD;
 using namespace std;
 
@@ -80,7 +92,8 @@ boost::weak_ptr<Route> RouteUI::_showing_sends_to;
 std::string RouteUI::program_port_prefix;
 
 RouteUI::RouteUI (ARDOUR::Session* sess)
-       : AxisView(sess)
+       : monitor_input_button (0)
+       , monitor_disk_button (0)
        , mute_menu(0)
        , solo_menu(0)
        , sends_menu(0)
@@ -97,15 +110,20 @@ RouteUI::RouteUI (ARDOUR::Session* sess)
                boost::to_lower (lpn);
                program_port_prefix = lpn + ":"; // e.g. "ardour:"
        }
-       if (sess) init ();
+
+       if (sess) {
+               init ();
+       }
 }
 
 RouteUI::~RouteUI()
 {
        if (_route) {
-               gui_object_state().remove_node (route_state_id());
+               ARDOUR_UI::instance()->gui_object_state->remove_node (route_state_id());
        }
 
+       delete_patch_change_dialog ();
+
        _route.reset (); /* drop reference to route, so that it can be cleaned up */
        route_connections.drop_connections ();
 
@@ -116,6 +134,8 @@ RouteUI::~RouteUI()
        delete comment_window;
        delete input_selector;
        delete output_selector;
+       delete monitor_input_button;
+       delete monitor_disk_button;
        delete _invert_menu;
 
        send_blink_connection.disconnect ();
@@ -147,7 +167,6 @@ RouteUI::init ()
        multiple_mute_change = false;
        multiple_solo_change = false;
        _i_am_the_modifier = 0;
-       vca_button = 0;
 
        input_selector = 0;
        output_selector = 0;
@@ -176,13 +195,13 @@ RouteUI::init ()
        show_sends_button->set_name ("send alert button");
        UI::instance()->set_tip (show_sends_button, _("make mixer strips show sends to this bus"), "");
 
-       monitor_input_button = manage (new ArdourButton (ArdourButton::default_elements));
+       monitor_input_button = new ArdourButton (ArdourButton::default_elements);
        monitor_input_button->set_name ("monitor button");
        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 = new ArdourButton (ArdourButton::default_elements);
        monitor_disk_button->set_name ("monitor button");
        monitor_disk_button->set_text (_("Disk"));
        UI::instance()->set_tip (monitor_disk_button, _("Monitor playback"), "");
@@ -194,6 +213,7 @@ RouteUI::init ()
 
        _session->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&RouteUI::parameter_changed, this, _1), gui_context());
        Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&RouteUI::parameter_changed, this, _1), gui_context());
+       UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (this, &RouteUI::parameter_changed));
 
        rec_enable_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_press), false);
        rec_enable_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_release), false);
@@ -229,6 +249,9 @@ RouteUI::reset ()
        delete mute_menu;
        mute_menu = 0;
 
+       delete_patch_change_dialog ();
+       _color_picker.reset ();
+
        denormal_menu_item = 0;
 }
 
@@ -245,8 +268,43 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 
        _route = rp;
 
+       if ( !_route->presentation_info().color_set() ) {
+               /* 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));
+               }
+       }
+
        if (set_color_from_route()) {
-               set_color (unique_random_color());
+               set_color (gdk_color_to_rgba (AxisView::unique_random_color ()));
        }
 
        if (self_destruct) {
@@ -270,36 +328,33 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
        _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());
-
-       if (_route->phase_control()) {
-               _route->phase_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::polarity_changed, this), gui_context());
-       }
+       _route->phase_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::polarity_changed, this), gui_context());
+       _route->fan_out.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::fan_out, this, true, true), 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->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->RecordSafeChanged.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());
 
-                if (is_midi_track()) {
-                        midi_track()->StepEditStatusChange.connect (route_connections, invalidator (*this),
-                                                                    boost::bind (&RouteUI::step_edit_changed, this, _1), gui_context());
-                }
+               if (is_midi_track()) {
+                       midi_track()->StepEditStatusChange.connect (route_connections, invalidator (*this),
+                                       boost::bind (&RouteUI::step_edit_changed, this, _1), gui_context());
+               }
 
        }
 
@@ -309,7 +364,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 ();
        }
@@ -343,14 +398,15 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
        check_rec_enable_sensitivity ();
        maybe_add_route_print_mgr ();
        route_color_changed();
+       route_gui_changed (PropertyChange (Properties::selected));
 }
 
 void
 RouteUI::polarity_changed ()
 {
-        if (!_route) {
-                return;
-        }
+       if (!_route) {
+               return;
+       }
 
        set_invert_button_state ();
 }
@@ -363,7 +419,7 @@ RouteUI::mute_press (GdkEventButton* ev)
        }
 
        //if this is a binding action, let the ArdourButton handle it
-       if ( BindingProxy::is_bind_action(ev) )
+       if (BindingProxy::is_bind_action(ev) )
                return false;
 
        multiple_mute_change = false;
@@ -383,7 +439,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)) {
@@ -414,8 +470,7 @@ RouteUI::mute_press (GdkEventButton* ev)
                                        _mute_release->routes = copy;
                                }
 
-                               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)) {
 
@@ -443,8 +498,9 @@ RouteUI::mute_press (GdkEventButton* ev)
                                                _mute_release->routes = rl;
                                        }
 
-                                       DisplaySuspender ds;
-                                       _session->set_mute (rl, !_route->muted(), Session::rt_cleanup, Controllable::InverseGroup);
+                                       boost::shared_ptr<MuteControl> mc = _route->mute_control();
+                                       mc->start_touch (_session->audible_frame ());
+                                       _session->set_controls (route_list_to_control_list (rl, &Stripable::mute_control), _route->muted_by_self() ? 0.0 : 1.0, Controllable::InverseGroup);
                                }
 
                        } else {
@@ -458,8 +514,9 @@ RouteUI::mute_press (GdkEventButton* ev)
                                        _mute_release->routes = rl;
                                }
 
-                               _session->set_mute (rl, !_route->muted());
-
+                               boost::shared_ptr<MuteControl> mc = _route->mute_control();
+                               mc->start_touch (_session->audible_frame ());
+                               mc->set_value (!_route->muted_by_self(), Controllable::UseGroup);
                        }
                }
        }
@@ -471,12 +528,13 @@ bool
 RouteUI::mute_release (GdkEventButton* /*ev*/)
 {
        if (_mute_release){
-               DisplaySuspender ds;
-               _session->set_mute (_mute_release->routes, _mute_release->active, Session::rt_cleanup, Controllable::UseGroup);
+               _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;
        }
 
+       _route->mute_control()->stop_touch (_session->audible_frame ());
+
        return false;
 }
 
@@ -536,7 +594,7 @@ RouteUI::solo_press(GdkEventButton* ev)
        }
 
        //if this is a binding action, let the ArdourButton handle it
-       if ( BindingProxy::is_bind_action(ev) )
+       if (BindingProxy::is_bind_action(ev) )
                return false;
 
        multiple_solo_change = false;
@@ -571,23 +629,25 @@ RouteUI::solo_press(GdkEventButton* ev)
                                        _solo_release->routes = _session->get_routes ();
                                }
 
-                               DisplaySuspender ds;
-                               if (Config->get_solo_control_is_listen_control()) {
-                                       _session->set_listen (_session->get_routes(), !_route->listening_via_monitor(),  Session::rt_cleanup, Controllable::UseGroup);
-                               } else {
-                                       _session->set_solo (_session->get_routes(), !_route->self_soloed(),  Session::rt_cleanup, Controllable::UseGroup);
-                               }
+                               _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))) {
 
-                               // Primary-Secondary-click: exclusively solo this track
+                               /* Primary-Secondary-click: exclusively solo this track */
 
                                if (_solo_release) {
                                        _solo_release->exclusive = true;
 
-                                       boost::shared_ptr<RouteList> routes = _session->get_routes();
+                                       _solo_release->routes_on.reset (new RouteList);
+                                       _solo_release->routes_off.reset (new RouteList);
 
-                                       for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+                                       boost::shared_ptr<RouteList> routes = _session->get_routes();
+                                       for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+#ifdef MIXBUS
+                                               if ((0 == _route->mixbus()) != (0 == (*i)->mixbus ())) {
+                                                       continue;
+                                               }
+#endif
                                                if ((*i)->soloed ()) {
                                                        _solo_release->routes_on->push_back (*i);
                                                } else {
@@ -596,18 +656,32 @@ RouteUI::solo_press(GdkEventButton* ev)
                                        }
                                }
 
+                               boost::shared_ptr<RouteList> rl (new RouteList);
+                               boost::shared_ptr<RouteList> routes = _session->get_routes();
+                               for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+#ifdef MIXBUS
+                                       if ((0 == _route->mixbus()) != (0 == (*i)->mixbus ())) {
+                                               continue;
+                                       }
+#endif
+                                       if ((*i)->soloed ()) {
+                                               rl->push_back (*i);
+                                       }
+                               }
+                               _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_control), false, Controllable::UseGroup);
+
                                if (Config->get_solo_control_is_listen_control()) {
                                        /* ??? 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(), Controllable::UseGroup);
+                               _route->solo_isolate_control()->set_value (_route->solo_isolate_control()->get_value() ? 0.0 : 1.0, Controllable::UseGroup);
                                delete _solo_release;
                                _solo_release = 0;
 
@@ -645,13 +719,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                                _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, Controllable::InverseGroup);
-                                       } else {
-                                               _session->set_solo (rl, !_route->self_soloed(),  Session::rt_cleanup, Controllable::InverseGroup);
-                                       }
+                                       _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_control), !_route->self_soloed(), Controllable::InverseGroup);
                                }
 
                                delete _solo_release;
@@ -668,12 +736,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                        _solo_release->routes = rl;
                                }
 
-                               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);
                        }
                }
        }
@@ -685,16 +748,11 @@ bool
 RouteUI::solo_release (GdkEventButton* /*ev*/)
 {
        if (_solo_release) {
-
                if (_solo_release->exclusive) {
-
+                       _session->set_controls (route_list_to_control_list (_solo_release->routes_off, &Stripable::solo_control), 0.0, Controllable::NoGroup);
+                       _session->set_controls (route_list_to_control_list (_solo_release->routes_on, &Stripable::solo_control), 1.0, Controllable::NoGroup);
                } else {
-                       DisplaySuspender ds;
-                       if (Config->get_solo_control_is_listen_control()) {
-                               _session->set_listen (_solo_release->routes, _solo_release->active, Session::rt_cleanup, Controllable::UseGroup);
-                       } else {
-                               _session->set_solo (_solo_release->routes, _solo_release->active, Session::rt_cleanup, Controllable::UseGroup);
-                       }
+                       _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;
@@ -712,11 +770,11 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
        }
 
        //if this is a binding action, let the ArdourButton handle it
-       if ( BindingProxy::is_bind_action(ev) )
+       if (BindingProxy::is_bind_action(ev) )
                return false;
 
        if (!_session->engine().connected()) {
-               MessageDialog msg (_("Not connected to AudioEngine - cannot engage record"));
+               MessageDialog msg (_("Not connected to AudioEngine - cannot engage record"));
                msg.run ();
                return false;
        }
@@ -740,8 +798,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 
                } 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)) {
 
@@ -756,8 +813,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
                                rl.reset (new RouteList);
                                rl->push_back (_route);
 
-                               DisplaySuspender ds;
-                               _session->set_record_enabled (rl, !_route->record_enabled(), Session::rt_cleanup, Controllable::InverseGroup);
+                               _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)) {
@@ -766,22 +822,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 ()
 {
@@ -797,7 +845,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) {
@@ -807,7 +855,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) {
@@ -858,37 +906,27 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
        MonitorChoice mc;
        boost::shared_ptr<RouteList> rl;
 
-       /* 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;
+               mc = MonitorChoice (t->monitoring_control()->monitoring_choice() | monitor_choice);
        }
 
        if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
+               /* Primary-Tertiary-click applies change to all routes */
                rl = _session->get_routes ();
-
+               _session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::NoGroup);
        } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-               if (_route->route_group() && _route->route_group()->is_monitoring()) {
-                       rl = _route->route_group()->route_list();
-               } else {
-                       rl.reset (new RouteList);
-                       rl->push_back (route());
-               }
+               /* Primary-click overrides group */
+               rl.reset (new RouteList);
+               rl->push_back (route());
+               _session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::InverseGroup);
        } else {
                rl.reset (new RouteList);
                rl->push_back (route());
+               _session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::UseGroup);
        }
 
-       DisplaySuspender ds;
-       _session->set_monitoring (rl, mc, Session::rt_cleanup, Controllable::UseGroup);
-
        return false;
 }
 
@@ -912,19 +950,21 @@ RouteUI::build_record_menu ()
        }
 
        if (step_edit_item) {
-               step_edit_item->set_sensitive (!_route->record_enabled());
+               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->record_enabled());
-               rec_safe_item->set_active (_route->record_safe());
+               rec_safe_item->set_sensitive (!_route->rec_enable_control()->get_value());
+               rec_safe_item->set_active (_route->rec_safe_control()->get_value());
        }
 }
 
 void
 RouteUI::toggle_step_edit ()
 {
-       if (!is_midi_track() || _route->record_enabled()) {
+       if (!is_midi_track() || track()->rec_enable_control()->get_value()) {
                return;
        }
 
@@ -934,13 +974,21 @@ RouteUI::toggle_step_edit ()
 void
 RouteUI::toggle_rec_safe ()
 {
-       if (_route->record_enabled()) {
+       boost::shared_ptr<AutomationControl> rs = _route->rec_safe_control();
+
+       if (!rs) {
                return;
        }
-       DisplaySuspender ds;
-       boost::shared_ptr<RouteList> rl (new RouteList);
-       rl->push_back (_route);
-       _session->set_record_safe (rl, rec_safe_item->get_active (), Session::rt_cleanup);
+
+       /* This check is made inside the control too, but dong it here can't
+        * hurt.
+        */
+
+       if (_route->rec_enable_control()->get_value()) {
+               return;
+       }
+
+       rs->set_value (rec_safe_item->get_active (), Controllable::UseGroup);
 }
 
 void
@@ -1134,41 +1182,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;
@@ -1176,13 +1225,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;
@@ -1192,42 +1247,42 @@ 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);
        }
 
-        set_button_names ();
+       set_button_names ();
 
-        if (solo_isolated_led) {
-               if (_route->solo_isolated()) {
+       if (solo_isolated_led) {
+               if (_route->solo_isolate_control()->solo_isolated()) {
                        solo_isolated_led->set_active_state (Gtkmm2ext::ExplicitActive);
                } else {
                        solo_isolated_led->unset_active_state ();
                }
-        }
+       }
 
-        if (solo_safe_led) {
-               if (_route->solo_safe()) {
+       if (solo_safe_led) {
+               if (_route->solo_safe_control()->solo_safe()) {
                        solo_safe_led->set_active_state (Gtkmm2ext::ExplicitActive);
                } else {
                        solo_safe_led->unset_active_state ();
                }
-        }
+       }
 
        solo_button->set_active_state (solo_active_state (_route));
 
-        /* some changes to solo status can affect mute display, so catch up
-         */
+       /* some changes to solo status can affect mute display, so catch up
+        */
 
-        update_mute_display ();
+       update_mute_display ();
 }
 
 void
@@ -1237,19 +1292,25 @@ RouteUI::solo_changed_so_update_mute ()
 }
 
 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->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 */
@@ -1258,9 +1319,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;
@@ -1273,54 +1337,24 @@ RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
 void
 RouteUI::update_mute_display ()
 {
-        if (!_route) {
-                return;
-        }
-
-        mute_button->set_active_state (mute_active_state (_session, _route));
-}
-
-void
-RouteUI::update_vca_display ()
-{
-       if (!vca_button) {
+       if (!_route) {
                return;
        }
 
-       VCAList vcas (_session->vca_manager().vcas());
-       string label;
-
-       for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
-               if (_route->slaved_to (*v)) {
-                       if (!label.empty()) {
-                               label += ' ';
-                       }
-                       label += PBD::to_string ((*v)->number(), std::dec);
-               }
-       }
-
-       if (label.empty()) {
-               label = _("-vca-");
-               vca_button->set_active_state (Gtkmm2ext::Off);
-       } else {
-               vca_button->set_active_state (Gtkmm2ext::ExplicitActive);
-       }
-
-       vca_button->set_text (label);
+       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 ()
 {
-       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
@@ -1329,36 +1363,41 @@ 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()) {
-                switch (_session->record_status ()) {
-                case Session::Recording:
-                        rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
-                        break;
+       if (!is_track()) {
+               return;
+       }
 
-                case Session::Disabled:
-                case Session::Enabled:
-                        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 (track()->rec_enable_control()->get_value()) {
+               switch (_session->record_status ()) {
+                       case Session::Recording:
+                               rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
+                               break;
 
-                }
+                       case Session::Disabled:
+                       case Session::Enabled:
+                               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) {
-                        step_edit_item->set_sensitive (false);
-                }
+               if (step_edit_item) {
+                       step_edit_item->set_sensitive (false);
+               }
 
        } else {
                rec_enable_button->unset_active_state ();
 
-                if (step_edit_item) {
-                        step_edit_item->set_sensitive (true);
-                }
+               if (step_edit_item) {
+                       step_edit_item->set_sensitive (true);
+               }
        }
 
        check_rec_enable_sensitivity ();
@@ -1375,22 +1414,18 @@ 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());
+       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());
+       solo_safe_check = dynamic_cast<Gtk::CheckMenuItem*>(&items.back());
        check->show_all();
-
-       //items.push_back (SeparatorElem());
-       // items.push_back (MenuElem (_("MIDI Bind"), sigc::mem_fun (*mute_button, &BindableToggleButton::midi_learn)));
-
 }
 
 void
@@ -1427,25 +1462,22 @@ RouteUI::build_mute_menu(void)
        items.push_back (CheckMenuElem(*main_mute_check));
        main_mute_check->show_all();
 
-       //items.push_back (SeparatorElem());
-       // items.push_back (MenuElem (_("MIDI Bind"), sigc::mem_fun (*mute_button, &BindableToggleButton::midi_learn)));
-
        _route->mute_points_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::muting_change, this), gui_context());
 }
 
 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));
        }
 }
 
@@ -1455,7 +1487,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);
 
@@ -1490,7 +1522,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 */
 
@@ -1499,12 +1531,10 @@ 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, Controllable::NoGroup);
+                               _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_solo_isolated (_session->get_routes(), true, Session::rt_cleanup, Controllable::NoGroup);
+                               _session->set_controls (route_list_to_control_list (_session->get_routes(), &Stripable::solo_isolate_control), 1.0, Controllable::NoGroup);
                        }
 
                } else {
@@ -1515,8 +1545,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, Controllable::NoGroup);
+                               _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_isolate_control), view ? 0.0 : 1.0, Controllable::NoGroup);
                        }
                }
        }
@@ -1532,7 +1561,7 @@ RouteUI::solo_safe_button_release (GdkEventButton* ev)
        }
 
        bool view = solo_safe_led->active_state();
-       bool model = _route->solo_safe();
+       bool model = _route->solo_safe_control()->solo_safe();
 
        if (ev->button == 1) {
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
@@ -1541,20 +1570,20 @@ RouteUI::solo_safe_button_release (GdkEventButton* ev)
                                /* disable solo safe for all routes */
                                DisplaySuspender ds;
                                for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                                       (*i)->set_solo_safe (false, Controllable::NoGroup);
+                                       (*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)->set_solo_safe (true, Controllable::NoGroup);
+                                       (*i)->solo_safe_control()->set_value (1.0, Controllable::NoGroup);
                                }
                        }
                }
                else {
                        if (model == view) {
                                /* flip just this route */
-                               _route->set_solo_safe (!view, Controllable::NoGroup);
+                               _route->solo_safe_control()->set_value (view ? 0.0 : 1.0, Controllable::NoGroup);
                        }
                }
        }
@@ -1565,55 +1594,69 @@ RouteUI::solo_safe_button_release (GdkEventButton* ev)
 void
 RouteUI::toggle_solo_isolated (Gtk::CheckMenuItem* check)
 {
-        bool view = check->get_active();
-        bool model = _route->solo_isolated();
+       bool view = check->get_active();
+       bool model = _route->solo_isolate_control()->solo_isolated();
 
-        /* called AFTER the view has changed */
+       /* called AFTER the view has changed */
 
-        if (model != view) {
-               _route->set_solo_isolated (view, Controllable::UseGroup);
-        }
+       if (model != view) {
+               _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(), Controllable::UseGroup);
+       _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
- */
 void
-RouteUI::choose_color ()
+RouteUI::delete_patch_change_dialog ()
 {
-       bool picked;
-       Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &_color);
+       if (!_route) {
+               return;
+       }
+       delete _route->patch_selector_dialog ();
+       _route->set_patch_selector_dialog (0);
+}
+
+PatchChangeGridDialog*
+RouteUI::patch_change_dialog () const
+{
+       return _route->patch_selector_dialog ();
+}
 
-       if (picked) {
-               set_color(color);
+void
+RouteUI::select_midi_patch ()
+{
+       if (patch_change_dialog ()) {
+               patch_change_dialog()->present ();
+               return;
        }
+
+       /* note: RouteTimeAxisView is resoponsible to updating
+        * the Dialog (PatchChangeGridDialog::refresh())
+        * when the midnam model changes.
+        */
+       PatchChangeGridDialog* d = new PatchChangeGridDialog (_route);
+       _route->set_patch_selector_dialog (d);
+       d->present ();
+}
+
+/** Ask the user to choose a colour, and then apply that color to my route */
+void
+RouteUI::choose_color ()
+{
+       _color_picker.popup (_route);
 }
 
 /** Set the route's own color.  This may not be used for display if
  *  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 */
@@ -1626,21 +1669,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;
+       return 1; /* pick a color */
 }
 
 /** @return true if this name should be used for the route, otherwise false */
@@ -1665,7 +1698,7 @@ RouteUI::verify_new_route_name (const std::string& name)
 void
 RouteUI::route_rename ()
 {
-       ArdourPrompter name_prompter (true);
+       ArdourWidgets::Prompter name_prompter (true);
        string result;
        bool done = false;
 
@@ -1708,14 +1741,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 ()
 {
@@ -1880,12 +1905,6 @@ RouteUI::has_audio_outputs () const
        return (_route->n_outputs().n_audio() > 0);
 }
 
-string
-RouteUI::name() const
-{
-       return _route->name();
-}
-
 void
 RouteUI::map_frozen ()
 {
@@ -1904,64 +1923,44 @@ RouteUI::adjust_latency ()
        LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session->frame_rate(), AudioEngine::instance()->samples_per_cycle());
 }
 
-bool
-RouteUI::process_save_template_prompter (ArdourPrompter& prompter, const std::string& dir)
-{
-       std::string path;
-       std::string safe_name;
-       std::string name;
-
-       prompter.get_result (name, true);
-
-       safe_name = legalize_for_path (name);
-       safe_name += template_suffix;
 
-       path = Glib::build_filename (dir, safe_name);
+void
+RouteUI::save_as_template_dialog_response (int response, SaveTemplateDialog* d)
+{
+       if (response == RESPONSE_ACCEPT) {
+               const string name = d->get_template_name ();
+               const string desc = d->get_description ();
+               const string path = Glib::build_filename(ARDOUR::user_route_template_directory (), name + ARDOUR::template_suffix);
 
-       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 (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) { /* file already exists. */
+                       bool overwrite = overwrite_file_dialog (*d,
+                                                               _("Confirm Template Overwrite"),
+                                                               _("A template already exists with that name. Do you want to overwrite it?"));
 
-               if (!overwrite) {
-                       return false;
+                       if (!overwrite) {
+                               d->show ();
+                               return;
+                       }
                }
+               _route->save_as_template (path, name, desc);
        }
 
-       _route->save_as_template (path, name);
-
-       return true;
+       delete d;
 }
 
 void
 RouteUI::save_as_template ()
 {
-       std::string dir;
-
-       dir = ARDOUR::user_route_template_directory ();
+       const std::string 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;
        }
 
-       ArdourPrompter prompter (true); // modal
-
-       prompter.set_title (_("Save As Template"));
-       prompter.set_prompt (_("Template name:"));
-       prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
-
-       bool finished = false;
-       while (!finished) {
-               switch (prompter.run()) {
-               case RESPONSE_ACCEPT:
-                       finished = process_save_template_prompter (prompter, dir);
-                       break;
-               default:
-                       finished = true;
-                       break;
-               }
-       }
+       SaveTemplateDialog* d = new SaveTemplateDialog (_route->name(), _route->comment());
+       d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::save_as_template_dialog_response), d));
+       d->show ();
 }
 
 void
@@ -1983,7 +1982,7 @@ RouteUI::check_rec_enable_sensitivity ()
        } else {
                rec_enable_button->set_sensitive (true);
        }
-       if (_route && _route->record_safe ()) {
+       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));
@@ -2000,6 +1999,8 @@ RouteUI::parameter_changed (string const & p)
                check_rec_enable_sensitivity ();
        } else if (p == "use-monitor-bus" || p == "solo-control-is-listen-control" || p == "listen-position") {
                set_button_names ();
+       } else if (p == "session-monitoring") {
+               update_monitoring_display ();
        } else if (p == "auto-input") {
                update_monitoring_display ();
        } else if (p == "blink-rec-arm") {
@@ -2013,85 +2014,6 @@ 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), Controllable::UseGroup);
-}
-
-void
-RouteUI::page_gain_up ()
-{
-       _route->set_gain (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), Controllable::UseGroup);
-}
-
-void
-RouteUI::page_gain_down ()
-{
-       _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), Controllable::UseGroup);
-}
-
-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."),
-                                                      Gtkmm2ext::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>",
-                                                      Gtkmm2ext::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 ());
-       }
-}
-
 void
 RouteUI::setup_invert_buttons ()
 {
@@ -2127,9 +2049,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);
@@ -2152,9 +2074,9 @@ 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);
@@ -2166,7 +2088,7 @@ 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));
                }
 
        }
@@ -2179,7 +2101,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;
                }
        }
@@ -2210,7 +2132,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;
        }
 
@@ -2226,30 +2148,23 @@ RouteUI::invert_menu_toggled (uint32_t c)
                return;
        }
 
-       _route->set_phase_invert (c, !_route->phase_invert (c));
-}
 
-void
-RouteUI::set_invert_sensitive (bool yn)
-{
-        for (vector<ArdourButton*>::iterator b = _invert_buttons.begin(); b != _invert_buttons.end(); ++b) {
-                (*b)->set_sensitive (yn);
-        }
+       _route->phase_control()->set_phase_invert (c, !_route->phase_control()->inverted (c));
 }
 
 void
-RouteUI::request_redraw ()
+RouteUI::set_invert_sensitive (bool yn)
 {
-       if (_route) {
-               _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+       for (vector<ArdourButton*>::iterator b = _invert_buttons.begin(); b != _invert_buttons.end(); ++b) {
+               (*b)->set_sensitive (yn);
        }
 }
 
 /** 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 ();
                }
@@ -2273,20 +2188,22 @@ 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.
-*/
*  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 {
+               set_color_from_rgba (c, _route->presentation_info().color());
        }
 
-       return _color;
+       return c;
 }
 
 void
@@ -2364,6 +2281,7 @@ RoutePinWindowProxy::route_going_away ()
        _window = 0;
        WM::Manager::instance().remove (this);
        going_away_connection.disconnect();
+       delete this;
 }
 
 void
@@ -2401,3 +2319,118 @@ RouteUI::manage_pins ()
                proxy->present();
        }
 }
+
+void
+RouteUI::fan_out (bool to_busses, bool group)
+{
+       DisplaySuspender ds;
+       boost::shared_ptr<ARDOUR::Route> route = _route;
+       boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (route->the_instrument ());
+       assert (pi);
+
+       const uint32_t n_outputs = pi->output_streams ().n_audio ();
+       if (route->n_outputs ().n_audio () != n_outputs) {
+               MessageDialog msg (string_compose (
+                                       _("The Plugin's number of audio outputs ports (%1) does not match the Tracks's number of audio outputs (%2). Cannot fan out."),
+                                       n_outputs, route->n_outputs ().n_audio ()));
+               msg.run ();
+               return;
+       }
+
+#define BUSNAME  pd.group_name + "(" + route->name () + ")"
+
+       /* count busses and channels/bus */
+       boost::shared_ptr<Plugin> plugin = pi->plugin ();
+       std::map<std::string, uint32_t> busnames;
+       for (uint32_t p = 0; p < n_outputs; ++p) {
+               const Plugin::IOPortDescription& pd (plugin->describe_io_port (DataType::AUDIO, false, p));
+               std::string bn = BUSNAME;
+               busnames[bn]++;
+       }
+
+       if (busnames.size () < 2) {
+               MessageDialog msg (_("Instrument has only 1 output bus. Nothing to fan out."));
+               msg.run ();
+               return;
+       }
+
+       uint32_t outputs = 2;
+       if (_session->master_out ()) {
+               outputs = std::max (outputs, _session->master_out ()->n_inputs ().n_audio ());
+       }
+
+       route->output ()->disconnect (this);
+       route->panner_shell ()->set_bypassed (true);
+
+       RouteList to_group;
+       for (uint32_t p = 0; p < n_outputs; ++p) {
+               const Plugin::IOPortDescription& pd (plugin->describe_io_port (DataType::AUDIO, false, p));
+               std::string bn = BUSNAME;
+               boost::shared_ptr<Route> r = _session->route_by_name (bn);
+               if (!r) {
+                       if (to_busses) {
+                               RouteList rl = _session->new_audio_route (busnames[bn], outputs, NULL, 1, bn, PresentationInfo::AudioBus, PresentationInfo::max_order);
+                               r = rl.front ();
+                               assert (r);
+                       } else {
+                               list<boost::shared_ptr<AudioTrack> > tl =
+                                       _session->new_audio_track (busnames[bn], outputs, NULL, 1, bn, PresentationInfo::max_order, Normal);
+                               r = tl.front ();
+                               assert (r);
+
+                               boost::shared_ptr<ControlList> cl (new ControlList);
+                               cl->push_back (r->monitoring_control ());
+                               _session->set_controls (cl, (double) MonitorInput, Controllable::NoGroup);
+                       }
+                       r->input ()->disconnect (this);
+               }
+               to_group.push_back (r);
+               route->output ()->audio (p)->connect (r->input ()->audio (pd.group_channel).get());
+       }
+#undef BUSNAME
+
+       if (group) {
+               RouteGroup* rg = NULL;
+               const std::list<RouteGroup*>& rgs (_session->route_groups ());
+               for (std::list<RouteGroup*>::const_iterator i = rgs.begin (); i != rgs.end (); ++i) {
+                       if ((*i)->name () == pi->name ()) {
+                               rg = *i;
+                               break;
+                       }
+               }
+               if (!rg) {
+                       rg = new RouteGroup (*_session, pi->name ());
+                       _session->add_route_group (rg);
+                       rg->set_gain (false);
+               }
+
+               GroupTabs::set_group_color (rg, route->presentation_info().color());
+               for (RouteList::const_iterator i = to_group.begin(); i != to_group.end(); ++i) {
+                       rg->add (*i);
+               }
+       }
+}
+
+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;
+}
+
+void
+RouteUI::set_disk_io_point (DiskIOPoint diop)
+{
+       if (_route && is_track()) {
+               track()->set_disk_io_point (diop);
+       }
+}