Make API CTF-agnostic

[babeltrace.git] / include / babeltrace / ctf-ir / stream.h

diff --git a/include/babeltrace/ctf-ir/stream.h b/include/babeltrace/ctf-ir/stream.h
index a08e327f5d38de1a28c223796c9aef7366d094e3..69829280c904e5cb4f7b3c65a01e9469853ae4a6 100644 (file)
--- a/include/babeltrace/ctf-ir/stream.h
+++ b/include/babeltrace/ctf-ir/stream.h
@@ -30,31 +30,30 @@
  * http://www.efficios.com/ctf
  */
 
-#include <babeltrace/ctf-ir/stream-class.h>
+/* For enum bt_property_availability */
+#include <babeltrace/property.h>
+
 #include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_ctf_event;
-struct bt_ctf_stream;
+struct bt_stream;
+struct bt_stream_class;
 
-extern struct bt_ctf_stream *bt_ctf_stream_create(
-               struct bt_ctf_stream_class *stream_class,
-               const char *name);
+extern struct bt_stream *bt_stream_create(struct bt_stream_class *stream_class);
 
-extern const char *bt_ctf_stream_get_name(struct bt_ctf_stream *stream);
+extern struct bt_stream *bt_stream_create_with_id(
+               struct bt_stream_class *stream_class, uint64_t id);
 
-/*
- * bt_ctf_stream_get_stream_class: get a stream's class.
- *
- * @param stream Stream instance.
- *
- * Returns the stream's class, NULL on error.
- */
-extern struct bt_ctf_stream_class *bt_ctf_stream_get_class(
-               struct bt_ctf_stream *stream);
+extern struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream);
+
+extern const char *bt_stream_get_name(struct bt_stream *stream);
+
+extern int bt_stream_set_name(struct bt_stream *stream, const char *name);
+
+extern uint64_t bt_stream_get_id(struct bt_stream *stream);
 
 #ifdef __cplusplus
 }