X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-class.h;h=838acbcebd116074b754171efe27ff0d4d9d4ef8;hb=8a4328893c7222e490da887e1caec4e61fe3d56e;hp=1c49a769bd1ba8cce9173b2066360dc80a597254;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/lib/graph/component-class.h b/src/lib/graph/component-class.h
index 1c49a769..838acbce 100644
--- a/src/lib/graph/component-class.h
+++ b/src/lib/graph/component-class.h
@@ -31,7 +31,7 @@
 #include <babeltrace2/graph/component-class-source.h>
 #include <babeltrace2/graph/component-class-filter.h>
 #include <babeltrace2/graph/component-class-sink.h>
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include "lib/object.h"
 #include "common/list.h"
 #include <babeltrace2/types.h>
@@ -54,6 +54,7 @@ struct bt_component_class {
 	GString *name;
 	GString *description;
 	GString *help;
+	GString *plugin_name;
 
 	/* Array of struct bt_component_class_destroy_listener */
 	GArray *destroy_listeners;
@@ -75,7 +76,6 @@ struct bt_component_class_source {
 		bt_component_class_source_message_iterator_can_seek_ns_from_origin_method msg_iter_can_seek_ns_from_origin;
 		bt_component_class_source_message_iterator_can_seek_beginning_method msg_iter_can_seek_beginning;
 		bt_component_class_source_query_method query;
-		bt_component_class_source_accept_output_port_connection_method accept_output_port_connection;
 		bt_component_class_source_output_port_connected_method output_port_connected;
 	} methods;
 };
@@ -86,7 +86,6 @@ struct bt_component_class_sink {
 		bt_component_class_sink_init_method init;
 		bt_component_class_sink_finalize_method finalize;
 		bt_component_class_sink_query_method query;
-		bt_component_class_sink_accept_input_port_connection_method accept_input_port_connection;
 		bt_component_class_sink_input_port_connected_method input_port_connected;
 		bt_component_class_sink_graph_is_configured_method graph_is_configured;
 		bt_component_class_sink_consume_method consume;
@@ -106,8 +105,6 @@ struct bt_component_class_filter {
 		bt_component_class_filter_message_iterator_can_seek_ns_from_origin_method msg_iter_can_seek_ns_from_origin;
 		bt_component_class_filter_message_iterator_can_seek_beginning_method msg_iter_can_seek_beginning;
 		bt_component_class_filter_query_method query;
-		bt_component_class_filter_accept_input_port_connection_method accept_input_port_connection;
-		bt_component_class_filter_accept_output_port_connection_method accept_output_port_connection;
 		bt_component_class_filter_input_port_connected_method input_port_connected;
 		bt_component_class_filter_output_port_connected_method output_port_connected;
 	} methods;
@@ -132,11 +129,11 @@ const char *bt_component_class_type_string(enum bt_component_class_type type)
 {
 	switch (type) {
 	case BT_COMPONENT_CLASS_TYPE_SOURCE:
-		return "BT_COMPONENT_CLASS_TYPE_SOURCE";
+		return "SOURCE";
 	case BT_COMPONENT_CLASS_TYPE_SINK:
-		return "BT_COMPONENT_CLASS_TYPE_SINK";
+		return "SINK";
 	case BT_COMPONENT_CLASS_TYPE_FILTER:
-		return "BT_COMPONENT_CLASS_TYPE_FILTER";
+		return "FILTER";
 	default:
 		return "(unknown)";
 	}