Remove Evoral::MIDIEvent

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index cceb71dd5fd58a513cf18ee02fec0127205b4f8c..ca008e2f985c8740432510fdf0709412a7e20244 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -426,7 +426,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 +454,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 +480,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 +579,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 +648,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 +665,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 +681,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 +727,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 +742,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 +863,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;
@@ -1487,11 +1476,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 +1490,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 +1561,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) {
@@ -2341,19 +2327,20 @@ void
 RouteUI::fan_out (bool to_busses, bool group)
 {
        DisplaySuspender ds;
-       boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (_route->the_instrument ());
+       boost::shared_ptr<ARDOUR::Route> route = _route;
+       boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (route->the_instrument ());
        assert (pi);
 
        const uint32_t n_outputs = pi->output_streams ().n_audio ();
-       if (_route->n_outputs ().n_audio () != n_outputs) {
+       if (route->n_outputs ().n_audio () != n_outputs) {
                MessageDialog msg (string_compose (
                                        _("The Plugin's number of audio outputs ports (%1) does not match the Tracks's number of audio outputs (%2). Cannot fan out."),
-                                       n_outputs, _route->n_outputs ().n_audio ()));
+                                       n_outputs, route->n_outputs ().n_audio ()));
                msg.run ();
                return;
        }
 
-#define BUSNAME  pd.group_name + "(" + _route->name () + ")"
+#define BUSNAME  pd.group_name + "(" + route->name () + ")"
 
        /* count busses and channels/bus */
        boost::shared_ptr<Plugin> plugin = pi->plugin ();
@@ -2375,8 +2362,8 @@ RouteUI::fan_out (bool to_busses, bool group)
                outputs = std::max (outputs, _session->master_out ()->n_inputs ().n_audio ());
        }
 
-       _route->output ()->disconnect (this);
-       _route->panner_shell ()->set_bypassed (true);
+       route->output ()->disconnect (this);
+       route->panner_shell ()->set_bypassed (true);
 
        RouteList to_group;
        for (uint32_t p = 0; p < n_outputs; ++p) {
@@ -2401,7 +2388,7 @@ RouteUI::fan_out (bool to_busses, bool group)
                        r->input ()->disconnect (this);
                }
                to_group.push_back (r);
-               _route->output ()->audio (p)->connect (r->input ()->audio (pd.group_channel).get());
+               route->output ()->audio (p)->connect (r->input ()->audio (pd.group_channel).get());
        }
 #undef BUSNAME
 
@@ -2420,7 +2407,7 @@ RouteUI::fan_out (bool to_busses, bool group)
                        rg->set_gain (false);
                }
 
-               GroupTabs::set_group_color (rg, _route->presentation_info().color());
+               GroupTabs::set_group_color (rg, route->presentation_info().color());
                for (RouteList::const_iterator i = to_group.begin(); i != to_group.end(); ++i) {
                        rg->add (*i);
                }