X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.h;h=093f360bc8892694d1f0f51a5be305a7e7e2561f;hb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;hp=8c859e77472312a9edfa102824fdfd03bbb8aae2;hpb=90157d89276ed1a569a2d4ffcfeed0b415817c12;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/data-stream-file.h b/plugins/ctf/fs-src/data-stream-file.h
index 8c859e77..093f360b 100644
--- a/plugins/ctf/fs-src/data-stream-file.h
+++ b/plugins/ctf/fs-src/data-stream-file.h
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <glib.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 
 #include "../common/notif-iter/notif-iter.h"
 #include "lttng-index.h"
@@ -89,13 +89,13 @@ struct ctf_fs_ds_file {
 	struct ctf_fs_file *file;
 
 	/* Owned by this */
-	struct bt_ctf_stream *stream;
+	struct bt_stream *stream;
 
 	/* Owned by this */
 	struct bt_clock_class_priority_map *cc_prio_map;
 
 	/* Weak */
-	struct bt_ctf_notif_iter *notif_iter;
+	struct bt_notif_iter *notif_iter;
 
 	void *mmap_addr;
 
@@ -123,14 +123,14 @@ struct ctf_fs_ds_file {
 BT_HIDDEN
 struct ctf_fs_ds_file *ctf_fs_ds_file_create(
 		struct ctf_fs_trace *ctf_fs_trace,
-		struct bt_ctf_notif_iter *notif_iter,
-		struct bt_ctf_stream *stream, const char *path);
+		struct bt_notif_iter *notif_iter,
+		struct bt_stream *stream, const char *path);
 
 BT_HIDDEN
 int ctf_fs_ds_file_get_packet_header_context_fields(
 		struct ctf_fs_ds_file *ds_file,
-		struct bt_ctf_field **packet_header_field,
-		struct bt_ctf_field **packet_context_field);
+		struct bt_field **packet_header_field,
+		struct bt_field **packet_context_field);
 
 BT_HIDDEN
 void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
@@ -146,6 +146,6 @@ struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(
 BT_HIDDEN
 void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
 
-extern struct bt_ctf_notif_iter_medium_ops ctf_fs_ds_file_medops;
+extern struct bt_notif_iter_medium_ops ctf_fs_ds_file_medops;
 
 #endif /* CTF_FS_DS_FILE_H */