X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbundle.cc;h=dd4bacdff2b8707c66245208d42dc8d5c01017a6;hb=80ec3fb37e0156cf02a25e9b353879819b66057d;hp=e42239a1ea18c58bacfe9d541d4c63de464a8e32;hpb=a052488c002f21839ca7babb855a481a86eba648;p=ardour.git

diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc
index e42239a1ea..dd4bacdff2 100644
--- a/libs/ardour/bundle.cc
+++ b/libs/ardour/bundle.cc
@@ -421,8 +421,8 @@ Bundle::connected_to (boost::shared_ptr<Bundle> other, AudioEngine & engine)
 		for (uint32_t j = 0; j < A.size(); ++j) {
 			for (uint32_t k = 0; k < B.size(); ++k) {
 
-				Port* p = engine.get_port_by_name (A[j]);
-				Port* q = engine.get_port_by_name (B[k]);
+				boost::shared_ptr<Port> p = engine.get_port_by_name (A[j]);
+				boost::shared_ptr<Port> q = engine.get_port_by_name (B[k]);
 
 				if (!p && !q) {
 					return false;
@@ -494,7 +494,7 @@ Bundle::channel_type (uint32_t c) const
 
 	Glib::Mutex::Lock lm (_channel_mutex);
 	return _channel[c].type;
-}	
+}
 
 ostream &
 operator<< (ostream& os, Bundle const & b)
@@ -511,3 +511,79 @@ operator<< (ostream& os, Bundle const & b)
 
 	return os;
 }
+
+bool
+Bundle::operator== (Bundle const & other)
+{
+	return _channel == other._channel;
+}
+
+/** Given an index of a channel as the nth channel of a particular type,
+ *  return an index of that channel when considering channels of all types.
+ *
+ *  e.g. given a bundle with channels:
+ *          fred   [audio]
+ *          jim    [audio]
+ *          sheila [midi]
+ *
+ * If t == MIDI and c == 0, then we would return 2, as 2 is the index of the
+ * 0th MIDI channel.
+ *
+ * If t == NIL, we just return c.
+ */
+
+uint32_t
+Bundle::type_channel_to_overall (DataType t, uint32_t c) const
+{
+	if (t == DataType::NIL) {
+		return c;
+	}
+	
+	Glib::Mutex::Lock lm (_channel_mutex);
+
+	vector<Channel>::const_iterator i = _channel.begin ();
+
+	uint32_t o = 0;
+
+	while (1) {
+
+		assert (i != _channel.end ());
+
+		if (i->type != t) {
+			++i;
+		} else {
+			if (c == 0) {
+				return o;
+			}
+			--c;
+		}
+
+		++o;
+	}
+
+	/* NOTREACHED */
+	return -1;
+}
+
+/** Perform the reverse of type_channel_to_overall */
+uint32_t
+Bundle::overall_channel_to_type (DataType t, uint32_t c) const
+{
+	if (t == DataType::NIL) {
+		return c;
+	}
+	
+	Glib::Mutex::Lock lm (_channel_mutex);
+
+	uint32_t s = 0;
+	
+	vector<Channel>::const_iterator i = _channel.begin ();
+	for (uint32_t j = 0; j < c; ++j) {
+		if (i->type == t) {
+			++s;
+		}
+		++i;
+	}
+
+	return s;
+}