X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Ftext%2Fpretty%2Fpretty.h;h=86c2785368bf92ab4b05f37f5de4f473ac8623bc;hb=d6e69534ef08a2dd8bff9eb5af1eab63736b3d31;hp=2394e042d86c55f4faa36d0a627c21339dbbc66d;hpb=61d6f9b14a895f1a816a938844c371040f7cbd28;p=babeltrace.git

diff --git a/plugins/text/pretty/pretty.h b/plugins/text/pretty/pretty.h
index 2394e042..86c27853 100644
--- a/plugins/text/pretty/pretty.h
+++ b/plugins/text/pretty/pretty.h
@@ -2,8 +2,6 @@
 #define BABELTRACE_PLUGIN_TEXT_PRETTY_PRETTY_H
 
 /*
- * BabelTrace - CTF Text Output Plug-in
- *
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -29,10 +27,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/ctf-ir/event.h>
+#include <babeltrace/babeltrace.h>
 
 enum pretty_default {
 	PRETTY_DEFAULT_UNSET,
@@ -77,15 +72,14 @@ struct pretty_options {
 
 struct pretty_component {
 	struct pretty_options options;
-	struct bt_notification_iterator *input_iterator;
+	bt_self_component_port_input_message_iterator *iterator;
 	FILE *out, *err;
 	int depth;	/* nesting, used for tabulation alignment. */
 	bool start_line;
 	GString *string;
 	GString *tmp_string;
-	struct bt_value *plugin_opt_map;	/* Temporary parameter map. */
+	bt_value *plugin_opt_map; /* Temporary parameter map. */
 	bool use_colors;
-	bool error;
 
 	uint64_t last_cycles_timestamp;
 	uint64_t delta_cycles;
@@ -110,30 +104,30 @@ extern
 GQuark stream_packet_context_quarks[STREAM_PACKET_CONTEXT_QUARKS_LEN];
 
 BT_HIDDEN
-enum bt_component_status pretty_init(
-		struct bt_private_component *component,
-		struct bt_value *params,
+enum bt_self_component_status pretty_init(
+		bt_self_component_sink *component,
+		const bt_value *params,
 		void *init_method_data);
 
 BT_HIDDEN
-enum bt_component_status pretty_consume(struct bt_private_component *component);
+enum bt_self_component_status pretty_consume(
+		bt_self_component_sink *component);
 
 BT_HIDDEN
-void pretty_port_connected(
-		struct bt_private_component *component,
-		struct bt_private_port *self_port,
-		struct bt_port *other_port);
+enum bt_self_component_status pretty_port_connected(
+		bt_self_component_sink *component,
+		bt_self_component_port_input *self_port,
+		const bt_port_output *other_port);
 
 BT_HIDDEN
-void pretty_finalize(struct bt_private_component *component);
+void pretty_finalize(bt_self_component_sink *component);
 
 BT_HIDDEN
-enum bt_component_status pretty_print_event(struct pretty_component *pretty,
-		struct bt_notification *event_notif);
+int pretty_print_event(struct pretty_component *pretty,
+		const bt_message *event_msg);
 
 BT_HIDDEN
-enum bt_component_status pretty_print_discarded_elements(
-		struct pretty_component *pretty,
-		struct bt_notification *notif);
+int pretty_print_packet(struct pretty_component *pretty,
+		const bt_message *packet_beginning_msg);
 
 #endif /* BABELTRACE_PLUGIN_TEXT_PRETTY_PRETTY_H */