X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fevent-internal.h;h=857ea01d03cbda886e8a1f313a63a0caf17d0aaa;hb=61cf588beae752e5ddfc60b6b5310f769ac9e852;hp=171e7c78474ba91d3b1e5a8b836ad91de18295b7;hpb=b8248cc00f72ac2448c697c76033c8862d8db673;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index 171e7c78..857ea01d 100644
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -27,22 +27,22 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-writer/ref-internal.h>
 #include <babeltrace/ctf-writer/event-types.h>
 #include <babeltrace/ctf-writer/event-fields.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/objects.h>
+#include <babeltrace/values.h>
 #include <babeltrace/ctf/types.h>
+#include <babeltrace/ctf-ir/stream-class.h>
+#include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/object-internal.h>
 #include <glib.h>
 
 #define BT_CTF_EVENT_CLASS_ATTR_ID_INDEX	0
 #define BT_CTF_EVENT_CLASS_ATTR_NAME_INDEX	1
 
 struct bt_ctf_event_class {
-	struct bt_ctf_ref ref_count;
-	struct bt_object *attributes;
-	/* An event class does not have ownership of a stream class */
-	struct bt_ctf_stream_class *stream_class;
+	struct bt_object base;
+	struct bt_value *attributes;
 	/* Structure type containing the event's context */
 	struct bt_ctf_field_type *context;
 	/* Structure type containing the event's fields */
@@ -51,7 +51,7 @@ struct bt_ctf_event_class {
 };
 
 struct bt_ctf_event {
-	struct bt_ctf_ref ref_count;
+	struct bt_object base;
 	struct bt_ctf_event_class *event_class;
 	struct bt_ctf_field *event_header;
 	struct bt_ctf_field *context_payload;
@@ -61,10 +61,6 @@ struct bt_ctf_event {
 BT_HIDDEN
 void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class);
 
-BT_HIDDEN
-int bt_ctf_event_class_set_stream_class(struct bt_ctf_event_class *event_class,
-		struct bt_ctf_stream_class *stream_class);
-
 BT_HIDDEN
 int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 		struct metadata_context *context);
@@ -74,6 +70,10 @@ void bt_ctf_event_class_set_native_byte_order(
 		struct bt_ctf_event_class *event_class,
 		int byte_order);
 
+BT_HIDDEN
+int bt_ctf_event_class_set_stream_id(struct bt_ctf_event_class *event_class,
+		uint32_t stream_id);
+
 BT_HIDDEN
 int bt_ctf_event_validate(struct bt_ctf_event *event);