X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fstream-internal.h;h=155794042d0eee1b89963d0e498ed9cd4257b2cd;hb=319fd969d5f098775f83f9a4c5c394d4a96db999;hp=b0011ddfdbe91f2e721bc9aeb0d7d652f69b2f14;hpb=de3dd40e6fcad56e227f5fc8a8290fbaa88b4e07;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/stream-internal.h b/include/babeltrace/ctf-ir/stream-internal.h
index b0011ddf..15579404 100644
--- a/include/babeltrace/ctf-ir/stream-internal.h
+++ b/include/babeltrace/ctf-ir/stream-internal.h
@@ -28,7 +28,7 @@
  */
 
 #include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/common-internal.h>
+#include <babeltrace/object-internal.h>
 #include <babeltrace/ctf-writer/clock.h>
 #include <babeltrace/ctf-writer/event-fields.h>
 #include <babeltrace/ctf-writer/event-types.h>
@@ -37,16 +37,11 @@
 #include <glib.h>
 
 struct bt_ctf_stream {
-	struct bt_ctf_base base;
-	/* Trace owning this stream. A stream does not own a trace. */
-	struct bt_ctf_trace *trace;
+	struct bt_object base;
 	uint32_t id;
 	struct bt_ctf_stream_class *stream_class;
 	/* Array of pointers to bt_ctf_event for the current packet */
 	GPtrArray *events;
-	/* Array of pointers to bt_ctf_field associated with each event */
-	GPtrArray *event_headers;
-	GPtrArray *event_contexts;
 	struct ctf_stream_pos pos;
 	unsigned int flushed_packet_count;
 	struct bt_ctf_field *packet_header;
@@ -55,12 +50,6 @@ struct bt_ctf_stream {
 	struct bt_ctf_field *event_context;
 };
 
-/* Stream class should be locked by the caller after creating a stream */
-BT_HIDDEN
-struct bt_ctf_stream *bt_ctf_stream_create(
-		struct bt_ctf_stream_class *stream_class,
-		struct bt_ctf_trace *trace);
-
 BT_HIDDEN
 int bt_ctf_stream_set_fd(struct bt_ctf_stream *stream, int fd);