Make API CTF-agnostic

[babeltrace.git] / include / babeltrace / graph / notification-stream-internal.h

diff --git a/include/babeltrace/graph/notification-stream-internal.h b/include/babeltrace/graph/notification-stream-internal.h
index b170e4e61375d106de77cc95b99538faa3af1f3c..15dd084751c405b6752b1d572a9f55f04fa6a6e7 100644 (file)
--- a/include/babeltrace/graph/notification-stream-internal.h
+++ b/include/babeltrace/graph/notification-stream-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H
 
 /*
  * BabelTrace - Stream-related Notifications
@@ -30,39 +30,19 @@
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/graph/notification-internal.h>
+#include <babeltrace/ctf-ir/clock-value-internal.h>
+#include <babeltrace/assert-internal.h>
 
 struct bt_notification_stream_begin {
        struct bt_notification parent;
-       struct bt_ctf_stream *stream;
+       struct bt_stream *stream;
+       struct bt_clock_value *default_cv;
 };
 
 struct bt_notification_stream_end {
        struct bt_notification parent;
-       struct bt_ctf_stream *stream;
+       struct bt_stream *stream;
+       struct bt_clock_value *default_cv;
 };
 
-static inline
-struct bt_ctf_stream *bt_notification_stream_begin_borrow_stream(
-               struct bt_notification *notif)
-{
-       struct bt_notification_stream_begin *notif_stream_begin =
-               container_of(notif,
-                       struct bt_notification_stream_begin, parent);
-
-       assert(notif_stream_begin);
-       return notif_stream_begin->stream;
-}
-
-static inline
-struct bt_ctf_stream *bt_notification_stream_end_borrow_stream(
-               struct bt_notification *notif)
-{
-       struct bt_notification_stream_end *notif_stream_end =
-               container_of(notif,
-                       struct bt_notification_stream_end, parent);
-
-       assert(notif_stream_end);
-       return notif_stream_end->stream;
-}
-
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H */