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

diff --git a/AFBClient.h b/AFBClient.h
index a31479c..983c2ad 100644
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -1,18 +1,8 @@
 #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
 {
     AFBClient();
@@ -22,11 +12,15 @@ class AFBClient
     AFBClient &operator=(const AFBClient &) = delete;
 
 public:
+    typedef std::function<void(char const *label)> handler_fun;
+
     enum EventType {
        Event_Active = 1,
        Event_Inactive,
+
        Event_Visible,
        Event_Invisible,
+
        Event_SyncDraw,
        Event_FlushDraw,
     };
@@ -34,7 +28,7 @@ public:
     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 +36,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);
+    void set_event_handler(enum EventType et, handler_fun f);
 
-private:
-    /// object will be json_object_put
-    int call(const char *verb, json_object *object,
-          std::function<void(bool ok, json_object*)> onReply);
+    struct Impl;
 
-    struct afb_wsj1 *wsj1;
-    struct afb_wsj1_itf itf;
-
-    sd_event *loop;
+private:
+    Impl *d;
 };
 #endif // AFBCLIENT_H