Add va_list variant of lilv_plugin_get_num_ports_of_class() (#758).

git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@4858 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 39 insertions, 19 deletions

diff --git a/src/plugin.c b/src/plugin.c
index 4decba7..9912112 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -528,37 +528,57 @@ lilv_plugin_get_port_ranges_float(const LilvPlugin* p,
 
 LILV_API
 uint32_t
-lilv_plugin_get_num_ports_of_class(const LilvPlugin* p,
-                                   const LilvNode*   class_1, ...)
+lilv_plugin_get_num_ports_of_class_va(const LilvPlugin* p,
+                                      const LilvNode*   class_1,
+                                      va_list           args)
 {
 	lilv_plugin_load_ports_if_necessary(p);
 
-	uint32_t ret = 0;
-	va_list  args;
+	uint32_t count = 0;
 
+	// Build array of classes from args so we can walk it several times
+	size_t           n_classes = 0;
+	const LilvNode** classes   = NULL;
+	for (LilvNode* class_i = NULL; (class_i = va_arg(args, LilvNode*)); ) {
+		classes = (const LilvNode**)realloc(
+			classes, ++n_classes * sizeof(LilvNode*));
+		classes[n_classes - 1] = class_i;
+	}
+
+	// Check each port against every type
 	for (unsigned i = 0; i < p->num_ports; ++i) {
 		LilvPort* port = p->ports[i];
-		if (!port || !lilv_port_is_a(p, port, class_1))
-			continue;
-
-		va_start(args, class_1);
+		if (port && lilv_port_is_a(p, port, class_1)) {
+			bool matches = true;
+			for (size_t j = 0; j < n_classes; ++j) {
+				if (!lilv_port_is_a(p, port, classes[j])) {
+					matches = false;
+					break;
+				}
+			}
 
-		bool matches = true;
-		for (LilvNode* class_i = NULL; (class_i = va_arg(args, LilvNode*)); ) {
-			if (!lilv_port_is_a(p, port, class_i)) {
-				va_end(args);
-				matches = false;
-				break;
+			if (matches) {
+				++count;
 			}
 		}
+	}
 
-		if (matches)
-			++ret;
+	free(classes);
+	return count;
+}
 
-		va_end(args);
-	}
+LILV_API
+uint32_t
+lilv_plugin_get_num_ports_of_class(const LilvPlugin* p,
+                                   const LilvNode*   class_1, ...)
+{
+	va_list args;
+	va_start(args, class_1);
 
-	return ret;
+	uint32_t count = lilv_plugin_get_num_ports_of_class_va(p, class_1, args);
+
+	va_end(args);
+	return count;
 }
 
 LILV_API