add group disposition argument to Route::set_gain() and use it in various UIs
[ardour.git] / gtk2_ardour / route_ui.cc
index d3e34ddf33b63d6e8053b1e462b3bf4b0cb7c22d..059f20a885b05d0c0bdb7e269c9b33f61ffdcc5a 100644 (file)
 
 */
 
+#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 "ardour/route_group.h"
 #include "ardour/dB.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/audioengine.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/midi_track.h"
+#include "ardour/internal_send.h"
+#include "ardour/profile.h"
+#include "ardour/send.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
 #include "ardour/template_utils.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;
+std::string RouteUI::program_port_prefix;
 
 RouteUI::RouteUI (ARDOUR::Session* sess)
        : AxisView(sess)
@@ -70,13 +81,27 @@ RouteUI::RouteUI (ARDOUR::Session* sess)
        , solo_menu(0)
        , sends_menu(0)
        , record_menu(0)
+       , comment_window(0)
+       , comment_area(0)
+       , input_selector (0)
+       , output_selector (0)
        , _invert_menu(0)
 {
+       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) {
+               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 ();
 
@@ -84,7 +109,13 @@ RouteUI::~RouteUI()
        delete mute_menu;
        delete sends_menu;
         delete record_menu;
+       delete comment_window;
+       delete input_selector;
+       delete output_selector;
        delete _invert_menu;
+
+       send_blink_connection.disconnect ();
+       rec_blink_connection.disconnect ();
 }
 
 void
@@ -112,6 +143,9 @@ RouteUI::init ()
        multiple_solo_change = false;
        _i_am_the_modifier = 0;
 
+       input_selector = 0;
+       output_selector = 0;
+
        setup_invert_buttons ();
 
        mute_button = manage (new ArdourButton);
@@ -125,9 +159,13 @@ RouteUI::init ()
 
        rec_enable_button = manage (new ArdourButton);
        rec_enable_button->set_name ("record enable button");
-       rec_enable_button->set_tweaks (ArdourButton::ImplicitUsesSolidColor);
+       rec_enable_button->set_icon (ArdourIcon::RecButton);
        UI::instance()->set_tip (rec_enable_button, _("Enable recording on this track"), "");
 
+       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);
        show_sends_button->set_name ("send alert button");
        UI::instance()->set_tip (show_sends_button, _("make mixer strips show sends to this bus"), "");
@@ -137,7 +175,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"));
@@ -155,21 +193,21 @@ RouteUI::init ()
        rec_enable_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_release), false);
 
        show_sends_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::show_sends_press), false);
-       show_sends_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::show_sends_release));
+       show_sends_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::show_sends_release), false);
 
        solo_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::solo_press), false);
        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);
 
-       monitor_input_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_input_press));
-       monitor_input_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_input_release));
+       monitor_input_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_input_press), false);
+       monitor_input_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_input_release), false);
 
-       monitor_disk_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_press));
-       monitor_disk_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_release));
+       monitor_disk_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_press), false);
+       monitor_disk_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_release), false);
 
        BusSendDisplayChanged.connect_same_thread (*this, boost::bind(&RouteUI::bus_send_display_changed, this, _1));
 }
@@ -209,18 +247,30 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
                rp->DropReferences.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::self_delete, this), gui_context());
        }
 
+       delete input_selector;
+       input_selector = 0;
+
+       delete output_selector;
+       output_selector = 0;
+
        mute_button->set_controllable (_route->mute_control());
        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->mute_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_mute_display, this), gui_context());
+
+       _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::comment_changed, this, _1), 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()->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->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->io_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::setup_invert_buttons, this), gui_context ());
@@ -230,7 +280,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
                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());
-               
+
                rec_enable_button->show();
                rec_enable_button->set_controllable (t->rec_enable_control());
 
@@ -239,14 +289,12 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
                                                                     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.
        */
 
-       update_rec_display ();
-
        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());
@@ -275,6 +323,12 @@ 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
+       }
+
+       route_color_changed();
 }
 
 void
@@ -294,121 +348,164 @@ RouteUI::mute_press (GdkEventButton* ev)
                return true;
        }
 
-       multiple_mute_change = false;
+       //if this is a binding action, let the ArdourButton handle it
+       if ( BindingProxy::is_bind_action(ev) )
+               return false;
 
-       if (!_i_am_the_modifier) {
+       multiple_mute_change = false;
 
-               if (Keyboard::is_context_menu_event (ev)) {
+       if (Keyboard::is_context_menu_event (ev)) {
 
-                       if (mute_menu == 0){
-                               build_mute_menu();
-                       }
+               if (mute_menu == 0){
+                       build_mute_menu();
+               }
 
-                       mute_menu->popup(0,ev->time);
+               mute_menu->popup(0,ev->time);
 
-               } else {
+               return true;
 
-                       if (Keyboard::is_button2_event (ev)) {
-                               // Primary-button2 click is the midi binding click
-                               // button2-click is "momentary"
+       } else {
 
+               if (Keyboard::is_button2_event (ev)) {
+                       // button2-click is "momentary"
 
-                               if (mute_button->on_button_press_event (ev)) {
-                                        return true;
-                                }
+                       _mute_release = new SoloMuteRelease (_route->muted ());
+               }
 
-                               _mute_release = new SoloMuteRelease (_route->muted ());
-                       }
+               if (ev->button == 1 || Keyboard::is_button2_event (ev)) {
 
-                       if (ev->button == 1 || Keyboard::is_button2_event (ev)) {
+                       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))) {
+                               /* toggle mute on everything (but
+                                * exclude the master and monitor)
+                                *
+                                * because we are going to erase
+                                * elements of the list we need to work
+                                * on a copy.
+                                */
 
-                                       /* toggle mute on everything (but
-                                        * exclude the master and monitor)
-                                        *
-                                        * because we are going to erase
-                                        * elements of the list we need to work
-                                        * on a copy.
-                                        */
-                                       
-                                       boost::shared_ptr<RouteList> copy (new RouteList);
+                               boost::shared_ptr<RouteList> copy (new RouteList);
 
-                                       *copy = *_session->get_routes ();
+                               *copy = *_session->get_routes ();
 
-                                       for (RouteList::iterator i = copy->begin(); i != copy->end(); ) {
-                                               if ((*i)->is_master() || (*i)->is_monitor()) {
-                                                       i = copy->erase (i);
-                                               } else {
-                                                       ++i;
-                                               }
+                               for (RouteList::iterator i = copy->begin(); i != copy->end(); ) {
+                                       if ((*i)->is_master() || (*i)->is_monitor()) {
+                                               i = copy->erase (i);
+                                       } else {
+                                               ++i;
                                        }
+                               }
 
-                                       if (_mute_release) {
-                                               _mute_release->routes = copy;
-                                       }
+                               if (_mute_release) {
+                                       _mute_release->routes = copy;
+                               }
 
-                                       _session->set_mute (copy, !_route->muted());
+                               DisplaySuspender ds;
+                               _session->set_mute (copy, !_route->muted());
 
-                               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                       } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
-                                       /* Primary-button1 applies change to the mix group even if it is not active
-                                          NOTE: Primary-button2 is MIDI learn.
-                                       */
+                               /* Primary-button1 applies change to the mix group even if it is not active
+                                  NOTE: Primary-button2 is MIDI learn.
+                               */
 
-                                       boost::shared_ptr<RouteList> rl;
+                               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);
-                                               }
+                                       if (_route->route_group()) {
 
-                                               _session->set_mute (rl, !_route->muted(), Session::rt_cleanup, true);
+                                               rl = _route->route_group()->route_list();
+
+                                               if (_mute_release) {
+                                                       _mute_release->routes = rl;
+                                               }
+                                       } else {
+                                               rl.reset (new RouteList);
+                                               rl->push_back (_route);
                                        }
 
-                               } else {
+                                       DisplaySuspender ds;
+                                       _session->set_mute (rl, !_route->muted(), Session::rt_cleanup, true);
+                               }
 
-                                       /* plain click applies change to this route */
+                       } else {
 
-                                       boost::shared_ptr<RouteList> rl (new RouteList);
-                                       rl->push_back (_route);
-                                       
-                                       if (_mute_release) {
-                                               _mute_release->routes = rl;
-                                       }
+                               /* plain click applies change to this route */
 
-                                       _session->set_mute (rl, !_route->muted());
+                               boost::shared_ptr<RouteList> rl (new RouteList);
+                               rl->push_back (_route);
 
+                               if (_mute_release) {
+                                       _mute_release->routes = rl;
                                }
+
+                               _session->set_mute (rl, !_route->muted());
+
                        }
                }
-
        }
 
-       return true;
+       return false;
 }
 
 bool
-RouteUI::mute_release (GdkEventButton*)
+RouteUI::mute_release (GdkEventButton* /*ev*/)
 {
-       if (!_i_am_the_modifier) {
-               if (_mute_release){
-                       _session->set_mute (_mute_release->routes, _mute_release->active, Session::rt_cleanup, true);
-                       delete _mute_release;
-                       _mute_release = 0;
+       if (_mute_release){
+               DisplaySuspender ds;
+               _session->set_mute (_mute_release->routes, _mute_release->active, Session::rt_cleanup, true);
+               delete _mute_release;
+               _mute_release = 0;
+       }
+
+       return false;
+}
+
+void
+RouteUI::edit_output_configuration ()
+{
+       if (output_selector == 0) {
+
+               boost::shared_ptr<Send> send;
+               boost::shared_ptr<IO> output;
+
+               if ((send = boost::dynamic_pointer_cast<Send>(_current_delivery)) != 0) {
+                       if (!boost::dynamic_pointer_cast<InternalSend>(send)) {
+                               output = send->output();
+                       } else {
+                               output = _route->output ();
+                       }
+               } else {
+                       output = _route->output ();
                }
+
+               output_selector = new IOSelectorWindow (_session, output);
        }
 
-       return true;
+       if (output_selector->is_visible()) {
+               output_selector->get_toplevel()->get_window()->raise();
+       } else {
+               output_selector->present ();
+       }
+
+       //output_selector->set_keep_above (true);
+}
+
+void
+RouteUI::edit_input_configuration ()
+{
+       if (input_selector == 0) {
+               input_selector = new IOSelectorWindow (_session, _route->input());
+       }
+
+       if (input_selector->is_visible()) {
+               input_selector->get_toplevel()->get_window()->raise();
+       } else {
+               input_selector->present ();
+       }
+
+       //input_selector->set_keep_above (true);
 }
 
 bool
@@ -420,164 +517,163 @@ RouteUI::solo_press(GdkEventButton* ev)
                return true;
        }
 
-       multiple_solo_change = false;
-
-       if (!_i_am_the_modifier) {
-
-               if (Keyboard::is_context_menu_event (ev)) {
+       //if this is a binding action, let the ArdourButton handle it
+       if ( BindingProxy::is_bind_action(ev) )
+               return false;
 
-                        if (! (solo_isolated_led && solo_isolated_led->is_visible()) ||
-                           ! (solo_safe_led && solo_safe_led->is_visible())) {
+       multiple_solo_change = false;
 
-                                if (solo_menu == 0) {
-                                        build_solo_menu ();
-                                }
+       if (Keyboard::is_context_menu_event (ev)) {
 
-                                solo_menu->popup (1, ev->time);
-                        }
+               if (! (solo_isolated_led && solo_isolated_led->is_visible()) ||
+                   ! (solo_safe_led && solo_safe_led->is_visible())) {
 
-               } else {
+                       if (solo_menu == 0) {
+                               build_solo_menu ();
+                       }
 
-                       if (Keyboard::is_button2_event (ev)) {
+                       solo_menu->popup (1, ev->time);
+               }
 
-                               // Primary-button2 click is the midi binding click
-                               // button2-click is "momentary"
+       } else {
 
-                                if (solo_button->on_button_press_event (ev)) {
-                                        return true;
-                                }
+               if (Keyboard::is_button2_event (ev)) {
 
-                               _solo_release = new SoloMuteRelease (_route->self_soloed());
-                       }
+                       // button2-click is "momentary"
+                       _solo_release = new SoloMuteRelease (_route->self_soloed());
+               }
 
-                       if (ev->button == 1 || Keyboard::is_button2_event (ev)) {
+               if (ev->button == 1 || Keyboard::is_button2_event (ev)) {
 
-                               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))) {
 
-                                       /* Primary-Tertiary-click applies change to all routes */
+                               /* Primary-Tertiary-click applies change to all routes */
 
-                                       if (_solo_release) {
-                                               _solo_release->routes = _session->get_routes ();
-                                       }
+                               if (_solo_release) {
+                                       _solo_release->routes = _session->get_routes ();
+                               }
 
-                                       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);
-                                       }
+                               DisplaySuspender ds;
+                               if (Config->get_solo_control_is_listen_control()) {
+                                       _session->set_listen (_session->get_routes(), !_route->listening_via_monitor(),  Session::rt_cleanup, false);
+                               } else {
+                                       _session->set_solo (_session->get_routes(), !_route->self_soloed(),  Session::rt_cleanup, false);
+                               }
 
-                               } else if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
+                       } 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;
+                               if (_solo_release) {
+                                       _solo_release->exclusive = true;
 
-                                               boost::shared_ptr<RouteList> routes = _session->get_routes();
+                                       boost::shared_ptr<RouteList> routes = _session->get_routes();
 
-                                               for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
-                                                       if ((*i)->soloed ()) {
-                                                               _solo_release->routes_on->push_back (*i);
-                                                       } else {
-                                                               _solo_release->routes_off->push_back (*i);
-                                                       }
+                                       for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+                                               if ((*i)->soloed ()) {
+                                                       _solo_release->routes_on->push_back (*i);
+                                               } else {
+                                                       _solo_release->routes_off->push_back (*i);
                                                }
                                        }
+                               }
 
-                                       if (Config->get_solo_control_is_listen_control()) {
-                                               /* ??? we need a just_one_listen() method */
-                                       } else {
-                                               _session->set_just_one_solo (_route, true);
-                                       }
+                               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);
+                               }
 
-                               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+                       } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
 
-                                       // shift-click: toggle solo isolated status
+                               // shift-click: toggle solo isolated status
 
-                                       _route->set_solo_isolated (!_route->solo_isolated(), this);
-                                       delete _solo_release;
-                                       _solo_release = 0;
+                               _route->set_solo_isolated (!_route->solo_isolated(), this);
+                               delete _solo_release;
+                               _solo_release = 0;
 
-                               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                       } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
-                                       /* Primary-button1: solo mix group.
-                                          NOTE: Primary-button2 is MIDI learn.
-                                       */
+                               /* Primary-button1: solo mix group.
+                                  NOTE: Primary-button2 is MIDI learn.
+                               */
 
-                                       /* Primary-button1 applies change to the mix group even if it is not active
-                                          NOTE: Primary-button2 is MIDI learn.
-                                       */
+                               /* Primary-button1 applies change to the mix group even if it is not active
+                                  NOTE: Primary-button2 is MIDI learn.
+                               */
 
-                                       boost::shared_ptr<RouteList> rl;
+                               boost::shared_ptr<RouteList> rl;
 
-                                       if (ev->button == 1) { 
+                               if (ev->button == 1) {
+                                       if (ARDOUR::Profile->get_mixbus() && _route->route_group()) {
 
-                                               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);
-                                               }
+                                               rl = _route->route_group()->route_list();
 
-                                               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);
+                                               if (_solo_release) {
+                                                       _solo_release->routes = rl;
                                                }
+                                       } else {
+                                               rl.reset (new RouteList);
+                                               rl->push_back (_route);
                                        }
 
-                               } else {
+                                       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);
+                                       }
+                               }
 
-                                       /* click: solo this route */
+                               delete _solo_release;
+                               _solo_release = 0;
 
-                                       boost::shared_ptr<RouteList> rl (new RouteList);
-                                       rl->push_back (route());
+                       } else {
 
-                                       if (_solo_release) {
-                                               _solo_release->routes = rl;
-                                       }
+                               /* click: solo this route */
 
-                                       if (Config->get_solo_control_is_listen_control()) {
-                                               _session->set_listen (rl, !_route->listening_via_monitor());
-                                       } else {
-                                               _session->set_solo (rl, !_route->self_soloed());
-                                       }
+                               boost::shared_ptr<RouteList> rl (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());
+                               } else {
+                                       _session->set_solo (rl, !_route->self_soloed());
                                }
                        }
                }
        }
 
-       return true;
+       return false;
 }
 
 bool
-RouteUI::solo_release (GdkEventButton*)
+RouteUI::solo_release (GdkEventButton* /*ev*/)
 {
-       if (!_i_am_the_modifier) {
-
-               if (_solo_release) {
+       if (_solo_release) {
 
-                       if (_solo_release->exclusive) {
+               if (_solo_release->exclusive) {
 
+               } else {
+                       DisplaySuspender ds;
+                       if (Config->get_solo_control_is_listen_control()) {
+                               _session->set_listen (_solo_release->routes, _solo_release->active, Session::rt_cleanup, false);
                        } else {
-                                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_solo (_solo_release->routes, _solo_release->active, Session::rt_cleanup, false);
                        }
-
-                       delete _solo_release;
-                       _solo_release = 0;
                }
+
+               delete _solo_release;
+               _solo_release = 0;
        }
 
-       return true;
+       return false;
 }
 
 bool
@@ -587,32 +683,37 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
                return true;
        }
 
+       //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 JACK - cannot engage record"));
+               MessageDialog msg (_("Not connected to AudioEngine - cannot engage record"));
                msg.run ();
-               return true;
+               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 true;
-                }
-        }
+                       return false;
+               }
+       }
 
-       if (!_i_am_the_modifier && is_track() && rec_enable_button) {
+       if (is_track() && rec_enable_button) {
 
                if (Keyboard::is_button2_event (ev)) {
 
-                       // do nothing on midi sigc::bind event
-                       return rec_enable_button->on_button_press_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))) {
 
-                       _session->set_record_enabled (_session->get_routes(), !rec_enable_button->active_state());
+                       DisplaySuspender ds;
+                       _session->set_record_enabled (_session->get_routes(), !_route->record_enabled());
 
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
@@ -623,17 +724,18 @@ 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);
                                }
-                               
-                               _session->set_record_enabled (rl, !rec_enable_button->active_state(), Session::rt_cleanup, true);
+
+                               DisplaySuspender ds;
+                               _session->set_record_enabled (rl, !_route->record_enabled(), Session::rt_cleanup, true);
                        }
 
                } else if (Keyboard::is_context_menu_event (ev)) {
@@ -644,11 +746,12 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 
                        boost::shared_ptr<RouteList> rl (new RouteList);
                        rl->push_back (route());
-                       _session->set_record_enabled (rl, !rec_enable_button->active_state());
+                       DisplaySuspender ds;
+                       _session->set_record_enabled (rl, !_route->record_enabled());
                }
        }
 
-       return true;
+       return false;
 }
 
 void
@@ -696,7 +799,7 @@ RouteUI::update_monitoring_display ()
 bool
 RouteUI::monitor_input_press(GdkEventButton*)
 {
-       return true;
+       return false;
 }
 
 bool
@@ -708,7 +811,7 @@ RouteUI::monitor_input_release(GdkEventButton* ev)
 bool
 RouteUI::monitor_disk_press (GdkEventButton*)
 {
-       return true;
+       return false;
 }
 
 bool
@@ -719,7 +822,7 @@ RouteUI::monitor_disk_release (GdkEventButton* ev)
 
 bool
 RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
-{      
+{
        if (ev->button != 1) {
                return false;
        }
@@ -732,8 +835,8 @@ 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.
        */
@@ -746,7 +849,7 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice 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)) {
@@ -761,89 +864,90 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
                rl->push_back (route());
        }
 
-       _session->set_monitoring (rl, mc, Session::rt_cleanup, true);           
+       DisplaySuspender ds;
+       _session->set_monitoring (rl, mc, Session::rt_cleanup, true);
 
-       return true;
+       return false;
 }
 
 void
 RouteUI::build_record_menu ()
 {
-        if (record_menu) {
-                return;
-        }
+       if (record_menu) {
+               return;
+       }
 
-        /* no rec-button context menu for non-MIDI tracks
-         */
+       /* no rec-button context menu for non-MIDI tracks
+        */
 
-        if (is_midi_track()) {
-                record_menu = new Menu;
-                record_menu->set_name ("ArdourContextMenu");
+       if (is_midi_track()) {
+               record_menu = new Menu;
+               record_menu->set_name ("ArdourContextMenu");
 
-                using namespace Menu_Helpers;
-                MenuList& items = record_menu->items();
+               using namespace Menu_Helpers;
+               MenuList& items = record_menu->items();
 
-                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 (_route->record_enabled()) {
-                        step_edit_item->set_sensitive (false);
-                }
+               if (_route->record_enabled()) {
+                       step_edit_item->set_sensitive (false);
+               }
 
-                step_edit_item->set_active (midi_track()->step_editing());
-        }
+               step_edit_item->set_active (midi_track()->step_editing());
+       }
 }
 
 void
 RouteUI::toggle_step_edit ()
 {
-        if (!is_midi_track() || _route->record_enabled()) {
-                return;
-        }
+       if (!is_midi_track() || _route->record_enabled()) {
+               return;
+       }
 
-        midi_track()->set_step_editing (step_edit_item->get_active());
+       midi_track()->set_step_editing (step_edit_item->get_active());
 }
 
 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 true;
-        }
+       if (Keyboard::is_context_menu_event (ev)) {
+               build_record_menu ();
+               if (record_menu) {
+                       record_menu->popup (1, ev->time);
+               }
+               return false;
+       }
 
-       return true;
+       return false;
 }
 
 void
@@ -944,7 +1048,7 @@ RouteUI::show_sends_press(GdkEventButton* ev)
                return true;
        }
 
-       if (!_i_am_the_modifier && !is_track() && show_sends_button) {
+       if (!is_track() && show_sends_button) {
 
                if (Keyboard::is_button2_event (ev) && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
@@ -1097,12 +1201,6 @@ RouteUI::solo_changed_so_update_mute ()
        update_mute_display ();
 }
 
-void
-RouteUI::mute_changed(void* /*src*/)
-{
-       update_mute_display ();
-}
-
 ActiveState
 RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
 {
@@ -1116,8 +1214,7 @@ RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
                if (r->muted ()) {
                        /* 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 (r->muted_by_others()) {
                        return Gtkmm2ext::ImplicitActive;
                } else {
                        /* no mute at all */
@@ -1151,23 +1248,26 @@ RouteUI::update_mute_display ()
 void
 RouteUI::route_rec_enable_changed ()
 {
-        update_rec_display ();
+       blink_rec_display(true);  //this lets the button change "immediately" rather than wait for the next blink
        update_monitoring_display ();
 }
 
 void
 RouteUI::session_rec_enable_changed ()
 {
-        update_rec_display ();
+       blink_rec_display(true);  //this lets the button change "immediately" rather than wait for the next blink
        update_monitoring_display ();
 }
 
 void
-RouteUI::update_rec_display ()
+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 ()) {
@@ -1177,7 +1277,10 @@ RouteUI::update_rec_display ()
 
                 case Session::Disabled:
                 case Session::Enabled:
-                        rec_enable_button->set_active_state (Gtkmm2ext::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;
 
                 }
@@ -1319,45 +1422,80 @@ RouteUI::muting_change ()
 bool
 RouteUI::solo_isolate_button_release (GdkEventButton* ev)
 {
-        if (ev->type == GDK_2BUTTON_PRESS || ev->type == GDK_3BUTTON_PRESS) {
-                return true;
-        }
+       if (ev->type == GDK_2BUTTON_PRESS || ev->type == GDK_3BUTTON_PRESS) {
+               return true;
+       }
 
-        bool view = solo_isolated_led->active_state();
-        bool model = _route->solo_isolated();
+       bool view = solo_isolated_led->active_state();
+       bool model = _route->solo_isolated();
 
-        /* called BEFORE the view has changed */
+       /* called BEFORE the view has changed */
+
+       if (ev->button == 1) {
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
 
-        if (ev->button == 1) {
-                if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
+                       if (model) {
+                               /* disable isolate for all routes */
+                               DisplaySuspender ds;
+                               _session->set_solo_isolated (_session->get_routes(), false, Session::rt_cleanup, true);
+                       } else {
+                               /* enable isolate for all routes */
+                               DisplaySuspender ds;
+                               _session->set_solo_isolated (_session->get_routes(), true, Session::rt_cleanup, true);
+                       }
 
-                        if (model) {
-                                /* disable isolate for all routes */
-                                _session->set_solo_isolated (_session->get_routes(), false, Session::rt_cleanup, true);
-                        }
+               } else {
 
-                } else {
-                        if (model == view) {
+                       if (model == view) {
 
-                                /* flip just this route */
+                               /* flip just this route */
 
-                                boost::shared_ptr<RouteList> rl (new RouteList);
-                                rl->push_back (_route);
-                                _session->set_solo_isolated (rl, !view, Session::rt_cleanup, true);
-                        }
-                }
-        }
+                               boost::shared_ptr<RouteList> rl (new RouteList);
+                               rl->push_back (_route);
+                               DisplaySuspender ds;
+                               _session->set_solo_isolated (rl, !view, Session::rt_cleanup, true);
+                       }
+               }
+       }
 
-        return true;
+       return false;
 }
 
 bool
 RouteUI::solo_safe_button_release (GdkEventButton* ev)
 {
-       if (ev->button == 1) {
-               _route->set_solo_safe (!solo_safe_led->active_state(), this);
+       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();
+
+       if (ev->button == 1) {
+               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)->set_solo_safe (false, this);
+                               }
+                       } else {
+                               /* enable solo safe for all routes */
+                               DisplaySuspender ds;
+                               for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+                                       (*i)->set_solo_safe (true, this);
+                               }
+                       }
+               }
+               else {
+                       if (model == view) {
+                               /* flip just this route */
+                               _route->set_solo_safe (!view, this);
+                       }
+               }
+       }
+
        return false;
 }
 
@@ -1380,8 +1518,7 @@ RouteUI::toggle_solo_safe (Gtk::CheckMenuItem* check)
        _route->set_solo_safe (check->get_active(), this);
 }
 
-/** Ask the user to choose a colour, and then set all selected tracks
- *  to that colour.
+/** Ask the user to choose a colour, and then apply that color to my route
  */
 void
 RouteUI::choose_color ()
@@ -1390,9 +1527,7 @@ RouteUI::choose_color ()
        Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &_color);
 
        if (picked) {
-               ARDOUR_UI::instance()->the_editor().get_selection().tracks.foreach_route_ui (
-                       boost::bind (&RouteUI::set_color, _1, color)
-                       );
+               set_color(color);
        }
 }
 
@@ -1409,11 +1544,11 @@ RouteUI::set_color (const Gdk::Color & c)
        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 */
 }
@@ -1445,65 +1580,6 @@ RouteUI::set_color_from_route ()
        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)
-{
-       rui->_session->remove_route (rui->route());
-       return false;
-}
-
 /** @return true if this name should be used for the route, otherwise false */
 bool
 RouteUI::verify_new_route_name (const std::string& name)
@@ -1511,12 +1587,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);
 
@@ -1577,6 +1653,81 @@ RouteUI::property_changed (const PropertyChange& what_changed)
        }
 }
 
+void
+RouteUI::toggle_comment_editor ()
+{
+//     if (ignore_toggle) {
+//             return;
+//     }
+
+       if (comment_window && comment_window->is_visible ()) {
+               comment_window->hide ();
+       } else {
+               open_comment_editor ();
+       }
+}
+
+
+void
+RouteUI::open_comment_editor ()
+{
+       if (comment_window == 0) {
+               setup_comment_editor ();
+       }
+
+       string title;
+       title = _route->name();
+       title += _(": comment editor");
+
+       comment_window->set_title (title);
+       comment_window->present();
+}
+
+void
+RouteUI::setup_comment_editor ()
+{
+       comment_window = new ArdourWindow (""); // title will be reset to show route
+       comment_window->set_skip_taskbar_hint (true);
+       comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing));
+       comment_window->set_default_size (400, 200);
+
+       comment_area = manage (new TextView());
+       comment_area->set_name ("MixerTrackCommentArea");
+       comment_area->set_wrap_mode (WRAP_WORD);
+       comment_area->set_editable (true);
+       comment_area->get_buffer()->set_text (_route->comment());
+       comment_area->show ();
+
+       comment_window->add (*comment_area);
+}
+
+void
+RouteUI::comment_changed (void *src)
+{
+       ENSURE_GUI_THREAD (*this, &MixerStrip::comment_changed, src)
+
+       if (src != this) {
+               ignore_comment_edit = true;
+               if (comment_area) {
+                       comment_area->get_buffer()->set_text (_route->comment());
+               }
+               ignore_comment_edit = false;
+       }
+}
+
+void
+RouteUI::comment_editor_done_editing ()
+{
+       ENSURE_GUI_THREAD (*this, &MixerStrip::comment_editor_done_editing, src)
+
+       string const str = comment_area->get_buffer()->get_text();
+       if (str == _route->comment ()) {
+               return;
+       }
+
+       _route->set_comment (str, this);
+}
+
 void
 RouteUI::set_route_active (bool a, bool apply_to_selection)
 {
@@ -1587,6 +1738,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 ()
 {
@@ -1695,41 +1852,64 @@ 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;
+
+       dir = ARDOUR::user_route_template_directory ();
 
-       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:
+       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
@@ -1755,31 +1935,39 @@ RouteUI::parameter_changed (string const & p)
                set_button_names ();
        } else if (p == "auto-input") {
                update_monitoring_display ();
+       } else if (p == "blink-rec-arm") {
+               if (UIConfiguration::instance().get_blink_rec_arm()) {
+                       rec_blink_connection.disconnect ();
+                       rec_blink_connection = Timers::blink_connect (sigc::mem_fun (*this, &RouteUI::blink_rec_display));
+               } else {
+                       rec_blink_connection.disconnect ();
+                       RouteUI::blink_rec_display(false);
+               }
        }
 }
 
 void
 RouteUI::step_gain_up ()
 {
-       _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.1), this);
+       _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), this);
+       _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), this);
+       _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), this);
+       _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), Controllable::UseGroup);
 }
 
 void
@@ -1792,7 +1980,7 @@ RouteUI::open_remote_control_id_dialog ()
 
        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:"))));
@@ -1803,7 +1991,7 @@ RouteUI::open_remote_control_id_dialog ()
                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 {
@@ -1811,7 +1999,7 @@ RouteUI::open_remote_control_id_dialog ()
                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()),
+                                                      Gtkmm2ext::markup_escape_text (_route->name()),
                                                       _route->remote_control_id(),
                                                       (_route->is_master() ? _("the master bus") : _("the monitor bus"))));
                } else {
@@ -1822,7 +2010,7 @@ RouteUI::open_remote_control_id_dialog ()
                                                       _route->remote_control_id(),
                                                       "<span size=\"small\" style=\"italic\">",
                                                       "</span>",
-                                                      Glib::Markup::escape_text (_route->name()),
+                                                      Gtkmm2ext::markup_escape_text (_route->name()),
                                                       PROGRAM_NAME));
                }
                dialog.get_vbox()->pack_start (*l);
@@ -1857,9 +2045,8 @@ RouteUI::setup_invert_buttons ()
 
        for (uint32_t i = 0; i < to_add; ++i) {
                ArdourButton* b = manage (new ArdourButton);
-               b->set_size_request(20,20);
-               b->signal_button_press_event().connect (sigc::mem_fun (*this, &RouteUI::invert_press));
-               b->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::invert_release), i));
+               b->signal_button_press_event().connect (sigc::mem_fun (*this, &RouteUI::invert_press), false);
+               b->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::invert_release), i), false);
 
                b->set_name (X_("invert button"));
                if (to_add == 1) {
@@ -1889,8 +2076,6 @@ RouteUI::setup_invert_buttons ()
 void
 RouteUI::set_invert_button_state ()
 {
-       ++_i_am_the_modifier;
-
        uint32_t const N = _route->input()->n_ports().n_audio();
        if (N > _max_invert_buttons) {
 
@@ -1899,7 +2084,7 @@ RouteUI::set_invert_button_state ()
                */
 
                ArdourButton* b = _invert_buttons.front ();
-               
+
                if (_route->phase_invert().count() == _route->phase_invert().size()) {
                        b->set_active_state (Gtkmm2ext::ExplicitActive);
                } else if (_route->phase_invert().any()) {
@@ -1916,10 +2101,8 @@ RouteUI::set_invert_button_state ()
                for (vector<ArdourButton*>::iterator i = _invert_buttons.begin(); i != _invert_buttons.end(); ++i, ++j) {
                        (*i)->set_active (_route->phase_invert (j));
                }
-               
-       }
 
-       --_i_am_the_modifier;
+       }
 }
 
 bool
@@ -1930,7 +2113,7 @@ RouteUI::invert_release (GdkEventButton* ev, uint32_t i)
                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());
-                       return true;
+                       return false;
                }
        }
        return false;
@@ -1948,9 +2131,9 @@ RouteUI::invert_press (GdkEventButton* ev)
                   up a menu on right-click; left click is handled
                   on release.
                */
-               return true;
+               return false;
        }
-       
+
        delete _invert_menu;
        _invert_menu = new Menu;
        _invert_menu->set_name ("ArdourContextMenu");
@@ -1966,7 +2149,7 @@ RouteUI::invert_press (GdkEventButton* ev)
 
        _invert_menu->popup (0, ev->time);
 
-       return false;
+       return true;
 }
 
 void
@@ -2006,6 +2189,22 @@ RouteUI::route_gui_changed (string what_changed)
        }
 }
 
+void
+RouteUI::track_mode_changed (void)
+{
+       assert(is_track());
+       switch (track()->mode()) {
+               case ARDOUR::NonLayered:
+               case ARDOUR::Normal:
+                       rec_enable_button->set_icon (ArdourIcon::RecButton);
+                       break;
+               case ARDOUR::Destructive:
+                       rec_enable_button->set_icon (ArdourIcon::RecTapeMode);
+                       break;
+       }
+       rec_enable_button->queue_draw();
+}
+
 /** @return the color that this route should use; it maybe its own,
     or it maybe that of its route group.
 */
@@ -2013,9 +2212,11 @@ Gdk::Color
 RouteUI::color () const
 {
        RouteGroup* g = _route->route_group ();
-       
+
        if (g && g->is_color()) {
-               return GroupTabs::group_color (g);
+               Gdk::Color c;
+               set_color_from_rgba (c, GroupTabs::group_color (g));
+               return c;
        }
 
        return _color;
@@ -2033,7 +2234,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 ();