summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-09-14 14:04:49 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-09-14 14:04:49 +0200
commitf203185be97a192a4174c7d5f89be3bfb4e29ac2 (patch)
treeab0a1c5468f7f962901ad097eed3a4f527756986
parent9989bd4ba4cf16237335ad3ed44ad2bc971109c0 (diff)
Application code clean-up
original author is Aurelian. Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r--AFBClient.cpp16
-rw-r--r--AFBClient.h1
2 files changed, 4 insertions, 13 deletions
diff --git a/AFBClient.cpp b/AFBClient.cpp
index ece6501..a009610 100644
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -8,14 +8,6 @@
#define UNUSED(x) (void)(x)
-extern "C" {
-extern struct afb_wsj1 *afb_ws_client_connect_wsj1(struct sd_event *eloop, const char *uri, struct afb_wsj1_itf *itf, void *closure);
-extern int afb_wsj1_call_s(struct afb_wsj1 *wsj1, const char *api, const char *verb, const char *object, void (*on_reply)(void *closure, struct afb_wsj1_msg *msg), void *closure);
-extern int afb_wsj1_msg_is_reply_ok(struct afb_wsj1_msg *msg);
-extern int afb_wsj1_send_event_s(struct afb_wsj1 *wsj1, const char *event, const char *object);
-static inline int afb_wsj1_reply_error_s(struct afb_wsj1_msg *msg, const char *object, const char *token);
-}
-
const char * AFBClient::wmURI = "ws://localhost:1700/api?token=wm";
const char * AFBClient::wmAPI = "winman";
@@ -52,6 +44,10 @@ bool AFBClient::init()
return true;
}
+int AFBClient::dispatch(uint64_t timeout) {
+ return sd_event_run(loop, timeout);
+}
+
int AFBClient::requestSurface(const char *label)
{
printf("AFBClient::requestSurface(%s) -->\n", label);
@@ -133,10 +129,6 @@ void AFBClient::activateSurface(const char *label)
fflush(stdout);
}
-int AFBClient::dispatch(uint64_t timeout) {
- return sd_event_run(loop, timeout);
-}
-
void AFBClient::deactivateSurface(const char *label)
{
printf("AFBClient::deactivateSurface(%s) -->\n", label);
diff --git a/AFBClient.h b/AFBClient.h
index 9119c9c..5b8bb6d 100644
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -47,5 +47,4 @@ private:
static const char *wmURI;
static const char *wmAPI;
};
-
#endif // AFBCLIENT_H