solo buttons are now ArdourButtons
[ardour.git] / gtk2_ardour / route_ui.cc
index 6c9d5a6ef3d8e22ae0878968836029d1fbf32847..c12658d973f545b43199da15d7efa6d9b8ea9259 100644 (file)
@@ -34,7 +34,7 @@
 #include "ardour_ui.h"
 #include "editor.h"
 #include "route_ui.h"
-#include "led.h"
+#include "ardour_button.h"
 #include "keyboard.h"
 #include "utils.h"
 #include "prompter.h"
@@ -44,6 +44,7 @@
 #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"
@@ -70,13 +71,6 @@ RouteUI::RouteUI (ARDOUR::Session* sess)
        init ();
 }
 
-RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session* sess)
-       : AxisView(sess)
-{
-       init ();
-       set_route (rt);
-}
-
 RouteUI::~RouteUI()
 {
        _route.reset (); /* drop reference to route, so that it can be cleaned up */
@@ -93,7 +87,6 @@ void
 RouteUI::init ()
 {
        self_destruct = true;
-       xml_node = 0;
        mute_menu = 0;
        solo_menu = 0;
        sends_menu = 0;
@@ -117,37 +110,42 @@ RouteUI::init ()
 
        setup_invert_buttons ();
 
-       mute_button = manage (new BindableToggleButton ());
-       // mute_button->set_self_managed (true);
-       mute_button->set_name ("MuteButton");
-       mute_button->add (mute_button_label);
-       mute_button_label.show ();
+       mute_button = manage (new ArdourButton);
+       mute_button->set_name ("mute button");
        UI::instance()->set_tip (mute_button, _("Mute this track"), "");
 
-       solo_button = manage (new BindableToggleButton ());
-       // solo_button->set_self_managed (true);
-       solo_button->set_name ("SoloButton");
-       solo_button->add (solo_button_label);
-       solo_button_label.show ();
+       solo_button = manage (new ArdourButton);
+       solo_button->set_name ("solo button");
        UI::instance()->set_tip (solo_button, _("Mute other (non-soloed) tracks"), "");
        solo_button->set_no_show_all (true);
 
-       rec_enable_button = manage (new BindableToggleButton ());
-       rec_enable_button->set_name ("RecordEnableButton");
-       // rec_enable_button->set_self_managed (true);
+       rec_enable_button = manage (new BindableToggleButton);
+       rec_enable_button->set_name ("record enable button");
        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 = 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"), "");
 
+       monitor_input_button = manage (new ArdourButton (ArdourButton::led_default_elements));
+       monitor_input_button->set_name ("monitor");
+       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::led_default_elements));
+       monitor_disk_button->set_name ("monitor");
+       monitor_disk_button->set_text (_("Disk"));
+       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);
@@ -160,6 +158,15 @@ RouteUI::init ()
        solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false);
        mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false);
        mute_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false);
+       
+       monitor_input_button->set_distinct_led_click (false);
+       monitor_disk_button->set_distinct_led_click (false);
+
+       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_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));
 }
 
 void
@@ -173,20 +180,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;
-       }
-
        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
@@ -203,7 +203,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
        if (self_destruct) {
                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());
 
@@ -219,12 +219,13 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
        _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->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());
 
@@ -237,6 +238,13 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 
        }
 
+       if (is_track()) {
+               boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
+               t->MonitoringChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::monitoring_changed, this), gui_context());
+
+               update_monitoring_display ();
+       }
+
        mute_button->unset_flags (Gtk::CAN_FOCUS);
        solo_button->unset_flags (Gtk::CAN_FOCUS);
 
@@ -317,14 +325,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);
 
@@ -365,54 +373,54 @@ RouteUI::solo_press(GdkEventButton* ev)
        if (ev->type == GDK_2BUTTON_PRESS || ev->type == GDK_3BUTTON_PRESS ) {
                return true;
        }
-       
+
        multiple_solo_change = false;
 
        if (!_i_am_the_modifier) {
-               
+
                if (Keyboard::is_context_menu_event (ev)) {
-                       
+
                         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 (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_via_monitor(),  Session::rt_cleanup, true);
                                        } else {
                                                _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) {
@@ -428,7 +436,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                                        }
                                                }
                                        }
-                                       
+
                                        if (Config->get_solo_control_is_listen_control()) {
                                                /* ??? we need a just_one_listen() method */
                                        } else {
@@ -436,36 +444,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_via_monitor(),  Session::rt_cleanup, true);
                                                } else {
                                                        _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());
 
@@ -490,7 +498,7 @@ bool
 RouteUI::solo_release (GdkEventButton*)
 {
        if (!_i_am_the_modifier) {
-               
+
                if (_solo_release) {
 
                        if (_solo_release->exclusive) {
@@ -530,7 +538,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 
                 if (midi_track()->step_editing()) {
                         return true;
-                } 
+                }
         }
 
        if (!_i_am_the_modifier && is_track() && rec_enable_button) {
@@ -568,6 +576,121 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
        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 (t->monitoring_choice() & MonitorInput) {
+               monitor_input_button->set_active_state (Gtkmm2ext::Active);
+       } else {
+               if (ms & MonitoringInput) {
+                       monitor_input_button->set_active_state (Gtkmm2ext::Mid);
+               } else {
+                       monitor_input_button->unset_active_state ();
+               }
+       }
+
+       if (t->monitoring_choice() & MonitorDisk) {
+               monitor_disk_button->set_active_state (Gtkmm2ext::Active);
+       } else {
+               if (ms & MonitoringDisk) {
+                       monitor_disk_button->set_active_state (Gtkmm2ext::Mid);
+               } else {
+                       monitor_disk_button->unset_active_state ();
+               }
+       }
+}
+
+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 ()
 {
@@ -575,16 +698,16 @@ RouteUI::build_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");
-                
+
                 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());
 
@@ -612,7 +735,7 @@ RouteUI::step_edit_changed (bool yn)
         if (yn) {
                 if (rec_enable_button) {
                         rec_enable_button->set_visual_state (3);
-                } 
+                }
 
                 start_step_editing ();
 
@@ -624,7 +747,7 @@ RouteUI::step_edit_changed (bool yn)
 
                 if (rec_enable_button) {
                         rec_enable_button->set_visual_state (0);
-                } 
+                }
 
                 stop_step_editing ();
 
@@ -660,15 +783,15 @@ RouteUI::build_sends_menu ()
        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))
                );
@@ -679,7 +802,7 @@ RouteUI::build_sends_menu ()
 
        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))
                );
@@ -687,7 +810,7 @@ RouteUI::build_sends_menu ()
        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)));
@@ -717,7 +840,7 @@ RouteUI::create_selected_sends (Placement p, bool include_buses)
                        }
                }
        }
-       
+
        _session->add_internal_sends (_route, p, rlist);
 }
 
@@ -765,11 +888,11 @@ RouteUI::show_sends_press(GdkEventButton* ev)
 
                        /* change button state */
 
-                       show_sends_button->set_active (!show_sends_button->get_active());
+                       show_sends_button->set_active_state (Active);
 
                        /* start blinking */
 
-                       if (show_sends_button->get_active()) {
+                       if (show_sends_button->active_state()) {
                                /* show sends to this bus */
                                MixerStrip::SwitchIO (_route);
                                send_blink_connection = ARDOUR_UI::instance()->Blink.connect (sigc::mem_fun(*this, &RouteUI::send_blink));
@@ -805,89 +928,59 @@ RouteUI::send_blink (bool onoff)
        }
 }
 
-int
-RouteUI::solo_visual_state (boost::shared_ptr<Route> r)
+Gtkmm2ext::ActiveState
+RouteUI::solo_active_state (boost::shared_ptr<Route> r)
 {
        if (r->is_master() || r->is_monitor()) {
-               return 0;
+               return ActiveState (0);
        }
-       
+
        if (Config->get_solo_control_is_listen_control()) {
 
                if (r->listening_via_monitor()) {
-                       return 1;
+                       return Active;
                } else {
-                       return 0;
+                       return ActiveState (0);
                }
 
-       } 
-       
+       }
+
        if (r->soloed()) {
                 if (!r->self_soloed()) {
-                        return 3;
+                        return Mid;
                 } else {
-                        return 1;
+                        return Active;
                 }
        } else {
-               return 0;
+               return ActiveState(0);
        }
 }
 
-int
-RouteUI::solo_visual_state_with_isolate (boost::shared_ptr<Route> r)
+Gtkmm2ext::ActiveState
+RouteUI::solo_isolate_active_state (boost::shared_ptr<Route> r)
 {
        if (r->is_master() || r->is_monitor()) {
-               return 0;
+               return ActiveState (0);
        }
-       
-       if (Config->get_solo_control_is_listen_control()) {
 
-               if (r->listening_via_monitor()) {
-                       return 1;
-               } else {
-                        return 0;
-               }
-
-       } 
-       
        if (r->solo_isolated()) {
-               return 2;
-       } else if (r->soloed()) {
-                if (!r->self_soloed()) {
-                        return 3;
-                } else {
-                        return 1;
-                }
+               return Active;
        } else {
-               return 0;
+               return ActiveState(0);
        }
 }
 
-int
-RouteUI::solo_isolate_visual_state (boost::shared_ptr<Route> r)
+Gtkmm2ext::ActiveState
+RouteUI::solo_safe_active_state (boost::shared_ptr<Route> r)
 {
        if (r->is_master() || r->is_monitor()) {
-               return 0;
+               return ActiveState (0);
        }
-       
-       if (r->solo_isolated()) {
-               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;
+               return Active;
        } else {
-               return 0;
+               return ActiveState (0);
        }
 }
 
@@ -898,17 +991,21 @@ RouteUI::update_solo_display ()
 
        if (Config->get_solo_control_is_listen_control()) {
 
-               if (solo_button->get_active() != (x = _route->listening_via_monitor())) {
+               if ((solo_button->active_state() == Active)!= (x = _route->listening_via_monitor())) {
                        ++_i_am_the_modifier;
-                       solo_button->set_active(x);
+                       solo_button->set_active_state (Active);
                        --_i_am_the_modifier;
                }
 
        } else {
 
-               if (solo_button->get_active() != (x = _route->soloed())) {
+               if ((solo_button->active_state() == Active) != (x = _route->soloed())) {
                        ++_i_am_the_modifier;
-                       solo_button->set_active (x);
+                       if (x) {
+                               solo_button->set_active_state (Active);
+                       } else {
+                               solo_button->unset_active_state();
+                       }
                        --_i_am_the_modifier;
                }
 
@@ -929,16 +1026,24 @@ RouteUI::update_solo_display ()
         set_button_names ();
 
         if (solo_isolated_led) {
-                solo_isolated_led->set_visual_state (_route->solo_isolated() ? 1 : 0);
+               if (_route->solo_isolated()) {
+                       solo_isolated_led->set_active_state (Gtkmm2ext::Active);
+               } else {
+                       solo_isolated_led->unset_active_state ();
+               }
         }
 
         if (solo_safe_led) {
-                solo_safe_led->set_visual_state (_route->solo_safe() ? 1 : 0);
+               if (_route->solo_safe()) {
+                       solo_safe_led->set_active_state (Gtkmm2ext::Active);
+               } else {
+                       solo_safe_led->unset_active_state ();
+               }
         }
 
-       solo_button->set_visual_state (solo_visual_state (_route));
-        
-        /* some changes to solo status can affect mute display, so catch up 
+       solo_button->set_active_state (solo_active_state (_route));
+
+        /* some changes to solo status can affect mute display, so catch up
          */
 
         update_mute_display ();
@@ -956,38 +1061,38 @@ RouteUI::mute_changed(void* /*src*/)
        update_mute_display ();
 }
 
-int
-RouteUI::mute_visual_state (Session* s, boost::shared_ptr<Route> r)
+ActiveState
+RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
 {
        if (r->is_master() || r->is_monitor()) {
-               return 0;
+               return ActiveState(0);
        }
 
-               
+
        if (Config->get_show_solo_mutes() && !Config->get_solo_control_is_listen_control ()) {
 
                if (r->muted ()) {
                        /* full mute */
-                       return 2;
+                       return Active;
                } else if (s->soloing() && !r->soloed() && !r->solo_isolated()) {
-                       return 1;
+                       return Mid;
                } else {
                        /* no mute at all */
-                       return 0;
+                       return ActiveState(0);
                }
 
        } else {
 
                if (r->muted()) {
                        /* full mute */
-                       return 2;
+                       return Active;
                } else {
                        /* no mute at all */
-                       return 0;
+                       return ActiveState(0);
                }
        }
 
-       return 0;
+       return ActiveState(0);
 }
 
 void
@@ -997,32 +1102,21 @@ RouteUI::update_mute_display ()
                 return;
         }
 
-       bool model = _route->muted();
-       bool view = mute_button->get_active();
-
-       /* first make sure the button's "depressed" visual
-          is correct.
-       */
-
-       if (model != view) {
-               ++_i_am_the_modifier;
-               mute_button->set_active (model);
-               --_i_am_the_modifier;
-       }
-
-        mute_button->set_visual_state (mute_visual_state (_session, _route));
+        mute_button->set_active_state (mute_active_state (_session, _route));
 }
 
 void
 RouteUI::route_rec_enable_changed ()
 {
         update_rec_display ();
+       update_monitoring_display ();
 }
 
 void
 RouteUI::session_rec_enable_changed ()
 {
         update_rec_display ();
+       update_monitoring_display ();
 }
 
 void
@@ -1031,7 +1125,7 @@ RouteUI::update_rec_display ()
        if (!rec_enable_button || !_route) {
                return;
        }
-                       
+
        bool model = _route->record_enabled();
        bool view = rec_enable_button->get_active();
 
@@ -1052,12 +1146,12 @@ RouteUI::update_rec_display ()
                 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;
-                        
+
                 }
 
                 if (step_edit_item) {
@@ -1071,7 +1165,7 @@ RouteUI::update_rec_display ()
                         step_edit_item->set_sensitive (true);
                 }
        }
-        
+
 
        check_rec_enable_sensitivity ();
 }
@@ -1201,7 +1295,7 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev)
                 return true;
         }
 
-        bool view = (solo_isolated_led->visual_state() != 0);
+        bool view = solo_isolated_led->active_state();
         bool model = _route->solo_isolated();
 
         /* called BEFORE the view has changed */
@@ -1232,7 +1326,7 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev)
 bool
 RouteUI::solo_safe_button_release (GdkEventButton*)
 {
-        _route->set_solo_safe (!(solo_safe_led->visual_state() > 0), this);
+        _route->set_solo_safe (!solo_safe_led->active_state(), this);
         return true;
 }
 
@@ -1271,6 +1365,9 @@ RouteUI::choose_color ()
        }
 }
 
+/** 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)
 {
@@ -1278,98 +1375,41 @@ 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);
-               } else {
-                       /* the Route has one; it may have been loaded */
-                       if (Stateful::loading_state_version != 0 && Stateful::loading_state_version < 3000) {
-                               /* the GUI extra XML is in 2.X format; we must convert it to the new
-                                  format to avoid problems later
-                               */
-
-                               XMLNode* new_xml_node = new XMLNode (X_("GUI"));
-                               XMLPropertyList old_gui_props = xml_node->properties ();
-                               for (XMLPropertyIterator i = old_gui_props.begin(); i != old_gui_props.end(); ++i) {
-                                       new_xml_node->add_property ((*i)->name().c_str (), (*i)->value().c_str ());
-                               }
-
-                               XMLNodeList old_children = xml_node->children ();
-                               for (XMLNodeConstIterator i = old_children.begin(); i != old_children.end(); ++i) {
-                                       XMLNode* new_child = new XMLNode (AutomationTimeAxisView::state_node_name);
-                                       new_child->add_property (X_("automation-id"), (*i)->name());
-
-                                       XMLPropertyList old_props = (*i)->properties ();
-                                       for (XMLPropertyIterator j = old_props.begin(); j != old_props.end(); ++j) {
-                                               new_child->add_property ((*j)->name().c_str (), (*j)->value().c_str ());
-                                       }
-
-                                       new_xml_node->add_child_nocopy (*new_child);
-                               }
-
-                               _route->add_extra_xml (*new_xml_node);
-                               xml_node = new_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 ();
+       const string str = gui_object_state().get_string (route_state_id(), X_("color"));
 
-       XMLNodeList kids = xml_node->children();
-       XMLNodeConstIterator iter;
-
-       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;
-}
+       sscanf (str.c_str(), "%d:%d:%d", &r, &g, &b);
 
-int
-RouteUI::set_color_from_route ()
-{
-       XMLProperty *prop;
-
-       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
@@ -1396,28 +1436,28 @@ edit your ardour.rc file to set the\n\
                        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));
                }
@@ -1431,11 +1471,32 @@ RouteUI::idle_remove_this_route (RouteUI *rui)
        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;
+       bool done = false;
+
        if (is_track()) {
                name_prompter.set_title (_("Rename Track"));
        } else {
@@ -1447,13 +1508,25 @@ RouteUI::route_rename ()
        name_prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
        name_prompter.show_all ();
 
-       switch (name_prompter.run ()) {
-       case Gtk::RESPONSE_ACCEPT:
-                name_prompter.get_result (result);
-                if (result.length()) {
-                       _route->set_name (result);
+       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 */
+                               }
+
+                       } else {
+                               /* nothing entered, just get out of here */
+                               done = true;
+                       }
+                       break;
                }
-               break;
        }
 
        return;
@@ -1631,15 +1704,21 @@ RouteUI::check_rec_enable_sensitivity ()
        } else {
                rec_enable_button->set_sensitive (true);
        }
+
+       update_monitoring_display ();
 }
 
 void
 RouteUI::parameter_changed (string const & p)
 {
+       /* this handles RC and per-session parameter changes */
+
        if (p == "disable-disarm-during-roll") {
                check_rec_enable_sensitivity ();
        } else if (p == "use-monitor-bus" || p == "solo-control-is-listen-control" || p == "listen-position") {
                set_button_names ();
+       } else if (p == "auto-input") {
+               update_monitoring_display ();
        }
 }
 
@@ -1718,7 +1797,7 @@ RouteUI::setup_invert_buttons ()
                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_("Ø"))));
@@ -1731,11 +1810,11 @@ RouteUI::setup_invert_buttons ()
                } 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 ();
 }
 
@@ -1743,7 +1822,7 @@ 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());
@@ -1765,7 +1844,7 @@ 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 ());
@@ -1812,7 +1891,7 @@ RouteUI::invert_menu_toggled (uint32_t c)
        if (_i_am_the_modifier) {
                return;
        }
-       
+
        _route->set_phase_invert (c, !_route->phase_invert (c));
 }
 
@@ -1823,3 +1902,37 @@ RouteUI::set_invert_sensitive (bool yn)
                 (*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;
+}