X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=3b38ecaca9671fe88815ea5639ef264797f3212b;hb=d3ded99df05c7602749aa50530a1dc69db4cc066;hp=85644a6b327c6b0700f390378dd10d6a75344d1b;hpb=d6425aaf6026d168a695268c4aa7539956c0d0ca;p=babeltrace.git

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 85644a6b..3b38ecac 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -22,8 +22,8 @@
 #include <babeltrace/ctf-text/types.h>
 #include <babeltrace/ctf/metadata.h>
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/ctf/events-internal.h>
 #include <inttypes.h>
-#include <uuid/uuid.h>
 #include <sys/mman.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -76,7 +76,7 @@ enum bt_loglevel {
 
 
 struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence), FILE *metadata_fp);
 void ctf_text_close_trace(struct trace_descriptor *descriptor);
 
@@ -211,15 +211,15 @@ const char *print_loglevel(int value)
 }
 
 static
-int ctf_text_write_event(struct stream_pos *ppos,
-			 struct ctf_stream *stream)
+int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *stream)
+			 
 {
 	struct ctf_text_stream_pos *pos =
 		container_of(ppos, struct ctf_text_stream_pos, parent);
-	struct ctf_stream_class *stream_class = stream->stream_class;
+	struct ctf_stream_declaration *stream_class = stream->stream_class;
 	int field_nr_saved;
-	struct ctf_event *event_class;
-	struct ctf_stream_event *event;
+	struct ctf_event_declaration *event_class;
+	struct ctf_event_definition *event;
 	uint64_t id;
 	int ret;
 	int dom_print = 0;
@@ -459,7 +459,7 @@ error:
 
 
 struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
-		void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
+		void (*packet_seek)(struct stream_pos *pos, size_t index,
 			int whence), FILE *metadata_fp)
 {
 	struct ctf_text_stream_pos *pos;