Make bt_graph_add_*_listener() function return a listener ID

[babeltrace.git] / include / babeltrace / graph / graph.h

diff --git a/include/babeltrace/graph/graph.h b/include/babeltrace/graph/graph.h
index b89aaa82b57d03b28c13318707cc4f78aacfd452..06f2af1b122407a46b07e29465a1fec1969f0d15 100644 (file)
--- a/include/babeltrace/graph/graph.h
+++ b/include/babeltrace/graph/graph.h
@@ -38,6 +38,8 @@ struct bt_port;
 struct bt_connection;
 
 enum bt_graph_status {
+       /** Canceled. */
+       BT_GRAPH_STATUS_CANCELED = 125,
        /** No sink can consume at the moment. */
        BT_GRAPH_STATUS_AGAIN = 11,
        /** Downstream component does not support multiple inputs. */
@@ -51,8 +53,6 @@ enum bt_graph_status {
        BT_GRAPH_STATUS_NO_SINK = -6,
        /** General error. */
        BT_GRAPH_STATUS_ERROR = -1,
-       /** Canceled. */
-       BT_GRAPH_STATUS_CANCELED = -125,
 };
 
 typedef void (*bt_graph_port_added_listener)(struct bt_port *port,
@@ -77,15 +77,6 @@ extern struct bt_connection *bt_graph_connect_ports(struct bt_graph *graph,
                struct bt_port *upstream,
                struct bt_port *downstream);
 
-/**
- * Add a component as a "sibling" of the origin component. Sibling share
- * connections equivalent to each other at the time of connection (same
- * upstream and downstream ports).
- */
-extern enum bt_graph_status bt_graph_add_component_as_sibling(
-               struct bt_graph *graph, struct bt_component *origin,
-               struct bt_component *new_component);
-
 /**
  * Run graph to completion or until a single sink is left and "AGAIN" is received.
  *
@@ -101,20 +92,16 @@ extern enum bt_graph_status bt_graph_run(struct bt_graph *graph);
  */
 extern enum bt_graph_status bt_graph_consume(struct bt_graph *graph);
 
-extern enum bt_graph_status bt_graph_add_port_added_listener(
-               struct bt_graph *graph,
+extern int bt_graph_add_port_added_listener(struct bt_graph *graph,
                bt_graph_port_added_listener listener, void *data);
 
-extern enum bt_graph_status bt_graph_add_port_removed_listener(
-               struct bt_graph *graph,
+extern int bt_graph_add_port_removed_listener(struct bt_graph *graph,
                bt_graph_port_removed_listener listener, void *data);
 
-extern enum bt_graph_status bt_graph_add_ports_connected_listener(
-               struct bt_graph *graph,
+extern int bt_graph_add_ports_connected_listener(struct bt_graph *graph,
                bt_graph_ports_connected_listener listener, void *data);
 
-extern enum bt_graph_status bt_graph_add_ports_disconnected_listener(
-               struct bt_graph *graph,
+extern int bt_graph_add_ports_disconnected_listener(struct bt_graph *graph,
                bt_graph_ports_disconnected_listener listener, void *data);
 
 extern enum bt_graph_status bt_graph_cancel(struct bt_graph *graph);