the endless quest to plug memory leaks -- episode 379
[ardour.git] / gtk2_ardour / route_ui.cc
index bfd3ed10067c1dda7dd0531c725f7bed72314c58..3f2f39d0cdc59d5e3aadc7f1a9e149e665eb2d13 100644 (file)
 #include "ardour/session.h"
 #include "ardour/template_utils.h"
 
+#include "ardour_button.h"
+#include "ardour_dialog.h"
 #include "ardour_ui.h"
+#include "automation_time_axis.h"
 #include "editor.h"
-#include "route_ui.h"
-#include "ardour_button.h"
-#include "keyboard.h"
-#include "utils.h"
-#include "plugin_pin_dialog.h"
-#include "prompter.h"
+#include "group_tabs.h"
+#include "gui_object.h"
 #include "gui_thread.h"
-#include "ardour_dialog.h"
+#include "keyboard.h"
 #include "latency_gui.h"
 #include "mixer_strip.h"
-#include "automation_time_axis.h"
+#include "plugin_pin_dialog.h"
+#include "prompter.h"
+#include "rgb_macros.h"
 #include "route_time_axis.h"
-#include "group_tabs.h"
+#include "route_ui.h"
 #include "timers.h"
 #include "ui_config.h"
+#include "utils.h"
 
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
@@ -83,7 +85,8 @@ boost::weak_ptr<Route> RouteUI::_showing_sends_to;
 std::string RouteUI::program_port_prefix;
 
 RouteUI::RouteUI (ARDOUR::Session* sess)
-       : AxisView(sess)
+       : monitor_input_button (0)
+       , monitor_disk_button (0)
        , mute_menu(0)
        , solo_menu(0)
        , sends_menu(0)
@@ -100,13 +103,16 @@ RouteUI::RouteUI (ARDOUR::Session* sess)
                boost::to_lower (lpn);
                program_port_prefix = lpn + ":"; // e.g. "ardour:"
        }
-       if (sess) init ();
+
+       if (sess) {
+               init ();
+       }
 }
 
 RouteUI::~RouteUI()
 {
        if (_route) {
-               gui_object_state().remove_node (route_state_id());
+               ARDOUR_UI::instance()->gui_object_state->remove_node (route_state_id());
        }
 
        _route.reset (); /* drop reference to route, so that it can be cleaned up */
@@ -119,6 +125,8 @@ RouteUI::~RouteUI()
        delete comment_window;
        delete input_selector;
        delete output_selector;
+       delete monitor_input_button;
+       delete monitor_disk_button;
        delete _invert_menu;
 
        send_blink_connection.disconnect ();
@@ -150,7 +158,6 @@ RouteUI::init ()
        multiple_mute_change = false;
        multiple_solo_change = false;
        _i_am_the_modifier = 0;
-       vca_button = 0;
 
        input_selector = 0;
        output_selector = 0;
@@ -179,13 +186,13 @@ RouteUI::init ()
        show_sends_button->set_name ("send alert button");
        UI::instance()->set_tip (show_sends_button, _("make mixer strips show sends to this bus"), "");
 
-       monitor_input_button = manage (new ArdourButton (ArdourButton::default_elements));
+       monitor_input_button = new ArdourButton (ArdourButton::default_elements);
        monitor_input_button->set_name ("monitor button");
        monitor_input_button->set_text (_("In"));
        UI::instance()->set_tip (monitor_input_button, _("Monitor input"), "");
        monitor_input_button->set_no_show_all (true);
 
-       monitor_disk_button = manage (new ArdourButton (ArdourButton::default_elements));
+       monitor_disk_button = new ArdourButton (ArdourButton::default_elements);
        monitor_disk_button->set_name ("monitor button");
        monitor_disk_button->set_text (_("Disk"));
        UI::instance()->set_tip (monitor_disk_button, _("Monitor playback"), "");
@@ -249,7 +256,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
        _route = rp;
 
        if (set_color_from_route()) {
-               set_color (unique_random_color());
+               set_color (gdk_color_to_rgba (AxisView::unique_random_color ()));
        }
 
        if (self_destruct) {
@@ -282,10 +289,10 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
        }
 
 
-       _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::property_changed, this, _1), gui_context());
+       _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_property_changed, this, _1), gui_context());
+       _route->presentation_info().PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_gui_changed, this, _1), gui_context ());
 
        _route->io_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::setup_invert_buttons, this), gui_context ());
-       _route->gui_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_gui_changed, this, _1), gui_context ());
 
        if (_session->writable() && is_track()) {
                boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
@@ -343,6 +350,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
        check_rec_enable_sensitivity ();
        maybe_add_route_print_mgr ();
        route_color_changed();
+       route_gui_changed (PropertyChange (Properties::selected));
 }
 
 void
@@ -415,7 +423,7 @@ RouteUI::mute_press (GdkEventButton* ev)
                                }
 
                                DisplaySuspender ds;
-                               _session->set_controls (route_list_to_control_list (copy, &Route::mute_control), _route->muted_by_self() ? 0.0 : 1.0, Controllable::UseGroup);
+                               _session->set_controls (route_list_to_control_list (copy, &Stripable::mute_control), _route->muted_by_self() ? 0.0 : 1.0, Controllable::UseGroup);
 
                        } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
@@ -444,7 +452,7 @@ RouteUI::mute_press (GdkEventButton* ev)
                                        }
 
                                        DisplaySuspender ds;
-                                       _session->set_controls (route_list_to_control_list (rl, &Route::mute_control), _route->muted_by_self() ? 0.0 : 1.0, Controllable::InverseGroup);
+                                       _session->set_controls (route_list_to_control_list (rl, &Stripable::mute_control), _route->muted_by_self() ? 0.0 : 1.0, Controllable::InverseGroup);
                                }
 
                        } else {
@@ -458,8 +466,7 @@ RouteUI::mute_press (GdkEventButton* ev)
                                        _mute_release->routes = rl;
                                }
 
-                               _session->set_control (_route->mute_control(), _route->muted_by_self() ? 0.0 : 1.0, Controllable::UseGroup);
-
+                               _route->mute_control()->set_value (!_route->muted_by_self(), Controllable::UseGroup);
                        }
                }
        }
@@ -472,7 +479,7 @@ RouteUI::mute_release (GdkEventButton* /*ev*/)
 {
        if (_mute_release){
                DisplaySuspender ds;
-               _session->set_controls (route_list_to_control_list (_mute_release->routes, &Route::mute_control), _mute_release->active, Controllable::UseGroup);
+               _session->set_controls (route_list_to_control_list (_mute_release->routes, &Stripable::mute_control), _mute_release->active, Controllable::UseGroup);
                delete _mute_release;
                _mute_release = 0;
        }
@@ -572,7 +579,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                }
 
                                DisplaySuspender ds;
-                               _session->set_controls (route_list_to_control_list (_session->get_routes(), &Route::solo_control), !_route->solo_control()->get_value(), Controllable::UseGroup);
+                               _session->set_controls (route_list_to_control_list (_session->get_routes(), &Stripable::solo_control), !_route->solo_control()->get_value(), Controllable::UseGroup);
 
                        } else if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
 
@@ -596,9 +603,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                        /* ??? we need a just_one_listen() method */
                                } else {
                                        DisplaySuspender ds;
-                                       boost::shared_ptr<ControlList> cl (new ControlList);
-                                       cl->push_back (_route->solo_control());
-                                       _session->set_controls (cl, 1.0, Controllable::NoGroup);
+                                       _route->solo_control()->set_value (1.0, Controllable::NoGroup);
                                }
 
                        } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
@@ -645,7 +650,7 @@ RouteUI::solo_press(GdkEventButton* ev)
 
                                        DisplaySuspender ds;
 
-                                       _session->set_controls (route_list_to_control_list (rl, &Route::solo_control), !_route->self_soloed(), Controllable::InverseGroup);
+                                       _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_control), !_route->self_soloed(), Controllable::InverseGroup);
                                }
 
                                delete _solo_release;
@@ -663,7 +668,7 @@ RouteUI::solo_press(GdkEventButton* ev)
                                }
 
                                DisplaySuspender ds;
-                               _session->set_controls (route_list_to_control_list (rl, &Route::solo_control), !_route->self_soloed(), Controllable::UseGroup);
+                               _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_control), !_route->self_soloed(), Controllable::UseGroup);
                        }
                }
        }
@@ -680,7 +685,7 @@ RouteUI::solo_release (GdkEventButton* /*ev*/)
 
                } else {
                        DisplaySuspender ds;
-                       _session->set_controls (route_list_to_control_list (_solo_release->routes, &Route::solo_control), _solo_release->active ? 1.0 : 0.0, Controllable::UseGroup);
+                       _session->set_controls (route_list_to_control_list (_solo_release->routes, &Stripable::solo_control), _solo_release->active ? 1.0 : 0.0, Controllable::UseGroup);
                }
 
                delete _solo_release;
@@ -727,7 +732,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
 
                        DisplaySuspender ds;
-                       _session->set_controls (route_list_to_control_list (_session->get_routes(), &Track::rec_enable_control), !track()->rec_enable_control()->get_value(), Controllable::NoGroup);
+                       _session->set_controls (route_list_to_control_list (_session->get_routes(), &Stripable::rec_enable_control), !track()->rec_enable_control()->get_value(), Controllable::NoGroup);
 
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
 
@@ -743,7 +748,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
                                rl->push_back (_route);
 
                                DisplaySuspender ds;
-                               _session->set_controls (route_list_to_control_list (rl, &Track::rec_enable_control), !track()->rec_enable_control()->get_value(), Controllable::InverseGroup);
+                               _session->set_controls (route_list_to_control_list (rl, &Stripable::rec_enable_control), !track()->rec_enable_control()->get_value(), Controllable::InverseGroup);
                        }
 
                } else if (Keyboard::is_context_menu_event (ev)) {
@@ -753,7 +758,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
                } else {
 
                        boost::shared_ptr<Track> trk = track();
-                       _session->set_control (trk->rec_enable_control(), !trk->rec_enable_control()->get_value(), Controllable::UseGroup);
+                       trk->rec_enable_control()->set_value (!trk->rec_enable_control()->get_value(), Controllable::UseGroup);
                }
        }
 
@@ -865,7 +870,7 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
        }
 
        DisplaySuspender ds;
-       _session->set_controls (route_list_to_control_list (rl, &Route::monitoring_control), (double) mc, Controllable::UseGroup);
+       _session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::UseGroup);
 
        return false;
 }
@@ -896,8 +901,8 @@ RouteUI::build_record_menu ()
                step_edit_item->set_active (midi_track()->step_editing());
        }
        if (rec_safe_item) {
-               rec_safe_item->set_sensitive (!_route->record_enabled());
-               rec_safe_item->set_active (_route->record_safe());
+               rec_safe_item->set_sensitive (!_route->rec_enable_control()->get_value());
+               rec_safe_item->set_active (_route->rec_safe_control()->get_value());
        }
 }
 
@@ -914,13 +919,21 @@ RouteUI::toggle_step_edit ()
 void
 RouteUI::toggle_rec_safe ()
 {
-       if (_route->record_enabled()) {
+       boost::shared_ptr<AutomationControl> rs = _route->rec_safe_control();
+
+       if (!rs) {
                return;
        }
-       DisplaySuspender ds;
-       boost::shared_ptr<RouteList> rl (new RouteList);
-       rl->push_back (_route);
-       _session->set_record_safe (rl, rec_safe_item->get_active (), Session::rt_cleanup);
+
+       /* This check is made inside the control too, but dong it here can't
+        * hurt.
+        */
+
+       if (_route->rec_enable_control()->get_value()) {
+               return;
+       }
+
+       rs->set_value (rec_safe_item->get_active (), Controllable::UseGroup);
 }
 
 void
@@ -1114,41 +1127,42 @@ RouteUI::send_blink (bool onoff)
 }
 
 Gtkmm2ext::ActiveState
-RouteUI::solo_active_state (boost::shared_ptr<Route> r)
+RouteUI::solo_active_state (boost::shared_ptr<Stripable> s)
 {
-       if (!r->can_solo()) {
+       boost::shared_ptr<SoloControl> sc = s->solo_control();
+
+       if (!sc) {
                return Gtkmm2ext::Off;
        }
 
-       if (Config->get_solo_control_is_listen_control()) {
-
-               if (r->listening_via_monitor()) {
-                       return Gtkmm2ext::ExplicitActive;
-               } else {
-                       return Gtkmm2ext::Off;
-               }
-
+       if (!sc->can_solo()) {
+               return Gtkmm2ext::Off;
        }
 
-       if (r->soloed()) {
-                if (!r->self_soloed()) {
-                        return Gtkmm2ext::ImplicitActive;
-                } else {
-                        return Gtkmm2ext::ExplicitActive;
-                }
+
+       if (sc->self_soloed()) {
+               return Gtkmm2ext::ExplicitActive;
+       } else if (sc->soloed_by_others()) {
+               return Gtkmm2ext::ImplicitActive;
        } else {
                return Gtkmm2ext::Off;
        }
 }
 
 Gtkmm2ext::ActiveState
-RouteUI::solo_isolate_active_state (boost::shared_ptr<Route> r)
+RouteUI::solo_isolate_active_state (boost::shared_ptr<Stripable> s)
 {
-       if (r->is_master() || r->is_monitor()) {
+       boost::shared_ptr<SoloIsolateControl> sc = s->solo_isolate_control();
+
+       if (!sc) {
                return Gtkmm2ext::Off;
        }
 
-       if (r->solo_isolate_control()->solo_isolated()) {
+       if (s->is_master() || s->is_monitor()) {
+               return Gtkmm2ext::Off;
+       }
+
+       if (sc->solo_isolated()) {
                return Gtkmm2ext::ExplicitActive;
        } else {
                return Gtkmm2ext::Off;
@@ -1156,13 +1170,19 @@ RouteUI::solo_isolate_active_state (boost::shared_ptr<Route> r)
 }
 
 Gtkmm2ext::ActiveState
-RouteUI::solo_safe_active_state (boost::shared_ptr<Route> r)
+RouteUI::solo_safe_active_state (boost::shared_ptr<Stripable> s)
 {
-       if (r->is_master() || r->is_monitor()) {
+       boost::shared_ptr<SoloSafeControl> sc = s->solo_safe_control();
+
+       if (!sc) {
                return Gtkmm2ext::Off;
        }
 
-       if (r->solo_safe_control()->solo_safe()) {
+       if (s->is_master() || s->is_monitor()) {
+               return Gtkmm2ext::Off;
+       }
+
+       if (sc->solo_safe()) {
                return Gtkmm2ext::ExplicitActive;
        } else {
                return Gtkmm2ext::Off;
@@ -1217,18 +1237,24 @@ RouteUI::solo_changed_so_update_mute ()
 }
 
 ActiveState
-RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
+RouteUI::mute_active_state (Session*, boost::shared_ptr<Stripable> s)
 {
-       if (r->is_monitor()) {
-               return ActiveState(0);
+       boost::shared_ptr<MuteControl> mc = s->mute_control();
+
+       if (s->is_monitor()) {
+               return Gtkmm2ext::Off;
+       }
+
+       if (!mc) {
+               return Gtkmm2ext::Off;
        }
 
        if (Config->get_show_solo_mutes() && !Config->get_solo_control_is_listen_control ()) {
 
-               if (r->mute_control()->muted_by_self ()) {
+               if (mc->muted_by_self ()) {
                        /* full mute */
                        return Gtkmm2ext::ExplicitActive;
-               } else if (r->muted_by_others_soloing () || r->muted_by_masters ()) {
+               } else if (mc->muted_by_others_soloing () || mc->muted_by_masters ()) {
                        /* this will reflect both solo mutes AND master mutes */
                        return Gtkmm2ext::ImplicitActive;
                } else {
@@ -1238,10 +1264,10 @@ RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
 
        } else {
 
-               if (r->mute_control()->muted_by_self()) {
+               if (mc->muted_by_self()) {
                        /* full mute */
                        return Gtkmm2ext::ExplicitActive;
-               } else if (r->muted_by_masters ()) {
+               } else if (mc->muted_by_masters ()) {
                        /* this shows only master mutes, not mute-by-others-soloing */
                        return Gtkmm2ext::ImplicitActive;
                } else {
@@ -1263,47 +1289,17 @@ RouteUI::update_mute_display ()
         mute_button->set_active_state (mute_active_state (_session, _route));
 }
 
-void
-RouteUI::update_vca_display ()
-{
-       if (!vca_button) {
-               return;
-       }
-
-       VCAList vcas (_session->vca_manager().vcas());
-       string label;
-
-       for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
-               if (_route->slaved_to (*v)) {
-                       if (!label.empty()) {
-                               label += ' ';
-                       }
-                       label += PBD::to_string ((*v)->number(), std::dec);
-               }
-       }
-
-       if (label.empty()) {
-               label = _("-vca-");
-               vca_button->set_active_state (Gtkmm2ext::Off);
-       } else {
-               vca_button->set_active_state (Gtkmm2ext::ExplicitActive);
-       }
-
-       vca_button->set_text (label);
-}
 
 void
 RouteUI::route_rec_enable_changed ()
 {
-       blink_rec_display(true);  //this lets the button change "immediately" rather than wait for the next blink
-       update_monitoring_display ();
+       blink_rec_display (true);  //this lets the button change "immediately" rather than wait for the next blink
 }
 
 void
 RouteUI::session_rec_enable_changed ()
 {
-       blink_rec_display(true);  //this lets the button change "immediately" rather than wait for the next blink
-       update_monitoring_display ();
+       blink_rec_display (true);  //this lets the button change "immediately" rather than wait for the next blink
 }
 
 void
@@ -1488,11 +1484,11 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev)
                        if (model) {
                                /* disable isolate for all routes */
                                DisplaySuspender ds;
-                               _session->set_controls (route_list_to_control_list (_session->get_routes(), &Route::solo_isolate_control), 0.0, Controllable::NoGroup);
+                               _session->set_controls (route_list_to_control_list (_session->get_routes(), &Stripable::solo_isolate_control), 0.0, Controllable::NoGroup);
                        } else {
                                /* enable isolate for all routes */
                                DisplaySuspender ds;
-                               _session->set_controls (route_list_to_control_list (_session->get_routes(), &Route::solo_isolate_control), 1.0, Controllable::NoGroup);
+                               _session->set_controls (route_list_to_control_list (_session->get_routes(), &Stripable::solo_isolate_control), 1.0, Controllable::NoGroup);
                        }
 
                } else {
@@ -1504,7 +1500,7 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev)
                                boost::shared_ptr<RouteList> rl (new RouteList);
                                rl->push_back (_route);
                                DisplaySuspender ds;
-                               _session->set_controls (route_list_to_control_list (rl, &Route::solo_isolate_control), view ? 0.0 : 1.0, Controllable::NoGroup);
+                               _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_isolate_control), view ? 0.0 : 1.0, Controllable::NoGroup);
                        }
                }
        }
@@ -1575,10 +1571,11 @@ void
 RouteUI::choose_color ()
 {
        bool picked;
-       Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &_color);
+       Gdk::Color c (gdk_color_from_rgb (_route->presentation_info().color()));
+       Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &c);
 
        if (picked) {
-               set_color(color);
+               set_color (gdk_color_to_rgba (color));
        }
 }
 
@@ -1586,22 +1583,9 @@ RouteUI::choose_color ()
  *  the route is in a group which shares its color with its routes.
  */
 void
-RouteUI::set_color (const Gdk::Color & c)
+RouteUI::set_color (uint32_t c)
 {
-       /* leave _color alone in the group case so that tracks can retain their
-        * own pre-group colors.
-        */
-
-       char buf[64];
-       _color = c;
-       snprintf (buf, sizeof (buf), "%d:%d:%d", c.get_red(), c.get_green(), c.get_blue());
-
-       /* note: we use the route state ID here so that color is the same for both
-          the time axis view and the mixer strip
-       */
-
-       gui_object_state().set_property<string> (route_state_id(), X_("color"), buf);
-       _route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
+       _route->presentation_info().set_color (c);
 }
 
 /** @return GUI state ID for things that are common to the route in all its representations */
@@ -1614,21 +1598,11 @@ RouteUI::route_state_id () const
 int
 RouteUI::set_color_from_route ()
 {
-       const string str = gui_object_state().get_string (route_state_id(), X_("color"));
-
-       if (str.empty()) {
-               return 1;
+       if (_route->presentation_info().color_set()) {
+               return 0; /* nothing to do */
        }
 
-       int r, g, b;
-
-       sscanf (str.c_str(), "%d:%d:%d", &r, &g, &b);
-
-       _color.set_red (r);
-       _color.set_green (g);
-       _color.set_blue (b);
-
-       return 0;
+       return 1; /* pick a color */
 }
 
 /** @return true if this name should be used for the route, otherwise false */
@@ -1696,14 +1670,6 @@ RouteUI::route_rename ()
 
 }
 
-void
-RouteUI::property_changed (const PropertyChange& what_changed)
-{
-       if (what_changed.contains (ARDOUR::Properties::name)) {
-               name_label.set_text (_route->name());
-       }
-}
-
 void
 RouteUI::toggle_comment_editor ()
 {
@@ -1868,12 +1834,6 @@ RouteUI::has_audio_outputs () const
        return (_route->n_outputs().n_audio() > 0);
 }
 
-string
-RouteUI::name() const
-{
-       return _route->name();
-}
-
 void
 RouteUI::map_frozen ()
 {
@@ -1971,7 +1931,7 @@ RouteUI::check_rec_enable_sensitivity ()
        } else {
                rec_enable_button->set_sensitive (true);
        }
-       if (_route && _route->record_safe ()) {
+       if (_route && _route->rec_safe_control () && _route->rec_safe_control()->get_value()) {
                rec_enable_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
        } else {
                rec_enable_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
@@ -2025,61 +1985,6 @@ RouteUI::page_gain_down ()
        _route->gain_control()->set_value (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), Controllable::UseGroup);
 }
 
-void
-RouteUI::open_remote_control_id_dialog ()
-{
-       ArdourDialog dialog (_("Remote Control ID"));
-       SpinButton* spin = 0;
-
-       dialog.get_vbox()->set_border_width (18);
-
-       if (Config->get_remote_model() == UserOrdered) {
-               uint32_t const limit = _session->ntracks() + _session->nbusses () + 4;
-
-               HBox* hbox = manage (new HBox);
-               hbox->set_spacing (6);
-               hbox->pack_start (*manage (new Label (_("Remote control ID:"))));
-               spin = manage (new SpinButton);
-               spin->set_digits (0);
-               spin->set_increments (1, 10);
-               spin->set_range (0, limit);
-               spin->set_value (_route->remote_control_id());
-               hbox->pack_start (*spin);
-               dialog.get_vbox()->pack_start (*hbox);
-
-               dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL);
-               dialog.add_button (Stock::APPLY, RESPONSE_ACCEPT);
-       } else {
-               Label* l = manage (new Label());
-               if (_route->is_master() || _route->is_monitor()) {
-                       l->set_markup (string_compose (_("The remote control ID of %1 is: %2\n\n\n"
-                                                        "The remote control ID of %3 cannot be changed."),
-                                                      Gtkmm2ext::markup_escape_text (_route->name()),
-                                                      _route->remote_control_id(),
-                                                      (_route->is_master() ? _("the master bus") : _("the monitor bus"))));
-               } else {
-                       l->set_markup (string_compose (_("The remote control ID of %5 is: %2\n\n\n"
-                                                        "Remote Control IDs are currently determined by track/bus ordering in %6.\n\n"
-                                                        "%3Use the User Interaction tab of the Preferences window if you want to change this%4"),
-                                                      (is_track() ? _("track") : _("bus")),
-                                                      _route->remote_control_id(),
-                                                      "<span size=\"small\" style=\"italic\">",
-                                                      "</span>",
-                                                      Gtkmm2ext::markup_escape_text (_route->name()),
-                                                      PROGRAM_NAME));
-               }
-               dialog.get_vbox()->pack_start (*l);
-               dialog.add_button (Stock::OK, RESPONSE_CANCEL);
-       }
-
-       dialog.show_all ();
-       int const r = dialog.run ();
-
-       if (r == RESPONSE_ACCEPT && spin) {
-               _route->set_remote_control_id (spin->get_value_as_int ());
-       }
-}
-
 void
 RouteUI::setup_invert_buttons ()
 {
@@ -2115,9 +2020,9 @@ RouteUI::setup_invert_buttons ()
                }
 
                if (N <= _max_invert_buttons) {
-                       UI::instance()->set_tip (*b, string_compose (_("Left-click to invert (phase reverse) channel %1 of this track.  Right-click to show menu."), i + 1));
+                       UI::instance()->set_tip (*b, string_compose (_("Left-click to invert polarity of channel %1 of this track. Right-click to show menu."), i + 1));
                } else {
-                       UI::instance()->set_tip (*b, _("Click to show a menu of channels for inversion (phase reverse)"));
+                       UI::instance()->set_tip (*b, _("Click to show a menu of channels to invert polarity"));
                }
 
                _invert_buttons.push_back (b);
@@ -2236,9 +2141,9 @@ RouteUI::request_redraw ()
 
 /** The Route's gui_changed signal has been emitted */
 void
-RouteUI::route_gui_changed (string what_changed)
+RouteUI::route_gui_changed (PropertyChange const& what_changed)
 {
-       if (what_changed == "color") {
+       if (what_changed.contains (Properties::color)) {
                if (set_color_from_route () == 0) {
                        route_color_changed ();
                }
@@ -2264,18 +2169,55 @@ RouteUI::track_mode_changed (void)
 /** @return the color that this route should use; it maybe its own,
     or it maybe that of its route group.
 */
+
 Gdk::Color
-RouteUI::color () const
+RouteUI::route_color () const
 {
+       Gdk::Color c;
        RouteGroup* g = _route->route_group ();
+       string p;
 
        if (g && g->is_color()) {
-               Gdk::Color c;
                set_color_from_rgba (c, GroupTabs::group_color (g));
-               return c;
+       } else {
+
+               /* deal with older 4.x color, which was stored in the GUI object state */
+
+               string p = ARDOUR_UI::instance()->gui_object_state->get_string (route_state_id(), X_("color"));
+
+               if (!p.empty()) {
+
+                       /* old v4.x or earlier session. Use this information */
+
+                       int red, green, blue;
+                       char colon;
+
+                       stringstream ss (p);
+
+                       /* old color format version was:
+
+                          16bit value for red:16 bit value for green:16 bit value for blue
+
+                          decode to rgb ..
+                       */
+
+                       ss >> red;
+                       ss >> colon;
+                       ss >> green;
+                       ss >> colon;
+                       ss >> blue;
+
+                       red >>= 2;
+                       green >>= 2;
+                       blue >>= 2;
+
+                       _route->presentation_info().set_color (RGBA_TO_UINT (red, green, blue, 255));
+               }
+
+               set_color_from_rgba (c, _route->presentation_info().color());
        }
 
-       return _color;
+       return c;
 }
 
 void
@@ -2390,3 +2332,20 @@ RouteUI::manage_pins ()
                proxy->present();
        }
 }
+
+bool
+RouteUI::mark_hidden (bool yn)
+{
+       if (yn != _route->presentation_info().hidden()) {
+               _route->presentation_info().set_hidden (yn);
+               return true; // things changed
+       }
+       return false;
+}
+
+boost::shared_ptr<Stripable>
+RouteUI::stripable () const
+{
+       return _route;
+}
+