Adapt plugin system to use unified reference counting

[babeltrace.git] / include / babeltrace / plugin / component-factory-internal.h

diff --git a/include/babeltrace/plugin/component-factory-internal.h b/include/babeltrace/plugin/component-factory-internal.h
index 3149bad3529b231ed847a58530a8bedf2cf5ddf4..3ee24f8510d80f1f81b164b59d524ba1e61e6f9f 100644 (file)
--- a/include/babeltrace/plugin/component-factory-internal.h
+++ b/include/babeltrace/plugin/component-factory-internal.h
@@ -28,32 +28,19 @@
  */
 
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/object-internal.h>
 #include <babeltrace/plugin/component-factory.h>
 #include <babeltrace/plugin/component.h>
+#include <babeltrace/plugin/component-class-internal.h>
 #include <babeltrace/plugin/plugin-system.h>
+#include <babeltrace/plugin/plugin.h>
 #include <glib.h>
-#include <gmodule.h>
-
-struct component_entry {
-       enum bt_component_type type;
-       GString *name;
-};
-
-struct source_component_entry {
-       struct component_entry parent;
-       bt_component_source_init_cb init;
-       
-};
-
-struct sink_component_entry {
-       struct component_entry parent;
-       bt_component_sink_init_cb init;
-};
 
 struct bt_component_factory {
-       /** Array of GModule pointers */
-       GPtrArray *modules;
-       /** Array of pointers to struct component_entry */
+       struct bt_object base;
+       /** Array of pointers to struct bt_plugin */
+       GPtrArray *plugins;
+       /** Array of pointers to struct bt_component_class */
        GPtrArray *components;
 };