X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.h;h=964e2b0d8f3a05a148001eb3e69d73777caff717;hb=c720d0ed2d95b6f73a6e26bfda1ef853cd41be25;hp=a31479c202ba558b3c01f885b15e5f7a1111aa9b;hpb=b8ec6408f237065d6f87a23bcfe6c20ac56528bf;p=staging%2Fwindowmanager.git

diff --git a/AFBClient.h b/AFBClient.h
index a31479c..964e2b0 100644
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -1,20 +1,9 @@
 #ifndef AFBCLIENT_H
 #define AFBCLIENT_H
 
-#include <systemd/sd-event.h>
-
 #include <functional>
 
-extern "C"
-{
-#include <json-c/json.h>
-
-#include "afb-wsj1.h"
-#include "afb-ws-client.h"
-}
-
-class AFBClient
-{
+class AFBClient {
     AFBClient();
     ~AFBClient();
 
@@ -22,19 +11,23 @@ class AFBClient
     AFBClient &operator=(const AFBClient &) = delete;
 
 public:
+    using handler_fun = std::function<void(const char *)>;
+
     enum EventType {
-       Event_Active = 1,
-       Event_Inactive,
-       Event_Visible,
-       Event_Invisible,
-       Event_SyncDraw,
-       Event_FlushDraw,
+        Event_Active = 1,
+        Event_Inactive,
+
+        Event_Visible,
+        Event_Invisible,
+
+        Event_SyncDraw,
+        Event_FlushDraw,
     };
 
     static AFBClient &instance();
 
     int init(int port, char const *token);
-    int dispatch(uint64_t timeout);
+    int dispatch();
 
     // WM API
     int requestSurface(const char *label);
@@ -42,17 +35,11 @@ public:
     int deactivateSurface(const char *label);
     int endDraw(const char *label);
 
-    void set_event_handler(enum EventType et,
-          std::function<void(char const *label)> f);
-
-private:
-    /// object will be json_object_put
-    int call(const char *verb, json_object *object,
-          std::function<void(bool ok, json_object*)> onReply);
+    void set_event_handler(enum EventType et, handler_fun f);
 
-    struct afb_wsj1 *wsj1;
-    struct afb_wsj1_itf itf;
+    struct Impl;
 
-    sd_event *loop;
+private:
+    Impl *d;
 };
 #endif // AFBCLIENT_H