From d6574c9c404d5ef26f7b31a8ca12304048d80301 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 31 Mar 2015 12:31:06 -0400 Subject: remove duplicated calls to update solo/mute state from RouteUI descendants. RouteUI::set_route() already does the right thing. Also remove RouteUI::mute_changed() since its only role was to handle the mute change signal from a route, which boost::bind() makes unnecessary since we can connect update_mute_display() directly. --- gtk2_ardour/mixer_strip.cc | 7 +------ gtk2_ardour/route_time_axis.cc | 3 --- gtk2_ardour/route_ui.cc | 8 +------- gtk2_ardour/route_ui.h | 1 - 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 117145d9d0..48da9af7e0 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -451,11 +451,6 @@ MixerStrip::set_route (boost::shared_ptr rt) */ processor_box.set_route (rt); - /* map the current state */ - - mute_changed (0); - update_solo_display (); - revert_to_default_display (); /* unpack these from the parent and stuff them into our own @@ -602,7 +597,7 @@ MixerStrip::set_route (boost::shared_ptr rt) /* now force an update of all the various elements */ - mute_changed (0); + update_mute_display (); update_solo_display (); name_changed (); comment_changed (0); diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 7d0883775d..597b9ecde4 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -156,9 +156,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) set_gui_property ("visible", false); } - mute_changed (0); - update_solo_display (); - timestretch_rect = 0; no_redraw = false; diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index f038ead366..09026e6b29 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -244,7 +244,7 @@ RouteUI::set_route (boost::shared_ptr rp) solo_button->set_controllable (_route->solo_control()); _route->active_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_active_changed, this), gui_context()); - _route->mute_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::mute_changed, this, _1), gui_context()); + _route->mute_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_mute_display, this), gui_context()); _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::comment_changed, this, _1), gui_context()); @@ -1186,12 +1186,6 @@ RouteUI::solo_changed_so_update_mute () update_mute_display (); } -void -RouteUI::mute_changed(void* /*src*/) -{ - update_mute_display (); -} - ActiveState RouteUI::mute_active_state (Session* s, boost::shared_ptr r) { diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 569fe12552..0da95cdc23 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -157,7 +157,6 @@ class RouteUI : public virtual AxisView void solo_changed(bool, void*); void solo_changed_so_update_mute (); - void mute_changed(void*); void listen_changed(void*); virtual void processors_changed (ARDOUR::RouteProcessorChange) {} void route_rec_enable_changed(); -- cgit v1.2.3