babeltrace-cfg: put comp. class type within struct bt_config_component

[babeltrace.git] / converter / babeltrace-cfg.h

diff --git a/converter/babeltrace-cfg.h b/converter/babeltrace-cfg.h
index 4245012c2ed20eb3a7d8afc0d11a4b570b58c78d..6670d2fae058764293e52dcad2f6c28e1a765e2c 100644 (file)
--- a/converter/babeltrace-cfg.h
+++ b/converter/babeltrace-cfg.h
@@ -36,9 +36,11 @@
 
 struct bt_config_component {
        struct bt_object base;
+       enum bt_component_class_type type;
        GString *plugin_name;
        GString *component_name;
        struct bt_value *params;
+       GString *instance_name;
 };
 
 enum bt_config_command {
@@ -61,9 +63,15 @@ struct bt_config {
                        /* Array of pointers to struct bt_config_component */
                        GPtrArray *sources;
 
+                       /* Array of pointers to struct bt_config_component */
+                       GPtrArray *filters;
+
                        /* Array of pointers to struct bt_config_component */
                        GPtrArray *sinks;
 
+                       /* Array of pointers to struct bt_config_connection */
+                       GPtrArray *connections;
+
                        bool force_correlate;
                        bool omit_system_plugin_path;
                        bool omit_home_plugin_path;
@@ -81,9 +89,7 @@ struct bt_config {
                        struct bt_value *plugin_paths;
                        bool omit_system_plugin_path;
                        bool omit_home_plugin_path;
-                       enum bt_component_class_type comp_cls_type;
-                       GString *plugin_name;
-                       GString *component_name;
+                       struct bt_config_component *cfg_component;
                } help;
        } cmd_data;
 };
@@ -100,6 +106,9 @@ struct bt_config *bt_config_from_args(int argc, const char *argv[],
                bool omit_home_plugin_path,
                struct bt_value *initial_plugin_paths);
 
+struct bt_config_component *bt_config_component_from_arg(
+               enum bt_component_class_type type, const char *arg);
+
 enum bt_value_status bt_config_append_plugin_paths(
                struct bt_value *plugin_paths, const char *arg);