tweak towards getting handling of trigger_display in MixerStrip correct
This commit is contained in:
parent
d59a1944fe
commit
b4c98f10e8
@ -552,7 +552,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
|
|||||||
|
|
||||||
RouteUI::set_route (rt);
|
RouteUI::set_route (rt);
|
||||||
|
|
||||||
_tmaster->set_trigger(rt->triggerbox ());
|
set_trigger_display (rt->triggerbox());
|
||||||
|
|
||||||
control_slave_ui.set_stripable (boost::dynamic_pointer_cast<Stripable> (rt));
|
control_slave_ui.set_stripable (boost::dynamic_pointer_cast<Stripable> (rt));
|
||||||
|
|
||||||
@ -1674,7 +1674,6 @@ MixerStrip::revert_to_default_display ()
|
|||||||
reset_strip_style ();
|
reset_strip_style ();
|
||||||
|
|
||||||
set_trigger_display (_route->triggerbox());
|
set_trigger_display (_route->triggerbox());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -2136,6 +2135,7 @@ MixerStrip::hide_master_spacer (bool yn)
|
|||||||
void
|
void
|
||||||
MixerStrip::set_trigger_display (boost::shared_ptr<TriggerBox> tb)
|
MixerStrip::set_trigger_display (boost::shared_ptr<TriggerBox> tb)
|
||||||
{
|
{
|
||||||
|
_tmaster->set_trigger (tb);
|
||||||
trigger_display.set_triggerbox (tb.get());
|
trigger_display.set_triggerbox (tb.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user