smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

remove duplicated calls to update solo/mute state from RouteUI descendants.

Browse source 
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.
This commit is contained in:
Paul Davis 2015-03-31 12:31:06 -04:00
parent 207ac16731
commit d6574c9c40
4 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/mixer_strip.cc
View file

@ -451,11 +451,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
*/ */
processor_box.set_route (rt); processor_box.set_route (rt);
/* map the current state */
mute_changed (0);
update_solo_display ();
revert_to_default_display (); revert_to_default_display ();
/* unpack these from the parent and stuff them into our own /* unpack these from the parent and stuff them into our own
@ -602,7 +597,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
/* now force an update of all the various elements */ /* now force an update of all the various elements */
mute_changed (0); update_mute_display ();
update_solo_display (); update_solo_display ();
name_changed (); name_changed ();
comment_changed (0); comment_changed (0);

3
gtk2_ardour/route_time_axis.cc
View file

@ -156,9 +156,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
set_gui_property ("visible", false); set_gui_property ("visible", false);
} }
mute_changed (0);
update_solo_display ();
timestretch_rect = 0; timestretch_rect = 0;
no_redraw = false; no_redraw = false;

8
gtk2_ardour/route_ui.cc
View file

@ -244,7 +244,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
solo_button->set_controllable (_route->solo_control()); 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->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()); _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 (); update_mute_display ();
} }
void
RouteUI::mute_changed(void* /*src*/)
{
update_mute_display ();
}
ActiveState ActiveState
RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r) RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
{ {

1
gtk2_ardour/route_ui.h
View file

@ -157,7 +157,6 @@ class RouteUI : public virtual AxisView
void solo_changed(bool, void*); void solo_changed(bool, void*);
void solo_changed_so_update_mute (); void solo_changed_so_update_mute ();
void mute_changed(void*);
void listen_changed(void*); void listen_changed(void*);
virtual void processors_changed (ARDOUR::RouteProcessorChange) {} virtual void processors_changed (ARDOUR::RouteProcessorChange) {}
void route_rec_enable_changed(); void route_rec_enable_changed();