X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-writer%2Fstream-internal.h;h=565d53f24438def98ea186fa9e471158e17fe150;hb=6f4eefbe19bceb8190b0a09d93d554805ef08b63;hp=9928f16f0c897131e7339d4f7e1cd6158bd97938;hpb=834e9996a9d02f0cec468cb103ab2a573b7317b1;p=babeltrace.git

diff --git a/include/babeltrace/ctf-writer/stream-internal.h b/include/babeltrace/ctf-writer/stream-internal.h
index 9928f16f..565d53f2 100644
--- a/include/babeltrace/ctf-writer/stream-internal.h
+++ b/include/babeltrace/ctf-writer/stream-internal.h
@@ -31,18 +31,17 @@
 #include <babeltrace/assert-internal.h>
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/ctf-writer/serialize-internal.h>
 #include <babeltrace/ctf-writer/stream-internal.h>
 #include <babeltrace/ctf-writer/stream.h>
 #include <babeltrace/ctf-writer/utils-internal.h>
-#include <babeltrace/object-internal.h>
+#include <babeltrace/ctf-writer/object-internal.h>
+#include <babeltrace/ctfser-internal.h>
 #include <stdint.h>
 
 struct bt_ctf_stream_common;
 
 struct bt_ctf_stream_common {
-	struct bt_object base;
+	struct bt_ctf_object base;
 	int64_t id;
 	struct bt_ctf_stream_class_common *stream_class;
 	GString *name;
@@ -52,7 +51,7 @@ BT_HIDDEN
 int bt_ctf_stream_common_initialize(
 		struct bt_ctf_stream_common *stream,
 		struct bt_ctf_stream_class_common *stream_class, const char *name,
-		uint64_t id, bt_object_release_func release_func);
+		uint64_t id, bt_ctf_object_release_func release_func);
 
 BT_HIDDEN
 void bt_ctf_stream_common_finalize(struct bt_ctf_stream_common *stream);
@@ -94,16 +93,12 @@ struct bt_ctf_stream {
 
 	/* Array of pointers to bt_ctf_event for the current packet */
 	GPtrArray *events;
-	struct bt_ctf_stream_pos pos;
+	struct bt_ctfser ctfser;
 	unsigned int flushed_packet_count;
 	uint64_t discarded_events;
-	uint64_t size;
 	uint64_t last_ts_end;
 };
 
-BT_HIDDEN
-int bt_ctf_stream_set_fd(struct bt_ctf_stream *stream, int fd);
-
 BT_HIDDEN
 struct bt_ctf_stream *bt_ctf_stream_create_with_id(
 		struct bt_ctf_stream_class *stream_class,