X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fgraph.h;h=967bc91dc6e99519d191d5435b83a88eae6350ea;hb=0cbc2c3316814e4b4bf3fd3ba3b361b165949e95;hp=d3a9a875985861011fc8ea0be08fa7737cbda6cd;hpb=4cdfc5e86b64137d96c31495cbdea99801714c2b;p=babeltrace.git

diff --git a/include/babeltrace/graph/graph.h b/include/babeltrace/graph/graph.h
index d3a9a875..967bc91d 100644
--- a/include/babeltrace/graph/graph.h
+++ b/include/babeltrace/graph/graph.h
@@ -56,22 +56,6 @@ typedef void (*bt_graph_filter_component_output_port_added_listener_func)(
 		const bt_component_filter *component,
 		const bt_port_output *port, void *data);
 
-typedef void (*bt_graph_filter_component_input_port_removed_listener_func)(
-		const bt_component_filter *component,
-		const bt_port_input *port, void *data);
-
-typedef void (*bt_graph_sink_component_input_port_removed_listener_func)(
-		const bt_component_sink *component,
-		const bt_port_input *port, void *data);
-
-typedef void (*bt_graph_source_component_output_port_removed_listener_func)(
-		const bt_component_source *component,
-		const bt_port_output *port, void *data);
-
-typedef void (*bt_graph_filter_component_output_port_removed_listener_func)(
-		const bt_component_filter *component,
-		const bt_port_output *port, void *data);
-
 typedef void (*bt_graph_source_filter_component_ports_connected_listener_func)(
 		const bt_component_source *source_component,
 		const bt_component_filter *filter_component,
@@ -84,32 +68,18 @@ typedef void (*bt_graph_source_sink_component_ports_connected_listener_func)(
 		const bt_port_output *upstream_port,
 		const bt_port_input *downstream_port, void *data);
 
-typedef void (*bt_graph_filter_sink_component_ports_connected_listener_func)(
-		const bt_component_filter *filter_component,
-		const bt_component_sink *sink_component,
-		const bt_port_output *upstream_port,
-		const bt_port_input *downstream_port, void *data);
-
-typedef void (*bt_graph_source_filter_component_ports_disconnected_listener_func)(
-		const bt_component_source *source_component,
-		const bt_component_filter *filter_component,
-		const bt_port_output *upstream_port,
-		const bt_port_input *downstream_port,
-		void *data);
-
-typedef void (*bt_graph_source_sink_component_ports_disconnected_listener_func)(
-		const bt_component_source *source_component,
-		const bt_component_sink *sink_component,
+typedef void (*bt_graph_filter_filter_component_ports_connected_listener_func)(
+		const bt_component_filter *filter_component_upstream,
+		const bt_component_filter *filter_component_downstream,
 		const bt_port_output *upstream_port,
 		const bt_port_input *downstream_port,
 		void *data);
 
-typedef void (*bt_graph_filter_sink_component_ports_disconnected_listener_func)(
+typedef void (*bt_graph_filter_sink_component_ports_connected_listener_func)(
 		const bt_component_filter *filter_component,
 		const bt_component_sink *sink_component,
 		const bt_port_output *upstream_port,
-		const bt_port_input *downstream_port,
-		void *data);
+		const bt_port_input *downstream_port, void *data);
 
 typedef void (* bt_graph_listener_removed_func)(void *data);
 
@@ -157,69 +127,43 @@ extern bt_graph_status bt_graph_connect_ports(bt_graph *graph,
 
 extern bt_graph_status bt_graph_run(bt_graph *graph);
 
-extern bt_graph_status bt_graph_consume(
-		bt_graph *graph);
+extern bt_graph_status bt_graph_consume(bt_graph *graph);
 
-extern bt_graph_status
-bt_graph_add_filter_component_input_port_added_listener(
+extern bt_graph_status bt_graph_add_filter_component_input_port_added_listener(
 		bt_graph *graph,
 		bt_graph_filter_component_input_port_added_listener_func listener,
 		bt_graph_listener_removed_func listener_removed, void *data,
 		int *listener_id);
 
-extern bt_graph_status
-bt_graph_add_sink_component_input_port_added_listener(
+extern bt_graph_status bt_graph_add_sink_component_input_port_added_listener(
 		bt_graph *graph,
 		bt_graph_sink_component_input_port_added_listener_func listener,
 		bt_graph_listener_removed_func listener_removed, void *data,
 		int *listener_id);
 
-extern bt_graph_status
-bt_graph_add_source_component_output_port_added_listener(
+extern bt_graph_status bt_graph_add_source_component_output_port_added_listener(
 		bt_graph *graph,
 		bt_graph_source_component_output_port_added_listener_func listener,
 		bt_graph_listener_removed_func listener_removed, void *data,
 		int *listener_id);
 
-extern bt_graph_status
-bt_graph_add_filter_component_output_port_added_listener(
+extern bt_graph_status bt_graph_add_filter_component_output_port_added_listener(
 		bt_graph *graph,
 		bt_graph_filter_component_output_port_added_listener_func listener,
 		bt_graph_listener_removed_func listener_removed, void *data,
 		int *listener_id);
 
 extern bt_graph_status
-bt_graph_add_filter_component_input_port_removed_listener(
-		bt_graph *graph,
-		bt_graph_filter_component_input_port_removed_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		int *listener_id);
-
-extern bt_graph_status
-bt_graph_add_sink_component_input_port_removed_listener(
-		bt_graph *graph,
-		bt_graph_sink_component_input_port_removed_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		int *listener_id);
-
-extern bt_graph_status
-bt_graph_add_source_component_output_port_removed_listener(
-		bt_graph *graph,
-		bt_graph_source_component_output_port_removed_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		int *listener_id);
-
-extern bt_graph_status
-bt_graph_add_filter_component_output_port_removed_listener(
+bt_graph_add_source_filter_component_ports_connected_listener(
 		bt_graph *graph,
-		bt_graph_filter_component_output_port_removed_listener_func listener,
+		bt_graph_source_filter_component_ports_connected_listener_func listener,
 		bt_graph_listener_removed_func listener_removed, void *data,
 		int *listener_id);
 
 extern bt_graph_status
-bt_graph_add_source_filter_component_ports_connected_listener(
+bt_graph_add_filter_filter_component_ports_connected_listener(
 		bt_graph *graph,
-		bt_graph_source_filter_component_ports_connected_listener_func listener,
+		bt_graph_filter_filter_component_ports_connected_listener_func listener,
 		bt_graph_listener_removed_func listener_removed, void *data,
 		int *listener_id);
 
@@ -237,27 +181,6 @@ bt_graph_add_filter_sink_component_ports_connected_listener(
 		bt_graph_listener_removed_func listener_removed, void *data,
 		int *listener_id);
 
-extern bt_graph_status
-bt_graph_add_source_filter_component_ports_disconnected_listener(
-		bt_graph *graph,
-		bt_graph_source_filter_component_ports_disconnected_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		int *listener_id);
-
-extern bt_graph_status
-bt_graph_add_source_sink_component_ports_disconnected_listener(
-		bt_graph *graph,
-		bt_graph_source_sink_component_ports_disconnected_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		int *listener_id);
-
-extern bt_graph_status
-bt_graph_add_filter_sink_component_ports_disconnected_listener(
-		bt_graph *graph,
-		bt_graph_filter_sink_component_ports_disconnected_listener_func listener,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		int *listener_id);
-
 extern bt_graph_status bt_graph_cancel(bt_graph *graph);
 
 #ifdef __cplusplus