lib: rename include dir to babeltrace2

[babeltrace.git] / plugins / utils / muxer / muxer.c

diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c
index 8fa4ebadab6e2831e4af2d526f4df9cff7911f34..626c437bd2faf8e9e26419a27a4c2c1c47d82622 100644 (file)
--- a/plugins/utils/muxer/muxer.c
+++ b/plugins/utils/muxer/muxer.c
@@ -23,19 +23,19 @@
 #define BT_LOG_TAG "PLUGIN-UTILS-MUXER-FLT"
 #include "logging.h"
 
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/compat/uuid-internal.h>
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/value-internal.h>
-#include <babeltrace/graph/component-internal.h>
-#include <babeltrace/graph/message-iterator-internal.h>
-#include <babeltrace/graph/connection-internal.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/compat/uuid-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include <babeltrace2/value-internal.h>
+#include <babeltrace2/graph/component-internal.h>
+#include <babeltrace2/graph/message-iterator-internal.h>
+#include <babeltrace2/graph/connection-internal.h>
 #include <plugins-common.h>
 #include <glib.h>
 #include <stdbool.h>
 #include <inttypes.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/common-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/common-internal.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -550,7 +550,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
                        msg);
                break;
        case BT_MESSAGE_TYPE_PACKET_BEGINNING:
-               if (bt_stream_class_packets_have_default_beginning_clock_snapshot(
+               if (bt_stream_class_packets_have_beginning_default_clock_snapshot(
                                stream_class)) {
                        clock_snapshot = bt_message_packet_beginning_borrow_default_clock_snapshot_const(
                                msg);
@@ -560,7 +560,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
 
                break;
        case BT_MESSAGE_TYPE_PACKET_END:
-               if (bt_stream_class_packets_have_default_end_clock_snapshot(
+               if (bt_stream_class_packets_have_end_default_clock_snapshot(
                                stream_class)) {
                        clock_snapshot = bt_message_packet_end_borrow_default_clock_snapshot_const(
                                msg);
@@ -572,7 +572,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
        case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
                if (bt_stream_class_discarded_events_have_default_clock_snapshots(
                                stream_class)) {
-                       clock_snapshot = bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const(
+                       clock_snapshot = bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const(
                                msg);
                } else {
                        goto no_clock_snapshot;
@@ -582,7 +582,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
        case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
                if (bt_stream_class_discarded_packets_have_default_clock_snapshots(
                                stream_class)) {
-                       clock_snapshot = bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const(
+                       clock_snapshot = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const(
                                msg);
                } else {
                        goto no_clock_snapshot;