Remove Babeltrace 1 files and reorganize the tree

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index ecfbf5bee81060db7a09a493a20d280b90d72a58..cb8492f2acfd9630f1b5d1feb8c8d5653ac2f075 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -29,23 +29,23 @@
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/plugin/plugin.h>
 #include <babeltrace/common-internal.h>
-#include <babeltrace/component/component.h>
-#include <babeltrace/component/component-source.h>
-#include <babeltrace/component/component-sink.h>
-#include <babeltrace/component/component-filter.h>
-#include <babeltrace/component/component-class.h>
-#include <babeltrace/component/port.h>
-#include <babeltrace/component/graph.h>
-#include <babeltrace/component/connection.h>
-#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/graph/component.h>
+#include <babeltrace/graph/component-source.h>
+#include <babeltrace/graph/component-sink.h>
+#include <babeltrace/graph/component-filter.h>
+#include <babeltrace/graph/component-class.h>
+#include <babeltrace/graph/port.h>
+#include <babeltrace/graph/graph.h>
+#include <babeltrace/graph/connection.h>
+#include <babeltrace/graph/notification-iterator.h>
 #include <babeltrace/ref.h>
 #include <babeltrace/values.h>
 #include <stdlib.h>
-#include <babeltrace/ctf-ir/metadata.h>        /* for clocks */
 #include <popt.h>
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>
+#include <inttypes.h>
 #include "babeltrace-cfg.h"
 #include "babeltrace-cfg-connect.h"
 #include "default-cfg.h"
@@ -598,7 +598,7 @@ int connect_source_sink(struct bt_graph *graph,
                        goto end;
                }
 
-               connection = bt_graph_connect(graph, source_port,
+               connection = bt_graph_connect_ports(graph, source_port,
                                trimmer_input_port);
                if (!connection) {
                        fprintf(stderr, "Failed to connect source to trimmer. Aborting...\n");
@@ -610,7 +610,7 @@ int connect_source_sink(struct bt_graph *graph,
                BT_MOVE(to_sink_port, source_port);
        }
 
-       connection = bt_graph_connect(graph, to_sink_port, sink_port);
+       connection = bt_graph_connect_ports(graph, to_sink_port, sink_port);
        if (!connection) {
                fprintf(stderr, "Failed to connect to sink. Aborting...\n");
                ret = -1;