X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Futils%2Fmuxer%2Fmuxer.h;h=72e8b762bc71c954e5de539d59639ecc73080121;hb=f2fb1b3297ca0bc13b53189a063b63944be7fae9;hp=a383e4c2c0e4e6995f4bb959373686127cb5a8f3;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/plugins/utils/muxer/muxer.h b/src/plugins/utils/muxer/muxer.h
index a383e4c2..72e8b762 100644
--- a/src/plugins/utils/muxer/muxer.h
+++ b/src/plugins/utils/muxer/muxer.h
@@ -26,10 +26,10 @@
 
 #include <stdint.h>
 #include <babeltrace2/babeltrace.h>
-#include "common/babeltrace.h"
+#include "common/macros.h"
 
 BT_HIDDEN
-bt_self_component_status muxer_init(
+bt_component_class_init_method_status muxer_init(
 		bt_self_component_filter *self_comp,
 		const bt_value *params, void *init_data);
 
@@ -37,7 +37,7 @@ BT_HIDDEN
 void muxer_finalize(bt_self_component_filter *self_comp);
 
 BT_HIDDEN
-bt_self_message_iterator_status muxer_msg_iter_init(
+bt_component_class_message_iterator_init_method_status muxer_msg_iter_init(
 		bt_self_message_iterator *self_msg_iter,
 		bt_self_component_filter *self_comp,
 		bt_self_component_port_output *self_port);
@@ -47,23 +47,24 @@ void muxer_msg_iter_finalize(
 		bt_self_message_iterator *self_msg_iter);
 
 BT_HIDDEN
-bt_self_message_iterator_status muxer_msg_iter_next(
+bt_component_class_message_iterator_next_method_status muxer_msg_iter_next(
 		bt_self_message_iterator *self_msg_iter,
 		bt_message_array_const msgs, uint64_t capacity,
 		uint64_t *count);
 
 BT_HIDDEN
-bt_self_component_status muxer_input_port_connected(
+bt_component_class_port_connected_method_status muxer_input_port_connected(
 		bt_self_component_filter *comp,
 		bt_self_component_port_input *self_port,
 		const bt_port_output *other_port);
 
 BT_HIDDEN
-bt_bool muxer_msg_iter_can_seek_beginning(
-		bt_self_message_iterator *message_iterator);
+bt_component_class_message_iterator_can_seek_beginning_method_status
+muxer_msg_iter_can_seek_beginning(
+		bt_self_message_iterator *message_iterator, bt_bool *can_seek);
 
 BT_HIDDEN
-bt_self_message_iterator_status muxer_msg_iter_seek_beginning(
+bt_component_class_message_iterator_seek_beginning_method_status muxer_msg_iter_seek_beginning(
 		bt_self_message_iterator *message_iterator);
 
 #endif /* BABELTRACE_PLUGINS_UTILS_MUXER_H */