add route group support for monitoring choices
[ardour.git] / gtk2_ardour / route_ui.cc
index 1a75132e4c61d2278a43f8e43f4d5664e415304e..f152811648359a57db73f700da86f994d5c89112 100644 (file)
@@ -18,7 +18,6 @@
 */
 
 #include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/bindable_button.h>
@@ -35,6 +34,7 @@
 #include "ardour_ui.h"
 #include "editor.h"
 #include "route_ui.h"
+#include "led.h"
 #include "keyboard.h"
 #include "utils.h"
 #include "prompter.h"
 #include "mixer_strip.h"
 #include "automation_time_axis.h"
 #include "route_time_axis.h"
+#include "group_tabs.h"
 
 #include "ardour/route.h"
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 #include "ardour/audio_track.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/midi_track.h"
-#include "ardour/midi_diskstream.h"
 #include "ardour/template_utils.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/directory_names.h"
@@ -64,17 +63,12 @@ using namespace Gtkmm2ext;
 using namespace ARDOUR;
 using namespace PBD;
 
-RouteUI::RouteUI (ARDOUR::Session* sess)
-       : AxisView(sess)
-{
-       init ();
-}
+uint32_t RouteUI::_max_invert_buttons = 3;
 
-RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session* sess)
+RouteUI::RouteUI (ARDOUR::Session* sess)
        : AxisView(sess)
 {
        init ();
-       set_route (rt);
 }
 
 RouteUI::~RouteUI()
@@ -85,38 +79,46 @@ RouteUI::~RouteUI()
        delete solo_menu;
        delete mute_menu;
        delete sends_menu;
+        delete record_menu;
+       delete _invert_menu;
 }
 
 void
 RouteUI::init ()
 {
        self_destruct = true;
-       xml_node = 0;
        mute_menu = 0;
        solo_menu = 0;
        sends_menu = 0;
+        record_menu = 0;
+       _invert_menu = 0;
        pre_fader_mute_check = 0;
        post_fader_mute_check = 0;
        listen_mute_check = 0;
        main_mute_check = 0;
-       ignore_toggle = false;
+        solo_safe_check = 0;
+        solo_isolated_check = 0;
+        solo_isolated_led = 0;
+        solo_safe_led = 0;
        _solo_release = 0;
        _mute_release = 0;
-       route_active_menu_item = 0;
-       polarity_menu_item = 0;
        denormal_menu_item = 0;
+        step_edit_item = 0;
        multiple_mute_change = false;
        multiple_solo_change = false;
+       _i_am_the_modifier = 0;
+
+       setup_invert_buttons ();
 
        mute_button = manage (new BindableToggleButton ());
-       mute_button->set_self_managed (true);
+       // mute_button->set_self_managed (true);
        mute_button->set_name ("MuteButton");
        mute_button->add (mute_button_label);
        mute_button_label.show ();
        UI::instance()->set_tip (mute_button, _("Mute this track"), "");
 
        solo_button = manage (new BindableToggleButton ());
-       solo_button->set_self_managed (true);
+       // solo_button->set_self_managed (true);
        solo_button->set_name ("SoloButton");
        solo_button->add (solo_button_label);
        solo_button_label.show ();
@@ -125,21 +127,38 @@ RouteUI::init ()
 
        rec_enable_button = manage (new BindableToggleButton ());
        rec_enable_button->set_name ("RecordEnableButton");
-       rec_enable_button->set_self_managed (true);
+       // rec_enable_button->set_self_managed (true);
        rec_enable_button->add (rec_enable_button_label);
        rec_enable_button_label.show ();
        UI::instance()->set_tip (rec_enable_button, _("Enable recording on this track"), "");
 
        show_sends_button = manage (new BindableToggleButton (""));
        show_sends_button->set_name ("SendAlert");
-       show_sends_button->set_self_managed (true);
+       // show_sends_button->set_self_managed (true);
        UI::instance()->set_tip (show_sends_button, _("make mixer strips show sends to this bus"), "");
 
-       _session->SoloChanged.connect (_session_connections, boost::bind (&RouteUI::solo_changed_so_update_mute, this), gui_context());
-       _session->TransportStateChange.connect (_session_connections, boost::bind (&RouteUI::check_rec_enable_sensitivity, this), gui_context());
-       _session->RecordStateChanged.connect (_session_connections, boost::bind (&RouteUI::session_rec_enable_changed, this), gui_context());
-
-       Config->ParameterChanged.connect (*this, ui_bind (&RouteUI::parameter_changed, this, _1), gui_context());
+       monitor_input_button = manage (new BindableToggleButton ());
+       // monitor_input_button->set_self_managed (true);
+       monitor_input_button->set_name ("MonitorInputButton");
+       monitor_input_button->add (monitor_input_button_label);
+       monitor_input_button_label.show ();
+       UI::instance()->set_tip (monitor_input_button, _("Monitor input"), "");
+       monitor_input_button->set_no_show_all (true);
+
+       monitor_disk_button = manage (new BindableToggleButton ());
+       // monitor_disk_button->set_self_managed (true);
+       monitor_disk_button->set_name ("MonitorDiskButton");
+       monitor_disk_button->add (monitor_disk_button_label);
+       monitor_disk_button_label.show ();
+       UI::instance()->set_tip (monitor_disk_button, _("Monitor playback"), "");
+       monitor_disk_button->set_no_show_all (true);
+
+       _session->SoloChanged.connect (_session_connections, invalidator (*this), boost::bind (&RouteUI::solo_changed_so_update_mute, this), gui_context());
+       _session->TransportStateChange.connect (_session_connections, invalidator (*this), boost::bind (&RouteUI::check_rec_enable_sensitivity, this), gui_context());
+       _session->RecordStateChanged.connect (_session_connections, invalidator (*this), boost::bind (&RouteUI::session_rec_enable_changed, this), gui_context());
+
+       _session->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&RouteUI::parameter_changed, this, _1), gui_context());
+       Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&RouteUI::parameter_changed, this, _1), gui_context());
 
        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);
@@ -151,6 +170,12 @@ RouteUI::init ()
        solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false);
        mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false);
        mute_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false);
+
+       monitor_input_button->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), false);
+       monitor_disk_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_release), false);
 }
 
 void
@@ -164,22 +189,13 @@ RouteUI::reset ()
        delete mute_menu;
        mute_menu = 0;
 
-       if (xml_node) {
-               /* do not delete the node - its owned by the route */
-               xml_node = 0;
-       }
-
-       route_active_menu_item = 0;
-       polarity_menu_item = 0;
        denormal_menu_item = 0;
 }
 
 void
 RouteUI::self_delete ()
 {
-       /* This may be called from a non-GUI thread. Keep it safe */
-
-       delete_when_idle (this);
+       delete this;
 }
 
 void
@@ -194,28 +210,48 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
        }
 
        if (self_destruct) {
-               rp->DropReferences.connect (route_connections, boost::bind (&RouteUI::self_delete, this), gui_context());
+               rp->DropReferences.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::self_delete, this), gui_context());
        }
-       
+
        mute_button->set_controllable (_route->mute_control());
        solo_button->set_controllable (_route->solo_control());
 
-       _route->active_changed.connect (route_connections, boost::bind (&RouteUI::route_active_changed, this), gui_context());
-       _route->mute_changed.connect (route_connections, ui_bind (&RouteUI::mute_changed, this, _1), gui_context());
-       _route->solo_changed.connect (route_connections, ui_bind (&RouteUI::solo_changed, this, _1), gui_context());
-       _route->listen_changed.connect (route_connections, ui_bind (&RouteUI::listen_changed, this, _1), gui_context());
-       _route->solo_isolated_changed.connect (route_connections, ui_bind (&RouteUI::solo_changed, this, _1), gui_context());
-       _route->PropertyChanged.connect (route_connections, ui_bind (&RouteUI::property_changed, this, _1), gui_context());
+       _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), ui_bind (&RouteUI::mute_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());
+
+        _route->phase_invert_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::polarity_changed, this), gui_context());
+       _route->PropertyChanged.connect (route_connections, invalidator (*this), ui_bind (&RouteUI::property_changed, this, _1), gui_context());
+
+       _route->io_changed.connect (route_connections, invalidator (*this), ui_bind (&RouteUI::setup_invert_buttons, this), gui_context ());
+       _route->gui_changed.connect (route_connections, invalidator (*this), ui_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->diskstream()->RecordEnableChanged.connect (route_connections, boost::bind (&RouteUI::route_rec_enable_changed, this), gui_context());
-
+               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());
 
                update_rec_display ();
+
+                if (is_midi_track()) {
+                        midi_track()->StepEditStatusChange.connect (route_connections, invalidator (*this),
+                                                                    ui_bind (&RouteUI::step_edit_changed, this, _1), gui_context());
+                }
+
+       }
+
+       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());
+
+               update_monitoring_display ();
        }
 
        mute_button->unset_flags (Gtk::CAN_FOCUS);
@@ -223,18 +259,26 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 
        mute_button->show();
 
-       if (_route->is_control()) {
+       if (_route->is_monitor()) {
                solo_button->hide ();
        } else {
                solo_button->show();
        }
 
-       /* map the current state */
+       map_frozen ();
+
+       setup_invert_buttons ();
+       set_invert_button_state ();
+}
 
-       mute_changed (0);
-       solo_changed (0);
+void
+RouteUI::polarity_changed ()
+{
+        if (!_route) {
+                return;
+        }
 
-       map_frozen ();
+       set_invert_button_state ();
 }
 
 bool
@@ -246,7 +290,7 @@ RouteUI::mute_press (GdkEventButton* ev)
 
        multiple_mute_change = false;
 
-       if (!ignore_toggle) {
+       if (!_i_am_the_modifier) {
 
                if (Keyboard::is_context_menu_event (ev)) {
 
@@ -262,9 +306,10 @@ RouteUI::mute_press (GdkEventButton* ev)
                                // Primary-button2 click is the midi binding click
                                // button2-click is "momentary"
 
-                               if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) {
-                                       return false;
-                               }
+
+                               if (mute_button->on_button_press_event (ev)) {
+                                        return true;
+                                }
 
                                _mute_release = new SoloMuteRelease (_route->muted ());
                        }
@@ -289,14 +334,14 @@ RouteUI::mute_press (GdkEventButton* ev)
                                                if (_mute_release) {
                                                        _mute_release->routes = _session->get_routes ();
                                                }
-                                                               
+
                                                _session->set_mute (_session->get_routes(), !_route->muted(), Session::rt_cleanup, true);
                                        }
 
                                } else {
 
                                        /* plain click applies change to this route */
-                                       
+
                                        boost::shared_ptr<RouteList> rl (new RouteList);
                                        rl->push_back (_route);
 
@@ -318,7 +363,7 @@ RouteUI::mute_press (GdkEventButton* ev)
 bool
 RouteUI::mute_release (GdkEventButton*)
 {
-       if (!ignore_toggle) {
+       if (!_i_am_the_modifier) {
                if (_mute_release){
                        _session->set_mute (_mute_release->routes, _mute_release->active, Session::rt_cleanup, true);
                        delete _mute_release;
@@ -337,51 +382,54 @@ RouteUI::solo_press(GdkEventButton* ev)
        if (ev->type == GDK_2BUTTON_PRESS || ev->type == GDK_3BUTTON_PRESS ) {
                return true;
        }
-       
+
        multiple_solo_change = false;
 
-       if (!ignore_toggle) {
-               
+       if (!_i_am_the_modifier) {
+
                if (Keyboard::is_context_menu_event (ev)) {
-                       
-                       if (solo_menu == 0) {
-                               build_solo_menu ();
-                       }
-                       
-                       solo_menu->popup (1, ev->time);
-                       
+
+                        if (!solo_isolated_led) {
+
+                                if (solo_menu == 0) {
+                                        build_solo_menu ();
+                                }
+
+                                solo_menu->popup (1, ev->time);
+                        }
+
                } else {
-                       
+
                        if (Keyboard::is_button2_event (ev)) {
-                               
+
                                // Primary-button2 click is the midi binding click
                                // button2-click is "momentary"
-                               
-                               if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) {
-                                       return false;
-                               }
 
-                               _solo_release = new SoloMuteRelease (_route->soloed());
+                                if (solo_button->on_button_press_event (ev)) {
+                                        return true;
+                                }
+
+                               _solo_release = new SoloMuteRelease (_route->self_soloed());
                        }
-                       
+
                        if (ev->button == 1 || Keyboard::is_button2_event (ev)) {
-                               
+
                                if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
-                                       
+
                                        /* Primary-Tertiary-click applies change to all 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(),  Session::rt_cleanup, true);
+                                               _session->set_listen (_session->get_routes(), !_route->listening_via_monitor(),  Session::rt_cleanup, true);
                                        } else {
-                                               _session->set_solo (_session->get_routes(), !_route->soloed(),  Session::rt_cleanup, true);
+                                               _session->set_solo (_session->get_routes(), !_route->self_soloed(),  Session::rt_cleanup, true);
                                        }
-                                       
+
                                } else if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
-                                       
+
                                        // Primary-Secondary-click: exclusively solo this track
 
                                        if (_solo_release) {
@@ -397,7 +445,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                                        }
                                                }
                                        }
-                                       
+
                                        if (Config->get_solo_control_is_listen_control()) {
                                                /* ??? we need a just_one_listen() method */
                                        } else {
@@ -405,36 +453,36 @@ RouteUI::solo_press(GdkEventButton* ev)
                                        }
 
                                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
-                                       
+
                                        // shift-click: toggle solo isolated status
-                                       
+
                                        _route->set_solo_isolated (!_route->solo_isolated(), this);
                                        delete _solo_release;
                                        _solo_release = 0;
-                                       
+
                                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-                                       
+
                                        /* Primary-button1: solo mix group.
                                           NOTE: Primary-button2 is MIDI learn.
                                        */
-                                       
+
                                        if (ev->button == 1 && _route->route_group()) {
 
                                                if (_solo_release) {
                                                        _solo_release->routes = _route->route_group()->route_list();
                                                }
-                                       
+
                                                if (Config->get_solo_control_is_listen_control()) {
-                                                       _session->set_listen (_route->route_group()->route_list(), !_route->listening(),  Session::rt_cleanup, true);
+                                                       _session->set_listen (_route->route_group()->route_list(), !_route->listening_via_monitor(),  Session::rt_cleanup, true);
                                                } else {
-                                                       _session->set_solo (_route->route_group()->route_list(), !_route->soloed(),  Session::rt_cleanup, true);
+                                                       _session->set_solo (_route->route_group()->route_list(), !_route->self_soloed(),  Session::rt_cleanup, true);
                                                }
                                        }
-                                       
+
                                } else {
-                                       
+
                                        /* click: solo this route */
-                                       
+
                                        boost::shared_ptr<RouteList> rl (new RouteList);
                                        rl->push_back (route());
 
@@ -443,9 +491,9 @@ RouteUI::solo_press(GdkEventButton* ev)
                                        }
 
                                        if (Config->get_solo_control_is_listen_control()) {
-                                               _session->set_listen (rl, !_route->listening());
+                                               _session->set_listen (rl, !_route->listening_via_monitor());
                                        } else {
-                                               _session->set_solo (rl, !_route->soloed());
+                                               _session->set_solo (rl, !_route->self_soloed());
                                        }
                                }
                        }
@@ -458,14 +506,18 @@ RouteUI::solo_press(GdkEventButton* ev)
 bool
 RouteUI::solo_release (GdkEventButton*)
 {
-       if (!ignore_toggle) {
-               
+       if (!_i_am_the_modifier) {
+
                if (_solo_release) {
 
                        if (_solo_release->exclusive) {
 
                        } else {
-                               _session->set_solo (_solo_release->routes, _solo_release->active, Session::rt_cleanup, true);
+                                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);
+                                }
                        }
 
                        delete _solo_release;
@@ -489,16 +541,25 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
                return true;
        }
 
-       if (!ignore_toggle && is_track() && rec_enable_button) {
+        if (is_midi_track()) {
 
-               if (Keyboard::is_button2_event (ev) && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+                /* cannot rec-enable while step-editing */
+
+                if (midi_track()->step_editing()) {
+                        return true;
+                }
+        }
+
+       if (!_i_am_the_modifier && is_track() && rec_enable_button) {
+
+               if (Keyboard::is_button2_event (ev)) {
 
                        // do nothing on midi sigc::bind event
-                       return false;
+                       return rec_enable_button->on_button_press_event (ev);
 
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
 
-                       _session->set_record_enable (_session->get_routes(), !rec_enable_button->get_active());
+                       _session->set_record_enabled (_session->get_routes(), !rec_enable_button->get_active());
 
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
@@ -506,7 +567,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
                           NOTE: Primary-button2 is MIDI learn.
                        */
                        if (ev->button == 1 && _route->route_group()) {
-                               _session->set_record_enable (_route->route_group()->route_list(), !rec_enable_button->get_active(), Session::rt_cleanup, true);
+                               _session->set_record_enabled (_route->route_group()->route_list(), !rec_enable_button->get_active(), Session::rt_cleanup, true);
                        }
 
                } else if (Keyboard::is_context_menu_event (ev)) {
@@ -517,16 +578,205 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 
                        boost::shared_ptr<RouteList> rl (new RouteList);
                        rl->push_back (route());
-                       _session->set_record_enable (rl, !rec_enable_button->get_active());
+                       _session->set_record_enabled (rl, !rec_enable_button->get_active());
+               }
+       }
+
+       return true;
+}
+
+void
+RouteUI::monitoring_changed ()
+{
+       update_monitoring_display ();
+}
+
+void
+RouteUI::update_monitoring_display ()
+{
+       if (!_route) {
+               return;
+       }
+
+       boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
+
+       if (!t) {
+               return;
+       }
+
+       MonitorState ms = t->monitoring_state();
+
+       if (ms & MonitoringInput) {
+               if (t->monitoring_choice() & MonitorInput) {
+                       monitor_input_button->set_visual_state (1);
+               } else {
+                       monitor_input_button->set_visual_state (2);
+               }
+       } else {
+               monitor_input_button->set_visual_state (0);
+       }
+
+       if (ms & MonitoringDisk) {
+               if (t->monitoring_choice() & MonitorDisk) {
+                       monitor_disk_button->set_visual_state (1);
+               } else {
+                       monitor_disk_button->set_visual_state (2);
+               }
+       } else {
+               monitor_disk_button->set_visual_state (0);
+       }
+}
+
+bool
+RouteUI::monitor_input_press(GdkEventButton* ev)
+{
+       return true;
+}
+
+bool
+RouteUI::monitor_input_release(GdkEventButton* ev)
+{
+       return monitor_release (ev, MonitorInput);
+}
+
+bool
+RouteUI::monitor_disk_press (GdkEventButton* ev)
+{
+       return true;
+}
+
+bool
+RouteUI::monitor_disk_release (GdkEventButton* ev)
+{
+       return monitor_release (ev, MonitorDisk);
+}
+
+bool
+RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
+{      
+       if (ev->button != 1) {
+               return false;
+       }
+
+       boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
+
+       if (!t) {
+               return true;
+       }
+
+       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);
+       } else {
+               /* this line will change when the options are non-orthogonal */
+               // mc = MonitorChoice (t->monitoring_choice() | monitor_choice);
+               mc = monitor_choice;
+       }
+
+       if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {       
+               rl = _session->get_routes ();
+
+       } 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());
                }
+       } else {
+               rl.reset (new RouteList);
+               rl->push_back (route());
        }
 
+       _session->set_monitoring (rl, mc, Session::rt_cleanup, true);           
+
        return true;
 }
 
+void
+RouteUI::build_record_menu ()
+{
+        if (record_menu) {
+                return;
+        }
+
+        /* no rec-button context menu for non-MIDI tracks
+         */
+
+        if (is_midi_track()) {
+                record_menu = new Menu;
+                record_menu->set_name ("ArdourContextMenu");
+
+                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<CheckMenuItem*> (&items.back());
+
+                if (_route->record_enabled()) {
+                        step_edit_item->set_sensitive (false);
+                }
+
+                step_edit_item->set_active (midi_track()->step_editing());
+        }
+}
+
+void
+RouteUI::toggle_step_edit ()
+{
+        if (!is_midi_track() || _route->record_enabled()) {
+                return;
+        }
+
+        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_visual_state (3);
+                }
+
+                start_step_editing ();
+
+                if (step_edit_item) {
+                        step_edit_item->set_active (true);
+                }
+
+        } else {
+
+                if (rec_enable_button) {
+                        rec_enable_button->set_visual_state (0);
+                }
+
+                stop_step_editing ();
+
+                if (step_edit_item) {
+                        step_edit_item->set_active (false);
+                }
+        }
+}
+
 bool
-RouteUI::rec_enable_release (GdkEventButton*)
+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;
+        }
+
        return true;
 }
 
@@ -539,24 +789,51 @@ RouteUI::build_sends_menu ()
        sends_menu->set_name ("ArdourContextMenu");
        MenuList& items = sends_menu->items();
 
-       items.push_back (MenuElem(_("Assign all tracks (prefader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_sends), PreFader)));
-       items.push_back (MenuElem(_("Assign all tracks (postfader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_sends), PostFader)));
-       items.push_back (MenuElem(_("Assign selected tracks (prefader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_selected_sends), PreFader)));
-       items.push_back (MenuElem(_("Assign selected tracks (postfader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_selected_sends), PostFader)));
-       items.push_back (MenuElem(_("Copy track gains to sends"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_from_track)));
+       items.push_back (
+               MenuElem(_("Assign all tracks (prefader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_sends), PreFader, false))
+               );
+
+       items.push_back (
+               MenuElem(_("Assign all tracks and buses (prefader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_sends), PreFader, true))
+               );
+
+       items.push_back (
+               MenuElem(_("Assign all tracks (postfader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_sends), PostFader, false))
+               );
+
+       items.push_back (
+               MenuElem(_("Assign all tracks and buses (postfader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_sends), PostFader, true))
+               );
+
+       items.push_back (
+               MenuElem(_("Assign selected tracks (prefader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_selected_sends), PreFader, false))
+               );
+
+       items.push_back (
+               MenuElem(_("Assign selected tracks and buses (prefader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_selected_sends), PreFader, true)));
+
+       items.push_back (
+               MenuElem(_("Assign selected tracks (postfader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_selected_sends), PostFader, false))
+               );
+
+       items.push_back (
+               MenuElem(_("Assign selected tracks and buses (postfader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_selected_sends), PostFader, true))
+               );
+
+       items.push_back (MenuElem(_("Copy track/bus gains to sends"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_from_track)));
        items.push_back (MenuElem(_("Set sends gain to -inf"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_to_zero)));
        items.push_back (MenuElem(_("Set sends gain to 0dB"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_to_unity)));
 
 }
 
 void
-RouteUI::create_sends (Placement p)
+RouteUI::create_sends (Placement p, bool include_buses)
 {
-       _session->globally_add_internal_sends (_route, p);
+       _session->globally_add_internal_sends (_route, p, include_buses);
 }
 
 void
-RouteUI::create_selected_sends (Placement p)
+RouteUI::create_selected_sends (Placement p, bool include_buses)
 {
        boost::shared_ptr<RouteList> rlist (new RouteList);
        TrackSelection& selected_tracks (ARDOUR_UI::instance()->the_editor().get_selection().tracks);
@@ -566,13 +843,13 @@ RouteUI::create_selected_sends (Placement p)
                RouteUI* rui;
                if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
                        if ((rui = dynamic_cast<RouteUI*>(rtv)) != 0) {
-                               if (boost::dynamic_pointer_cast<AudioTrack>(rui->route())) {
+                               if (include_buses || boost::dynamic_pointer_cast<AudioTrack>(rui->route())) {
                                        rlist->push_back (rui->route());
                                }
                        }
                }
        }
-       
+
        _session->add_internal_sends (_route, p, rlist);
 }
 
@@ -601,7 +878,7 @@ RouteUI::show_sends_press(GdkEventButton* ev)
                return true;
        }
 
-       if (!ignore_toggle && !is_track() && show_sends_button) {
+       if (!_i_am_the_modifier && !is_track() && show_sends_button) {
 
                if (Keyboard::is_button2_event (ev) && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
@@ -660,38 +937,29 @@ RouteUI::send_blink (bool onoff)
        }
 }
 
-void
-RouteUI::solo_changed(void* /*src*/)
-{
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_solo_display, this));
-}
-
-
-void
-RouteUI::listen_changed(void* /*src*/)
-{
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_solo_display, this));
-}
-
 int
 RouteUI::solo_visual_state (boost::shared_ptr<Route> r)
 {
-       if (r->is_master() || r->is_control()) {
+       if (r->is_master() || r->is_monitor()) {
                return 0;
        }
-       
+
        if (Config->get_solo_control_is_listen_control()) {
 
-               if (r->listening()) {
+               if (r->listening_via_monitor()) {
                        return 1;
                } else {
                        return 0;
                }
 
-       } 
-       
+       }
+
        if (r->soloed()) {
-               return 1;
+                if (!r->self_soloed()) {
+                        return 3;
+                } else {
+                        return 1;
+                }
        } else {
                return 0;
        }
@@ -700,24 +968,28 @@ RouteUI::solo_visual_state (boost::shared_ptr<Route> r)
 int
 RouteUI::solo_visual_state_with_isolate (boost::shared_ptr<Route> r)
 {
-       if (r->is_master() || r->is_control()) {
+       if (r->is_master() || r->is_monitor()) {
                return 0;
        }
-       
+
        if (Config->get_solo_control_is_listen_control()) {
 
-               if (r->listening()) {
+               if (r->listening_via_monitor()) {
                        return 1;
                } else {
-                       return 0;
+                        return 0;
                }
 
-       } 
-       
+       }
+
        if (r->solo_isolated()) {
                return 2;
        } else if (r->soloed()) {
-               return 1;
+                if (!r->self_soloed()) {
+                        return 3;
+                } else {
+                        return 1;
+                }
        } else {
                return 0;
        }
@@ -726,12 +998,26 @@ RouteUI::solo_visual_state_with_isolate (boost::shared_ptr<Route> r)
 int
 RouteUI::solo_isolate_visual_state (boost::shared_ptr<Route> r)
 {
-       if (r->is_master() || r->is_control()) {
+       if (r->is_master() || r->is_monitor()) {
                return 0;
        }
-       
+
        if (r->solo_isolated()) {
-                       return 1;
+               return 1;
+       } else {
+               return 0;
+       }
+}
+
+int
+RouteUI::solo_safe_visual_state (boost::shared_ptr<Route> r)
+{
+       if (r->is_master() || r->is_monitor()) {
+               return 0;
+       }
+
+       if (r->solo_safe()) {
+               return 1;
        } else {
                return 0;
        }
@@ -744,51 +1030,78 @@ RouteUI::update_solo_display ()
 
        if (Config->get_solo_control_is_listen_control()) {
 
-               if (solo_button->get_active() != (x = _route->listening())) {
-                       ignore_toggle = true;
+               if (solo_button->get_active() != (x = _route->listening_via_monitor())) {
+                       ++_i_am_the_modifier;
                        solo_button->set_active(x);
-                       ignore_toggle = false;
+                       --_i_am_the_modifier;
                }
 
        } else {
 
                if (solo_button->get_active() != (x = _route->soloed())) {
-                       ignore_toggle = true;
+                       ++_i_am_the_modifier;
                        solo_button->set_active (x);
-                       ignore_toggle = false;
+                       --_i_am_the_modifier;
                }
 
        }
 
-       solo_button->set_visual_state (solo_visual_state_with_isolate (_route));
+       bool yn = _route->solo_safe ();
+
+       if (solo_safe_check && solo_safe_check->get_active() != yn) {
+               solo_safe_check->set_active (yn);
+       }
+
+       yn = _route->solo_isolated ();
+
+       if (solo_isolated_check && solo_isolated_check->get_active() != yn) {
+               solo_isolated_check->set_active (yn);
+       }
+
+        set_button_names ();
+
+        if (solo_isolated_led) {
+                solo_isolated_led->set_visual_state (_route->solo_isolated() ? 1 : 0);
+        }
+
+        if (solo_safe_led) {
+                solo_safe_led->set_visual_state (_route->solo_safe() ? 1 : 0);
+        }
+
+       solo_button->set_visual_state (solo_visual_state (_route));
+
+        /* some changes to solo status can affect mute display, so catch up
+         */
+
+        update_mute_display ();
 }
 
 void
 RouteUI::solo_changed_so_update_mute ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_mute_display, this));
+       update_mute_display ();
 }
 
 void
 RouteUI::mute_changed(void* /*src*/)
 {
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_mute_display, this));
+       update_mute_display ();
 }
 
 int
 RouteUI::mute_visual_state (Session* s, boost::shared_ptr<Route> r)
 {
-       if (r->is_master() || r->is_control()) {
+       if (r->is_master() || r->is_monitor()) {
                return 0;
        }
-       
-       if (Config->get_show_solo_mutes()) {
-               
+
+
+       if (Config->get_show_solo_mutes() && !Config->get_solo_control_is_listen_control ()) {
+
                if (r->muted ()) {
                        /* full mute */
                        return 2;
                } else if (s->soloing() && !r->soloed() && !r->solo_isolated()) {
-                       /* mute-because-not-soloed */
                        return 1;
                } else {
                        /* no mute at all */
@@ -812,6 +1125,10 @@ RouteUI::mute_visual_state (Session* s, boost::shared_ptr<Route> r)
 void
 RouteUI::update_mute_display ()
 {
+        if (!_route) {
+                return;
+        }
+
        bool model = _route->muted();
        bool view = mute_button->get_active();
 
@@ -820,37 +1137,35 @@ RouteUI::update_mute_display ()
        */
 
        if (model != view) {
-               ignore_toggle = true;
+               ++_i_am_the_modifier;
                mute_button->set_active (model);
-               ignore_toggle = false;
+               --_i_am_the_modifier;
        }
 
-       mute_button->set_visual_state (mute_visual_state (_session, _route));
+        mute_button->set_visual_state (mute_visual_state (_session, _route));
 }
 
 void
 RouteUI::route_rec_enable_changed ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_rec_display, this));
+        update_rec_display ();
+       update_monitoring_display ();
 }
 
 void
 RouteUI::session_rec_enable_changed ()
 {
-       if (!rec_enable_button) {
-               return;
-       }
-
-       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_rec_display, this));
+        update_rec_display ();
+       update_monitoring_display ();
 }
 
 void
 RouteUI::update_rec_display ()
 {
-       if (!rec_enable_button) {
+       if (!rec_enable_button || !_route) {
                return;
        }
-                       
+
        bool model = _route->record_enabled();
        bool view = rec_enable_button->get_active();
 
@@ -859,31 +1174,39 @@ RouteUI::update_rec_display ()
        */
 
        if (model != view) {
-               ignore_toggle = true;
+               ++_i_am_the_modifier;
                rec_enable_button->set_active (model);
-               ignore_toggle = false;
+               --_i_am_the_modifier;
        }
 
        /* now make sure its color state is correct */
 
        if (model) {
+                switch (_session->record_status ()) {
+                case Session::Recording:
+                        rec_enable_button->set_visual_state (1);
+                        break;
 
-               switch (_session->record_status ()) {
-               case Session::Recording:
-                       rec_enable_button->set_visual_state (1);
-                       break;
+                case Session::Disabled:
+                case Session::Enabled:
+                        rec_enable_button->set_visual_state (2);
+                        break;
 
-               case Session::Disabled:
-               case Session::Enabled:
-                       rec_enable_button->set_visual_state (2);
-                       break;
+                }
 
-               }
+                if (step_edit_item) {
+                        step_edit_item->set_sensitive (false);
+                }
 
        } else {
                rec_enable_button->set_visual_state (0);
+
+                if (step_edit_item) {
+                        step_edit_item->set_sensitive (true);
+                }
        }
 
+
        check_rec_enable_sensitivity ();
 }
 
@@ -900,15 +1223,15 @@ RouteUI::build_solo_menu (void)
        check = new CheckMenuItem(_("Solo Isolate"));
        check->set_active (_route->solo_isolated());
        check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_isolated), check));
-       _route->solo_isolated_changed.connect (route_connections, ui_bind (&RouteUI::solo_isolated_toggle, this, _1, check), gui_context());
        items.push_back (CheckMenuElem(*check));
+        solo_isolated_check = dynamic_cast<CheckMenuItem*>(&items.back());
        check->show_all();
 
        check = new CheckMenuItem(_("Solo Safe"));
        check->set_active (_route->solo_safe());
        check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_safe), check));
-       _route->solo_safe_changed.connect (route_connections, ui_bind (&RouteUI::solo_safe_toggle, this, _1, check), gui_context());
        items.push_back (CheckMenuElem(*check));
+        solo_safe_check = dynamic_cast<CheckMenuItem*>(&items.back());
        check->show_all();
 
        //items.push_back (SeparatorElem());
@@ -953,7 +1276,7 @@ RouteUI::build_mute_menu(void)
        //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, boost::bind (&RouteUI::muting_change, this), gui_context());
+       _route->mute_points_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::muting_change, this), gui_context());
 }
 
 void
@@ -1005,10 +1328,59 @@ RouteUI::muting_change ()
        }
 }
 
+bool
+RouteUI::solo_isolate_button_release (GdkEventButton* ev)
+{
+        if (ev->type == GDK_2BUTTON_PRESS || ev->type == GDK_3BUTTON_PRESS) {
+                return true;
+        }
+
+        bool view = (solo_isolated_led->visual_state() != 0);
+        bool model = _route->solo_isolated();
+
+        /* called BEFORE the view has changed */
+
+        if (ev->button == 1) {
+                if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
+
+                        if (model) {
+                                /* disable isolate for all routes */
+                                _session->set_solo_isolated (_session->get_routes(), false, Session::rt_cleanup, true);
+                        }
+
+                } else {
+                        if (model == view) {
+
+                                /* 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);
+                        }
+                }
+        }
+
+        return true;
+}
+
+bool
+RouteUI::solo_safe_button_release (GdkEventButton*)
+{
+        _route->set_solo_safe (!(solo_safe_led->visual_state() > 0), this);
+        return true;
+}
+
 void
 RouteUI::toggle_solo_isolated (Gtk::CheckMenuItem* check)
 {
-       _route->set_solo_isolated (check->get_active(), this);
+        bool view = check->get_active();
+        bool model = _route->solo_isolated();
+
+        /* called AFTER the view has changed */
+
+        if (model != view) {
+                _route->set_solo_isolated (view, this);
+        }
 }
 
 void
@@ -1017,21 +1389,25 @@ RouteUI::toggle_solo_safe (Gtk::CheckMenuItem* check)
        _route->set_solo_safe (check->get_active(), this);
 }
 
-bool
-RouteUI::choose_color()
+/** Ask the user to choose a colour, and then set all selected tracks
+ *  to that colour.
+ */
+void
+RouteUI::choose_color ()
 {
        bool picked;
-       Gdk::Color color;
-
-       color = Gtkmm2ext::UI::instance()->get_color (_("ardour: color selection"), picked, &_color);
+       Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &_color);
 
        if (picked) {
-               set_color (color);
+               ARDOUR_UI::instance()->the_editor().get_selection().tracks.foreach_route_ui (
+                       boost::bind (&RouteUI::set_color, _1, color)
+                       );
        }
-
-       return picked;
 }
 
+/** 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)
 {
@@ -1039,124 +1415,158 @@ RouteUI::set_color (const Gdk::Color & c)
 
        _color = c;
 
-       ensure_xml_node ();
        snprintf (buf, sizeof (buf), "%d:%d:%d", c.get_red(), c.get_green(), c.get_blue());
-       xml_node->add_property ("color", buf);
 
+       /* 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<string> (route_state_id(), X_("color"), buf);
        _route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
 }
 
-
-void
-RouteUI::ensure_xml_node ()
+/** @return GUI state ID for things that are common to the route in all its representations */
+string
+RouteUI::route_state_id () const
 {
-       if (xml_node == 0) {
-               if ((xml_node = _route->extra_xml ("GUI")) == 0) {
-                       xml_node = new XMLNode ("GUI");
-                       _route->add_extra_xml (*xml_node);
-               }
-       }
+       return string_compose (X_("route %1"), _route->id().to_s());
 }
 
-XMLNode*
-RouteUI::get_automation_child_xml_node (Evoral::Parameter param)
+int
+RouteUI::set_color_from_route ()
 {
-       ensure_xml_node ();
-
-       XMLNodeList kids = xml_node->children();
-       XMLNodeConstIterator iter;
+       const string str = gui_object_state().get_string (route_state_id(), X_("color"));
 
-       const string sym = ARDOUR::EventTypeMap::instance().to_symbol(param);
-
-       for (iter = kids.begin(); iter != kids.end(); ++iter) {
-               if ((*iter)->name() == AutomationTimeAxisView::state_node_name) {
-                       XMLProperty* type = (*iter)->property("automation-id");
-                       if (type && type->value() == sym)
-                               return *iter;
-               }
+       if (str.empty()) {
+               return 1;
        }
 
-       // Didn't find it, make a new one
-       XMLNode* child = new XMLNode (AutomationTimeAxisView::state_node_name);
-       child->add_property("automation-id", sym);
-       xml_node->add_child_nocopy (*child);
+       int r, g, b;
 
-       return child;
-}
-
-int
-RouteUI::set_color_from_route ()
-{
-       XMLProperty *prop;
+       sscanf (str.c_str(), "%d:%d:%d", &r, &g, &b);
 
-       RouteUI::ensure_xml_node ();
+       _color.set_red (r);
+       _color.set_green (g);
+       _color.set_blue (b);
 
-       if ((prop = xml_node->property ("color")) != 0) {
-               int r, g, b;
-               sscanf (prop->value().c_str(), "%d:%d:%d", &r, &g, &b);
-               _color.set_red(r);
-               _color.set_green(g);
-               _color.set_blue(b);
-               return 0;
-       }
-       return 1;
+       return 0;
 }
 
 void
-RouteUI::remove_this_route ()
+RouteUI::remove_this_route (bool apply_to_selection)
 {
-       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(this cannot be undone)"), _route->name());
+       if (apply_to_selection) {
+               ARDOUR_UI::instance()->the_editor().get_selection().tracks.foreach_route_ui (boost::bind (&RouteUI::remove_this_route, _1, false));
        } else {
-               prompt  = string_compose (_("Do you really want to remove bus \"%1\" ?\n(this cannot be undone)"), _route->name());
-       }
+               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;
+               }
 
-       choices.push_back (_("No, do nothing."));
-       choices.push_back (_("Yes, remove it."));
+               vector<string> choices;
+               string prompt;
 
-       string title;
-       if (is_track()) {
-               title = _("Remove track");
-       } else {
-               title = _("Remove bus");
-       }
+               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."));
 
-       Choice prompter (title, prompt, choices);
+               string title;
+               if (is_track()) {
+                       title = _("Remove track");
+               } else {
+                       title = _("Remove bus");
+               }
 
-       if (prompter.run () == 1) {
-               Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (&RouteUI::idle_remove_this_route), this));
+               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);
+       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)
+{
+       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);
+
+       return (colon_msg.run () == Gtk::RESPONSE_ACCEPT);
+}
+
 void
 RouteUI::route_rename ()
 {
        ArdourPrompter name_prompter (true);
        string result;
-       name_prompter.set_prompt (_("New Name: "));
+       bool done = false;
+
+       if (is_track()) {
+               name_prompter.set_title (_("Rename Track"));
+       } else {
+               name_prompter.set_title (_("Rename Bus"));
+       }
+       name_prompter.set_prompt (_("New name:"));
        name_prompter.set_initial_text (_route->name());
        name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
        name_prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
        name_prompter.show_all ();
 
-       switch (name_prompter.run ()) {
+       while (!done) {
+               switch (name_prompter.run ()) {
+               case Gtk::RESPONSE_ACCEPT:
+                       name_prompter.get_result (result);
+                       name_prompter.hide ();
+                       if (result.length()) {
+                               if (verify_new_route_name (result)) {
+                                       _route->set_name (result);
+                                       done = true;
+                               } else {
+                                       /* back to name prompter */
+                               }
 
-       case Gtk::RESPONSE_ACCEPT:
-        name_prompter.get_result (result);
-        if (result.length()) {
-                       _route->set_name (result);
+                       } else {
+                               /* nothing entered, just get out of here */
+                               done = true;
+                       }
+                       break;
                }
-               break;
        }
 
        return;
@@ -1172,52 +1582,12 @@ RouteUI::property_changed (const PropertyChange& what_changed)
 }
 
 void
-RouteUI::toggle_route_active ()
-{
-       bool yn;
-
-       if (route_active_menu_item) {
-               if (route_active_menu_item->get_active() != (yn = _route->active())) {
-                       _route->set_active (!yn);
-               }
-       }
-}
-
-void
-RouteUI::route_active_changed ()
-{
-       if (route_active_menu_item) {
-               Gtkmm2ext::UI::instance()->call_slot (boost::bind (&CheckMenuItem::set_active, route_active_menu_item, _route->active()));
-       }
-}
-
-void
-RouteUI::toggle_polarity ()
+RouteUI::set_route_active (bool a, bool apply_to_selection)
 {
-       if (polarity_menu_item) {
-
-               bool x;
-
-               ENSURE_GUI_THREAD (*this, &RouteUI::toggle_polarity)
-
-               if ((x = polarity_menu_item->get_active()) != _route->phase_invert()) {
-                       _route->set_phase_invert (x);
-                       if (x) {
-                               name_label.set_text (X_("Ø ") + name_label.get_text());
-                       } else {
-                               name_label.set_text (_route->name());
-                       }
-               }
-       }
-}
-
-void
-RouteUI::polarity_changed ()
-{
-       if (_route->phase_invert()) {
-               name_label.set_text (X_("Ø ") + name_label.get_text());
+       if (apply_to_selection) {
+               ARDOUR_UI::instance()->the_editor().get_selection().tracks.foreach_route_ui (boost::bind (&RouteTimeAxisView::set_route_active, _1, a, false));
        } else {
-               name_label.set_text (_route->name());
+               _route->set_active (a, this);
        }
 }
 
@@ -1244,27 +1614,6 @@ RouteUI::denormal_protection_changed ()
        }
 }
 
-void
-RouteUI::solo_isolated_toggle(void* /*src*/, Gtk::CheckMenuItem* check)
-{
-       bool yn = _route->solo_isolated ();
-
-       if (check->get_active() != yn) {
-               check->set_active (yn);
-       }
-}
-
-
-void
-RouteUI::solo_safe_toggle(void* /*src*/, Gtk::CheckMenuItem* check)
-{
-       bool yn = _route->solo_safe ();
-
-       if (check->get_active() != yn) {
-               check->set_active (yn);
-       }
-}
-
 void
 RouteUI::disconnect_input ()
 {
@@ -1313,16 +1662,10 @@ RouteUI::midi_track() const
        return boost::dynamic_pointer_cast<MidiTrack>(_route);
 }
 
-boost::shared_ptr<Diskstream>
-RouteUI::get_diskstream () const
+bool
+RouteUI::has_audio_outputs () const
 {
-       boost::shared_ptr<Track> t;
-
-       if ((t = boost::dynamic_pointer_cast<Track>(_route)) != 0) {
-               return t->diskstream();
-       } else {
-               return boost::shared_ptr<Diskstream> ((Diskstream*) 0);
-       }
+       return (_route->n_outputs().n_audio() > 0);
 }
 
 string
@@ -1360,7 +1703,7 @@ void
 RouteUI::save_as_template ()
 {
        sys::path path;
-       Glib::ustring safe_name;
+       std::string safe_name;
        string name;
 
        path = ARDOUR::user_route_template_directory ();
@@ -1372,7 +1715,9 @@ RouteUI::save_as_template ()
 
        Prompter p (true); // modal
 
+       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;
@@ -1399,19 +1744,21 @@ RouteUI::check_rec_enable_sensitivity ()
        } else {
                rec_enable_button->set_sensitive (true);
        }
+
+       update_monitoring_display ();
 }
 
 void
 RouteUI::parameter_changed (string const & p)
 {
-       ENSURE_GUI_THREAD (*this, &RouteUI::parameter_changed, p)
+       /* this handles RC and per-session parameter changes */
 
        if (p == "disable-disarm-during-roll") {
                check_rec_enable_sensitivity ();
-       } else if (p == "solo-control-is-listen-control") {
-               set_button_names ();
-       } else if (p == "listen-position") {
+       } else if (p == "use-monitor-bus" || p == "solo-control-is-listen-control" || p == "listen-position") {
                set_button_names ();
+       } else if (p == "auto-input") {
+               update_monitoring_display ();
        }
 }
 
@@ -1467,3 +1814,165 @@ RouteUI::open_remote_control_id_dialog ()
                _route->set_remote_control_id (spin->get_value_as_int ());
        }
 }
+
+void
+RouteUI::setup_invert_buttons ()
+{
+       /* remove old invert buttons */
+       for (list<BindableToggleButton*>::iterator i = _invert_buttons.begin(); i != _invert_buttons.end(); ++i) {
+               _invert_button_box.remove (**i);
+       }
+
+       _invert_buttons.clear ();
+
+       if (!_route || !_route->input()) {
+               return;
+       }
+
+       uint32_t const N = _route->input()->n_ports().n_audio ();
+
+       uint32_t const to_add = (N <= _max_invert_buttons) ? N : 1;
+
+       for (uint32_t i = 0; i < to_add; ++i) {
+               BindableToggleButton* b = manage (new BindableToggleButton);
+               b->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::invert_toggled), i, b));
+               b->signal_button_press_event().connect (sigc::mem_fun (*this, &RouteUI::invert_press));
+
+               b->set_name (X_("MixerInvertButton"));
+               if (to_add == 1) {
+                       b->add (*manage (new Label (X_("Ø"))));
+               } else {
+                       b->add (*manage (new Label (string_compose (X_("Ø%1"), i + 1))));
+               }
+
+               if (N <= 4) {
+                       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));
+               } else {
+                       UI::instance()->set_tip (*b, string_compose (_("Left-click to invert (phase reverse) all channels of this track.  Right-click to show menu."), i + 1));
+               }
+
+               _invert_buttons.push_back (b);
+               _invert_button_box.pack_start (*b);
+       }
+
+       _invert_button_box.show_all ();
+}
+
+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) {
+               _invert_buttons.front()->set_active (_route->phase_invert().any());
+               --_i_am_the_modifier;
+               return;
+       }
+
+       int j = 0;
+       for (list<BindableToggleButton*>::iterator i = _invert_buttons.begin(); i != _invert_buttons.end(); ++i, ++j) {
+               (*i)->set_active (_route->phase_invert (j));
+       }
+
+       --_i_am_the_modifier;
+}
+
+void
+RouteUI::invert_toggled (uint32_t i, BindableToggleButton* b)
+{
+       if (_i_am_the_modifier) {
+               return;
+       }
+
+       uint32_t const N = _route->input()->n_ports().n_audio();
+       if (N <= _max_invert_buttons) {
+               _route->set_phase_invert (i, b->get_active ());
+       } else {
+               boost::dynamic_bitset<> p (N);
+               if (b->get_active ()) {
+                       p.set ();
+               }
+               _route->set_phase_invert (p);
+       }
+}
+
+bool
+RouteUI::invert_press (GdkEventButton* ev)
+{
+       using namespace Menu_Helpers;
+
+       if (ev->button != 3) {
+               return true;
+       }
+
+       delete _invert_menu;
+       _invert_menu = new Menu;
+       _invert_menu->set_name ("ArdourContextMenu");
+       MenuList& items = _invert_menu->items ();
+
+       uint32_t const N = _route->input()->n_ports().n_audio();
+       for (uint32_t i = 0; i < N; ++i) {
+               items.push_back (CheckMenuElem (string_compose (X_("Ø%1"), i + 1), sigc::bind (sigc::mem_fun (*this, &RouteUI::invert_menu_toggled), i)));
+               CheckMenuItem* e = dynamic_cast<CheckMenuItem*> (&items.back ());
+               ++_i_am_the_modifier;
+               e->set_active (_route->phase_invert (i));
+               --_i_am_the_modifier;
+       }
+
+       _invert_menu->popup (0, ev->time);
+
+       return false;
+}
+
+void
+RouteUI::invert_menu_toggled (uint32_t c)
+{
+       if (_i_am_the_modifier) {
+               return;
+       }
+
+       _route->set_phase_invert (c, !_route->phase_invert (c));
+}
+
+void
+RouteUI::set_invert_sensitive (bool yn)
+{
+        for (list<BindableToggleButton*>::iterator b = _invert_buttons.begin(); b != _invert_buttons.end(); ++b) {
+                (*b)->set_sensitive (yn);
+        }
+}
+
+void
+RouteUI::request_redraw ()
+{
+       if (_route) {
+               _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+       }
+}
+
+/** The Route's gui_changed signal has been emitted */
+void
+RouteUI::route_gui_changed (string what_changed)
+{
+       if (what_changed == "color") {
+               if (set_color_from_route () == 0) {
+                       route_color_changed ();
+               }
+       }
+}
+
+/** @return the color that this route should use; it maybe its own,
+    or it maybe that of its route group.
+*/
+Gdk::Color
+RouteUI::color () const
+{
+       RouteGroup* g = _route->route_group ();
+       
+       if (g && g->is_color()) {
+               return GroupTabs::group_color (g);
+       }
+
+       return _color;
+}