Guard dispatch using a mutex, remove dipatch() timeout parameter

[staging/windowmanager.git] / AFBClient.h

diff --git a/AFBClient.h b/AFBClient.h
index d776057..b1694b8 100644 (file)
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -1,17 +1,11 @@
 #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"
-}
+struct json_object;
+struct afb_wsj1;
+struct sd_event;
 
 class AFBClient
 {
@@ -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,14 +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,
+          std::function<void(char const *label)> f);
 
 private:
-    void call(const char *api, const char *verb, const char *object);
-
     struct afb_wsj1 *wsj1;
-    struct afb_wsj1_itf itf;
-
-    sd_event *loop;
+    struct sd_event *loop;
 };
 #endif // AFBCLIENT_H