Implement instrument fan-out options (group, track/bus)

This commit is contained in:
Robin Gareus 2016-11-10 21:35:40 +01:00
parent ddd79819dc
commit 33942e6d52
3 changed files with 30 additions and 5 deletions

View file

@ -1698,7 +1698,7 @@ MixerStrip::build_route_ops_menu ()
if (_route->the_instrument () && _route->the_instrument ()->output_streams().n_audio() > 2) { if (_route->the_instrument () && _route->the_instrument ()->output_streams().n_audio() > 2) {
// TODO ..->n_audio() > 1 && separate_output_groups) hard to check here every time. // TODO ..->n_audio() > 1 && separate_output_groups) hard to check here every time.
items.push_back (MenuElem (_("Fan Out Instrument"), sigc::bind (sigc::mem_fun (*this, &RouteUI::fan_out), false))); items.push_back (MenuElem (_("Fan Out Instrument"), sigc::bind (sigc::mem_fun (*this, &RouteUI::fan_out), true, true)));
} }
items.push_back (SeparatorElem()); items.push_back (SeparatorElem());

View file

@ -2338,8 +2338,9 @@ RouteUI::manage_pins ()
} }
void void
RouteUI::fan_out (bool to_busses) 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<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (_route->the_instrument ());
assert (pi); assert (pi);
@ -2373,16 +2374,40 @@ RouteUI::fan_out (bool to_busses)
_route->output ()->disconnect (this); _route->output ()->disconnect (this);
_route->panner_shell ()->set_bypassed (true); _route->panner_shell ()->set_bypassed (true);
RouteList to_group;
for (uint32_t p = 0; p < n_outputs; ++p) { for (uint32_t p = 0; p < n_outputs; ++p) {
const Plugin::IOPortDescription& pd (plugin->describe_io_port (DataType::AUDIO, false, p)); const Plugin::IOPortDescription& pd (plugin->describe_io_port (DataType::AUDIO, false, p));
std::string bn = pi->name () + " " + pd.group_name; std::string bn = pi->name () + " " + pd.group_name;
boost::shared_ptr<Route> r = _session->route_by_name (bn); boost::shared_ptr<Route> r = _session->route_by_name (bn);
if (!r) { if (!r) {
RouteList rl = _session->new_audio_route (busnames[bn], outputs, NULL, 1, bn, PresentationInfo::AudioBus, PresentationInfo::max_order); if (to_busses) {
r = rl.front (); RouteList rl = _session->new_audio_route (busnames[bn], outputs, NULL, 1, bn, PresentationInfo::AudioBus, PresentationInfo::max_order);
r = rl.front ();
assert (r);
} else {
list<boost::shared_ptr<AudioTrack> > tl =
_session->new_audio_track (busnames[bn], outputs, NULL, 1, bn, PresentationInfo::max_order, Normal);
r = tl.front ();
assert (r);
boost::shared_ptr<ControlList> cl (new ControlList);
cl->push_back (r->monitoring_control ());
_session->set_controls (cl, (double) MonitorInput, Controllable::NoGroup);
}
} }
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());
} }
if (group) {
RouteGroup* rg = new RouteGroup (*_session, pi->name ());
_session->add_route_group (rg);
rg->set_gain (false);
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);
}
}
} }
bool bool

View file

@ -208,7 +208,7 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::Sco
void manage_pins (); void manage_pins ();
void maybe_add_route_print_mgr (); void maybe_add_route_print_mgr ();
void fan_out (bool to_busses = true); void fan_out (bool to_busses = true, bool group = true);
virtual void route_property_changed (const PBD::PropertyChange&) = 0; virtual void route_property_changed (const PBD::PropertyChange&) = 0;
void route_removed (); void route_removed ();