X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-evt.h;h=901bfbb20893c2062c0e1efe9d0f2ff696ba491d;hb=0891ef4826e347d5554c630b5c0ce73c68f76c9c;hp=9071b32a96ce6f4f0b5e5449a40780d84f8ad1e9;hpb=fbe9349a747aba8d7c8c27e51cdd8c3c5ef8b39c;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-evt.h b/src/afb-evt.h
index 9071b32a..901bfbb2 100644
--- a/src/afb-evt.h
+++ b/src/afb-evt.h
@@ -18,16 +18,18 @@
 #pragma once
 
 struct afb_event;
+struct afb_eventid;
+struct afb_evtid;
 struct afb_session;
 struct json_object;
 struct afb_evt_listener;
 
 struct afb_evt_itf
 {
-	void (*push)(void *closure, const char *event, int eventid, struct json_object *object);
-	void (*broadcast)(void *closure, const char *event, int eventid, struct json_object *object);
-	void (*add)(void *closure, const char *event, int eventid);
-	void (*remove)(void *closure, const char *event, int eventid);
+	void (*push)(void *closure, const char *event, int evtid, struct json_object *object);
+	void (*broadcast)(void *closure, const char *event, int evtid, struct json_object *object);
+	void (*add)(void *closure, const char *event, int evtid);
+	void (*remove)(void *closure, const char *event, int evtid);
 };
 
 extern struct afb_evt_listener *afb_evt_listener_create(const struct afb_evt_itf *itf, void *closure);
@@ -37,14 +39,45 @@ extern int afb_evt_broadcast(const char *event, struct json_object *object);
 extern struct afb_evt_listener *afb_evt_listener_addref(struct afb_evt_listener *listener);
 extern void afb_evt_listener_unref(struct afb_evt_listener *listener);
 
-extern struct afb_event afb_evt_create_event(const char *name);
-extern const char *afb_evt_event_name(struct afb_event event);
-extern int afb_evt_event_id(struct afb_event event);
+extern struct afb_evtid *afb_evt_evtid_create(const char *fullname);
 
-extern int afb_evt_push(struct afb_event event, struct json_object *object);
-extern int afb_evt_unhooked_push(struct afb_event event, struct json_object *object);
+extern struct afb_evtid *afb_evt_evtid_addref(struct afb_evtid *evtid);
+extern struct afb_evtid *afb_evt_evtid_hooked_addref(struct afb_evtid *evtid);
 
-extern int afb_evt_add_watch(struct afb_evt_listener *listener, struct afb_event event);
-extern int afb_evt_remove_watch(struct afb_evt_listener *listener, struct afb_event event);
+extern void afb_evt_evtid_unref(struct afb_evtid *evtid);
+extern void afb_evt_evtid_hooked_unref(struct afb_evtid *evtid);
+
+extern const char *afb_evt_evtid_fullname(struct afb_evtid *evtid);
+extern int afb_evt_evtid_id(struct afb_evtid *evtid);
+
+extern const char *afb_evt_evtid_name(struct afb_evtid *evtid);
+extern const char *afb_evt_evtid_hooked_name(struct afb_evtid *evtid);
+
+extern int afb_evt_evtid_push(struct afb_evtid *evtid, struct json_object *obj);
+extern int afb_evt_evtid_hooked_push(struct afb_evtid *evtid, struct json_object *obj);
+
+extern int afb_evt_evtid_broadcast(struct afb_evtid *evtid, struct json_object *object);
+extern int afb_evt_evtid_hooked_broadcast(struct afb_evtid *evtid, struct json_object *object);
+
+extern int afb_evt_watch_add_evtid(struct afb_evt_listener *listener, struct afb_evtid *evtid);
+extern int afb_evt_watch_sub_evtid(struct afb_evt_listener *listener, struct afb_evtid *evtid);
 
 extern void afb_evt_update_hooks();
+
+
+extern struct afb_eventid *afb_evt_eventid_create(const char *fullname);
+extern const char *afb_evt_eventid_fullname(struct afb_eventid *eventid);
+extern int afb_evt_eventid_id(struct afb_eventid *eventid);
+extern struct afb_eventid *afb_evt_eventid_addref(struct afb_eventid *eventid);
+extern void afb_evt_eventid_unref(struct afb_eventid *eventid);
+
+extern int afb_evt_eventid_push(struct afb_eventid *eventid, struct json_object *object);
+extern int afb_evt_eventid_unhooked_push(struct afb_eventid *eventid, struct json_object *object);
+
+extern int afb_evt_eventid_add_watch(struct afb_evt_listener *listener, struct afb_eventid *eventid);
+extern int afb_evt_eventid_remove_watch(struct afb_evt_listener *listener, struct afb_eventid *eventid);
+
+extern struct afb_evtid *afb_evt_eventid_to_evtid(struct afb_eventid *eventid);
+extern struct afb_eventid *afb_evt_eventid_from_evtid(struct afb_evtid *evtid);
+extern struct afb_event afb_evt_event_from_evtid(struct afb_evtid *evtid);
+