fix : callback type, doc and links to libbabeltrace

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

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index aacedaebcede77bb2ea630463f5839593ffcce22..c77ea7827614cb4d89c84d5c05f8c7c22a695bb2 100644 (file)
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -17,10 +17,12 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <glib.h>
+#include <babeltrace/context.h>
 #include <babeltrace/format.h>
-
-typedef GQuark bt_event_name;
+#include <babeltrace/iterator.h>
+#include <babeltrace/trace-collection.h>
+#include <babeltrace/trace-handle.h>
+#include <babeltrace/ctf/events.h>
 
 /* Forward declarations */
 struct bt_iter;
@@ -35,11 +37,6 @@ enum bt_cb_ret {
        BT_CB_ERROR_CONTINUE    = 3,
 };
 
-struct bt_ctf_data {
-       struct ctf_stream_event *event;
-       struct ctf_stream *stream;
-};
-
 /*
  * Receives a variable number of strings as parameter, ended with NULL.
  */
@@ -87,8 +84,8 @@ void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
  * callbacks/read/add more callbacks/read some more.)
  */
 int bt_iter_add_callback(struct bt_iter *iter,
-               bt_event_name event, void *private_data, int flags,
-               enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
+               bt_intern_str event, void *private_data, int flags,
+               enum bt_cb_ret (*callback)(struct bt_ctf_event *ctf_data,
                                           void *caller_data),
                struct bt_dependencies *depends,
                struct bt_dependencies *weak_depends,