X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_group.cc;h=a3a7ca8e77cfa2ea64349458847f4bff537e0527;hb=957c0aec4fcb4f4e44d7eedcb2942326c52d69cd;hp=4d936af90367bee37a8f37078d31e5fc01e334bf;hpb=2cf464cf1daeb2dfdbb8445ff49df67fc85af26c;p=ardour.git diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 4d936af903..a3a7ca8e77 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -109,14 +109,14 @@ PortGroup::add_bundle_internal (boost::shared_ptr b, boost::shared_ptrhas_same_ports ((*i)->bundle) == false) { ++i; } - + if (i != _bundles.end ()) { return; } @@ -126,7 +126,7 @@ PortGroup::add_bundle_internal (boost::shared_ptr b, boost::shared_ptrChanged.connect (br->changed_connection, invalidator (*this), ui_bind (&PortGroup::bundle_changed, this, _1), gui_context()); _bundles.push_back (br); - Changed (); + Changed (); } void @@ -254,11 +254,11 @@ PortGroup::remove_duplicates () } } } - + if (remove) { _bundles.erase (i); } - + i = tmp; } } @@ -272,7 +272,7 @@ PortGroupList::PortGroupList () } -PortGroupList::~PortGroupList() +PortGroupList::~PortGroupList() { /* XXX need to clean up bundles, but ownership shared with PortGroups */ } @@ -306,7 +306,7 @@ struct RouteIOs { route = r; ios.push_back (i); } - + boost::shared_ptr route; /* it's ok to use a shared_ptr here as RouteIOs structs are only used during ::gather () */ std::list > ios; @@ -355,7 +355,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp /* keep track of IOs that we have taken bundles from, so that we can avoid taking the same IO from both - Route::output() and the main_outs Delivery + Route::output() and the main_outs Delivery */ set > used_io; @@ -375,7 +375,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp Note that if the RouteIO's bundles are multi-type, we may make new Bundles with only the ports of one type. */ - + for (list::iterator i = route_ios.begin(); i != route_ios.end(); ++i) { TimeAxisView* tv = PublicEditor::instance().axis_view_from_route (i->route); @@ -388,13 +388,10 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp } for (list >::iterator j = i->ios.begin(); j != i->ios.end(); ++j) { - boost::shared_ptr b = bundle_for_type ((*j)->bundle(), type); - if (b->nchannels() != ChanCount::ZERO) { - if (tv) { - g->add_bundle (b, *j, tv->color ()); - } else { - g->add_bundle (b, *j); - } + if (tv) { + g->add_bundle ((*j)->bundle(), *j, tv->color ()); + } else { + g->add_bundle ((*j)->bundle(), *j); } } } @@ -407,34 +404,21 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp for (BundleList::iterator i = b->begin(); i != b->end(); ++i) { if (boost::dynamic_pointer_cast (*i) && (*i)->ports_are_inputs() == inputs) { - boost::shared_ptr b = bundle_for_type (*i, type); - if (b->nchannels() != ChanCount::ZERO) { - system->add_bundle (b, allow_dups); - } + system->add_bundle (*i, allow_dups); } } for (BundleList::iterator i = b->begin(); i != b->end(); ++i) { if (boost::dynamic_pointer_cast (*i) == 0 && (*i)->ports_are_inputs() == inputs) { - boost::shared_ptr b = bundle_for_type (*i, type); - if (b->nchannels() != ChanCount::ZERO) { - system->add_bundle (b, allow_dups); - } + system->add_bundle (*i, allow_dups); } } - + /* Ardour stuff */ if (!inputs) { - boost::shared_ptr b = bundle_for_type (session->the_auditioner()->output()->bundle(), type); - if (b->nchannels() != ChanCount::ZERO) { - ardour->add_bundle (b); - } - - b = bundle_for_type (session->click_io()->bundle(), type); - if (b->nchannels() != ChanCount::ZERO) { - ardour->add_bundle (b); - } + ardour->add_bundle (session->the_auditioner()->output()->bundle()); + ardour->add_bundle (session->click_io()->bundle()); } /* Ardour's surfaces */ @@ -485,7 +469,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp _("MMC out"), DataType::MIDI, ae.make_port_name_non_relative (mmc->output_port()->name()) ); } - + ardour->add_bundle (sync); } @@ -505,7 +489,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp } else { ports = session->engine().get_ports ("", type.to_jack_type(), inputs ? JackPortIsInput : JackPortIsOutput); } - + if (ports) { int n = 0; @@ -519,7 +503,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp !track->has_port(p) && !ardour->has_port(p) && !other->has_port(p)) { - + /* special hack: ignore MIDI ports labelled Midi-Through. these are basically useless and mess things up for default connections. @@ -530,14 +514,14 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp continue; } - /* special hack: ignore our monitor inputs (which show up here because + /* special hack: ignore our monitor inputs (which show up here because we excluded them earlier. */ - + string lp = p; boost::to_lower (lp); - if ((lp.find (N_(":monitor")) != string::npos) && + if ((lp.find (N_(":monitor")) != string::npos) && (lp.find (lpn) != string::npos)) { ++n; continue; @@ -549,8 +533,8 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp if (jp) { DataType t (jack_port_type (jp)); if (t != DataType::NIL) { - if (port_has_prefix (p, N_("system:")) || - port_has_prefix (p, N_("alsa_pcm")) || + if (port_has_prefix (p, N_("system:")) || + port_has_prefix (p, N_("alsa_pcm")) || port_has_prefix (p, lpnc)) { extra_system[t].push_back (p); } else { @@ -569,20 +553,14 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { if (!extra_system[*i].empty()) { boost::shared_ptr b = make_bundle_from_ports (extra_system[*i], *i, inputs); - boost::shared_ptr bt = bundle_for_type (b, type); - if (bt->nchannels() != ChanCount::ZERO) { - system->add_bundle (bt); - } + system->add_bundle (b); } } for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { if (!extra_other[*i].empty()) { boost::shared_ptr b = make_bundle_from_ports (extra_other[*i], *i, inputs); - boost::shared_ptr bt = bundle_for_type (b, type); - if (bt->nchannels() != ChanCount::ZERO) { - other->add_bundle (bt); - } + other->add_bundle (b); } } @@ -591,7 +569,9 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp } add_group_if_not_empty (other); - add_group_if_not_empty (bus); + if (type != DataType::MIDI) { + add_group_if_not_empty (bus); + } add_group_if_not_empty (track); add_group_if_not_empty (ardour); add_group_if_not_empty (system); @@ -789,38 +769,6 @@ PortGroupList::io_from_bundle (boost::shared_ptr b) const bool PortGroupList::empty () const { - List::const_iterator i = _groups.begin (); - while (i != _groups.end() && (*i)->total_channels() == ChanCount::ZERO) { - ++i; - } - - return (i == _groups.end()); + return _groups.empty (); } -/** Take a bundle, and either return it, if it contains only ports of type \a t, - * or return a new bundle with those ports from \a b which are of type \a t. - * Note that t == NIL is taken to mean "all types". - */ -boost::shared_ptr -PortGroupList::bundle_for_type (boost::shared_ptr b, DataType t) const -{ - /* We are asked for a bundle with all types, so that's easy */ - if (t == DataType::NIL) { - return b; - } - - if (b->nchannels().get(t) == b->nchannels().n_total()) { - /* All channels on b are of the correct type, so just return b */ - return b; - } - - /* We must build a new bundle */ - boost::shared_ptr n (new ARDOUR::Bundle (b->name(), b->ports_are_inputs())); - for (uint32_t i = 0; i < b->nchannels().n_total(); ++i) { - if (b->channel_type(i) == t) { - n->add_channel (b->channel_name (i), t, b->channel_ports (i)); - } - } - - return n; -}