X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fviewer-connection.h;h=ca5883e840491bc7ae6b9a95442a37abb2056536;hb=3c22a2420b7a79eb5bce946bcf314349d2ebfe14;hp=09adc6cf497c8d8b7da6baa81011f815ea9f9102;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.h b/src/plugins/ctf/lttng-live/viewer-connection.h
index 09adc6cf..ca5883e8 100644
--- a/src/plugins/ctf/lttng-live/viewer-connection.h
+++ b/src/plugins/ctf/lttng-live/viewer-connection.h
@@ -23,15 +23,16 @@
  * SOFTWARE.
  */
 
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
+
 #include <glib.h>
 
-#include "common/babeltrace.h"
-#include "compat/socket.h"
+#include <babeltrace2/babeltrace.h>
 
-//TODO: this should not be used by plugins. Should copy code into plugin
-//instead.
-#include "lib/object.h"
+#include "common/macros.h"
+#include "compat/socket.h"
 
 #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT	5344
 
@@ -41,7 +42,9 @@
 struct lttng_live_component;
 
 struct live_viewer_connection {
-	bt_object obj;
+	bt_logging_level log_level;
+	bt_self_component *self_comp;
+	bt_self_component_class *self_comp_class;
 
 	GString *url;
 
@@ -80,12 +83,15 @@ struct packet_index {
 
 struct live_viewer_connection * live_viewer_connection_create(
 		const char *url, bool in_query,
-		struct lttng_live_msg_iter *lttng_live_msg_iter);
+		struct lttng_live_msg_iter *lttng_live_msg_iter,
+		bt_self_component *self_comp,
+		bt_self_component_class *self_comp_class,
+		bt_logging_level log_level);
 
 void live_viewer_connection_destroy(
 		struct live_viewer_connection *conn);
 
-bt_query_status live_viewer_connection_list_sessions(
+bt_component_class_query_method_status live_viewer_connection_list_sessions(
 		struct live_viewer_connection *viewer_connection,
 		const bt_value **user_result);