X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_group.cc;h=a3a7ca8e77cfa2ea64349458847f4bff537e0527;hb=e3d9a971a735174687067cb7d7b9419c7ecbb114;hp=d164c17782fff281de6c32bb342876e0d6ea9e30;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git

diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc
index d164c17782..a3a7ca8e77 100644
--- a/gtk2_ardour/port_group.cc
+++ b/gtk2_ardour/port_group.cc
@@ -388,13 +388,10 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
 		}
 
 		for (list<boost::shared_ptr<IO> >::iterator j = i->ios.begin(); j != i->ios.end(); ++j) {
-			boost::shared_ptr<Bundle> 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<UserBundle> (*i) && (*i)->ports_are_inputs() == inputs) {
-			boost::shared_ptr<Bundle> 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<UserBundle> (*i) == 0 && (*i)->ports_are_inputs() == inputs) {
-			boost::shared_ptr<Bundle> 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<Bundle> 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 */
@@ -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<Bundle> b = make_bundle_from_ports (extra_system[*i], *i, inputs);
-			boost::shared_ptr<Bundle> 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<Bundle> b = make_bundle_from_ports (extra_other[*i], *i, inputs);
-			boost::shared_ptr<Bundle> 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<ARDOUR::Bundle> 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<Bundle>
-PortGroupList::bundle_for_type (boost::shared_ptr<Bundle> 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<Bundle> 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;
-}