MidiGhostRegion micro-optimisation.

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index bfa8ecc95ad944a36c12e79e55e639c6d16a5da3..1ce6114a3e7621ac5051286d1333a4cc25fc844d 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -285,10 +285,13 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
        _route->solo_safe_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context());
        _route->solo_isolate_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context());
        _route->phase_control()->Changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::polarity_changed, this), gui_context());
+       _route->fan_out.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::fan_out, this, true, true), gui_context());
 
        if (is_track()) {
                track()->FreezeChange.connect (*this, invalidator (*this), boost::bind (&RouteUI::map_frozen, this), gui_context());
+#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
                track()->TrackModeChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::track_mode_changed, this), gui_context());
+#endif
                track_mode_changed();
        }
 
@@ -426,7 +429,6 @@ RouteUI::mute_press (GdkEventButton* ev)
                                        _mute_release->routes = copy;
                                }
 
-                               DisplaySuspender ds;
                                _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)) {
@@ -455,7 +457,6 @@ RouteUI::mute_press (GdkEventButton* ev)
                                                _mute_release->routes = rl;
                                        }
 
-                                       DisplaySuspender ds;
                                        _session->set_controls (route_list_to_control_list (rl, &Stripable::mute_control), _route->muted_by_self() ? 0.0 : 1.0, Controllable::InverseGroup);
                                }
 
@@ -482,7 +483,6 @@ bool
 RouteUI::mute_release (GdkEventButton* /*ev*/)
 {
        if (_mute_release){
-               DisplaySuspender ds;
                _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;
@@ -582,7 +582,6 @@ RouteUI::solo_press(GdkEventButton* ev)
                                        _solo_release->routes = _session->get_routes ();
                                }
 
-                               DisplaySuspender ds;
                                _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))) {
@@ -652,8 +651,6 @@ RouteUI::solo_press(GdkEventButton* ev)
                                                _solo_release->routes = rl;
                                        }
 
-                                       DisplaySuspender ds;
-
                                        _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_control), !_route->self_soloed(), Controllable::InverseGroup);
                                }
 
@@ -671,7 +668,6 @@ RouteUI::solo_press(GdkEventButton* ev)
                                        _solo_release->routes = rl;
                                }
 
-                               DisplaySuspender ds;
                                _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_control), !_route->self_soloed(), Controllable::UseGroup);
                        }
                }
@@ -688,7 +684,6 @@ RouteUI::solo_release (GdkEventButton* /*ev*/)
                if (_solo_release->exclusive) {
 
                } else {
-                       DisplaySuspender ds;
                        _session->set_controls (route_list_to_control_list (_solo_release->routes, &Stripable::solo_control), _solo_release->active ? 1.0 : 0.0, Controllable::UseGroup);
                }
 
@@ -735,7 +730,6 @@ 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(), &Stripable::rec_enable_control), !track()->rec_enable_control()->get_value(), Controllable::NoGroup);
 
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
@@ -751,7 +745,6 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
                                rl.reset (new RouteList);
                                rl->push_back (_route);
 
-                               DisplaySuspender ds;
                                _session->set_controls (route_list_to_control_list (rl, &Stripable::rec_enable_control), !track()->rec_enable_control()->get_value(), Controllable::InverseGroup);
                        }
 
@@ -873,7 +866,6 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
                rl->push_back (route());
        }
 
-       DisplaySuspender ds;
        _session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::UseGroup);
 
        return false;
@@ -1208,28 +1200,28 @@ RouteUI::update_solo_display ()
                solo_isolated_check->set_active (yn);
        }
 
-        set_button_names ();
+       set_button_names ();
 
-        if (solo_isolated_led) {
-               if (_route->solo_isolate_control()->solo_isolated()) {
+       if (solo_isolated_led) {
+               if (_route->solo_isolate_control()->solo_isolated()) {
                        solo_isolated_led->set_active_state (Gtkmm2ext::ExplicitActive);
                } else {
                        solo_isolated_led->unset_active_state ();
                }
-        }
+       }
 
-        if (solo_safe_led) {
-               if (_route->solo_safe_control()->solo_safe()) {
+       if (solo_safe_led) {
+               if (_route->solo_safe_control()->solo_safe()) {
                        solo_safe_led->set_active_state (Gtkmm2ext::ExplicitActive);
                } else {
                        solo_safe_led->unset_active_state ();
                }
-        }
+       }
 
        solo_button->set_active_state (solo_active_state (_route));
 
-        /* some changes to solo status can affect mute display, so catch up
-         */
+       /* some changes to solo status can affect mute display, so catch up
+        */
 
        update_mute_display ();
 }
@@ -1487,11 +1479,9 @@ 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(), &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(), &Stripable::solo_isolate_control), 1.0, Controllable::NoGroup);
                        }
 
@@ -1503,7 +1493,6 @@ 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, &Stripable::solo_isolate_control), view ? 0.0 : 1.0, Controllable::NoGroup);
                        }
                }
@@ -1575,7 +1564,7 @@ void
 RouteUI::choose_color ()
 {
        bool picked;
-       Gdk::Color c (gdk_color_from_rgb (_route->presentation_info().color()));
+       Gdk::Color c (gdk_color_from_rgba (_route->presentation_info().color()));
        Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &c);
 
        if (picked) {
@@ -1952,6 +1941,8 @@ RouteUI::parameter_changed (string const & p)
                check_rec_enable_sensitivity ();
        } else if (p == "use-monitor-bus" || p == "solo-control-is-listen-control" || p == "listen-position") {
                set_button_names ();
+       } else if (p == "session-monitoring") {
+               update_monitoring_display ();
        } else if (p == "auto-input") {
                update_monitoring_display ();
        } else if (p == "blink-rec-arm") {
@@ -2299,6 +2290,7 @@ RoutePinWindowProxy::route_going_away ()
        _window = 0;
        WM::Manager::instance().remove (this);
        going_away_connection.disconnect();
+       delete this;
 }
 
 void