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.
This commit is contained in:
parent
207ac16731
commit
d6574c9c40
|
@ -451,11 +451,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> 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<Route> rt)
|
|||
|
||||
/* now force an update of all the various elements */
|
||||
|
||||
mute_changed (0);
|
||||
update_mute_display ();
|
||||
update_solo_display ();
|
||||
name_changed ();
|
||||
comment_changed (0);
|
||||
|
|
|
@ -156,9 +156,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
|
|||
set_gui_property ("visible", false);
|
||||
}
|
||||
|
||||
mute_changed (0);
|
||||
update_solo_display ();
|
||||
|
||||
timestretch_rect = 0;
|
||||
no_redraw = false;
|
||||
|
||||
|
|
|
@ -244,7 +244,7 @@ RouteUI::set_route (boost::shared_ptr<Route> 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<Route> r)
|
||||
{
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue
Block a user