X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Ftext%2Fpretty%2Fpretty.h;h=cb79db505b0b60cd844994d8c7cf54090dab5621;hb=0f77b5c9dfac44ff6eff8fb66fefadea72846c97;hp=e3a24106760a011b00ac9834664ae3b93d69469d;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/plugins/text/pretty/pretty.h b/src/plugins/text/pretty/pretty.h
index e3a24106..cb79db50 100644
--- a/src/plugins/text/pretty/pretty.h
+++ b/src/plugins/text/pretty/pretty.h
@@ -25,8 +25,10 @@
  * SOFTWARE.
  */
 
+#include <glib.h>
+#include <stdio.h>
 #include <stdbool.h>
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include <babeltrace2/babeltrace.h>
 
 enum pretty_default {
@@ -72,13 +74,12 @@ struct pretty_options {
 
 struct pretty_component {
 	struct pretty_options options;
-	bt_self_component_port_input_message_iterator *iterator;
+	bt_message_iterator *iterator;
 	FILE *out, *err;
 	int depth;	/* nesting, used for tabulation alignment. */
 	bool start_line;
 	GString *string;
 	GString *tmp_string;
-	bt_value *plugin_opt_map; /* Temporary parameter map. */
 	bool use_colors;
 
 	uint64_t last_cycles_timestamp;
@@ -90,31 +91,19 @@ struct pretty_component {
 	bool negative_timestamp_warning_done;
 };
 
-enum stream_packet_context_quarks_enum {
-	Q_TIMESTAMP_BEGIN,
-	Q_TIMESTAMP_END,
-	Q_EVENTS_DISCARDED,
-	Q_CONTENT_SIZE,
-	Q_PACKET_SIZE,
-	Q_PACKET_SEQ_NUM,
-	STREAM_PACKET_CONTEXT_QUARKS_LEN, /* Always the last one of this enum. */
-};
-
-extern
-GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN];
-
 BT_HIDDEN
-bt_self_component_status pretty_init(
+bt_component_class_initialize_method_status pretty_init(
 		bt_self_component_sink *component,
+		bt_self_component_sink_configuration *config,
 		const bt_value *params,
 		void *init_method_data);
 
 BT_HIDDEN
-bt_self_component_status pretty_consume(
+bt_component_class_sink_consume_method_status pretty_consume(
 		bt_self_component_sink *component);
 
 BT_HIDDEN
-bt_self_component_status pretty_graph_is_configured(
+bt_component_class_sink_graph_is_configured_method_status pretty_graph_is_configured(
 		bt_self_component_sink *component);
 
 BT_HIDDEN
@@ -128,4 +117,7 @@ BT_HIDDEN
 int pretty_print_discarded_items(struct pretty_component *pretty,
 		const bt_message *msg);
 
+BT_HIDDEN
+void pretty_print_init(void);
+
 #endif /* BABELTRACE_PLUGIN_TEXT_PRETTY_PRETTY_H */