summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-09-14 14:04:40 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-09-14 14:04:40 +0200
commit4206071440384c5336d720475800bc4dbf9414cc (patch)
tree2af565bb913feb0a8887a774b3fc6a4a72fd34ba
parentbd5fbcc6a43098dd28ff0b44ab8ca8a8a724d3b0 (diff)
Remove the AFB definition
original author is Aurelian. Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r--AFBClient.cpp14
-rw-r--r--AFBClient.h2
2 files changed, 0 insertions, 16 deletions
diff --git a/AFBClient.cpp b/AFBClient.cpp
index fdfeca8..3d5a878 100644
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -41,14 +41,12 @@ bool AFBClient::init()
return false;
}
-#ifdef AFB
/* connect the websocket wsj1 to the uri given by the first argument */
wsj1 = afb_ws_client_connect_wsj1(loop, wmURI, &itf, NULL);
if (wsj1 == NULL) {
fprintf(stderr, "Connection to %s failed: %m\n", wmURI);
return false;
}
-#endif
printf("init() <--\n");
return true;
@@ -121,7 +119,6 @@ void AFBClient::endDraw(const char *label)
/* called when wsj1 receives a method invocation */
void AFBClient::onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg)
{
-#ifdef AFB
UNUSED(closure);
int rc;
printf("ON-CALL %s/%s:\n%s\n", api, verb,
@@ -131,19 +128,16 @@ void AFBClient::onCall(void *closure, const char *api, const char *verb, struct
rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", NULL);
if (rc < 0)
fprintf(stderr, "replying failed: %m\n");
-#endif
}
/* called when wsj1 receives an event */
void AFBClient::onEvent(void *closure, const char *event, afb_wsj1_msg *msg)
{
-#ifdef AFB
UNUSED(closure);
printf("ON-EVENT %s:\n%s\n", event,
json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
JSON_C_TO_STRING_PRETTY));
fflush(stdout);
-#endif
}
/* called when wsj1 hangsup */
@@ -159,19 +153,16 @@ void AFBClient::onHangup(void *closure, afb_wsj1 *wsj1)
/* called when wsj1 receives a reply */
void AFBClient::onReply(void *closure, afb_wsj1_msg *msg)
{
-#ifdef AFB
printf("ON-REPLY %s: %s\n%s\n", (char*)closure,
afb_wsj1_msg_is_reply_ok(msg) ? "OK" : "ERROR",
json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
JSON_C_TO_STRING_PRETTY));
fflush(stdout);
free(closure);
-#endif
}
void AFBClient::onRequestSurfaceReply(void *closure, afb_wsj1_msg *msg)
{
-#ifdef AFB
printf("onRequestSurfaceReply %s: %s\n%s\n", (char*)closure,
afb_wsj1_msg_is_reply_ok(msg) ? "OK" : "ERROR",
json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
@@ -180,13 +171,11 @@ void AFBClient::onRequestSurfaceReply(void *closure, afb_wsj1_msg *msg)
// putenv("QT_IVI_SURFACE_ID=16778219");
fflush(stdout);
free(closure);
-#endif
}
/* makes a call */
void AFBClient::call(const char *api, const char *verb, const char *object)
{
-#ifdef AFB
static int num = 0;
char *key;
int rc;
@@ -204,17 +193,14 @@ void AFBClient::call(const char *api, const char *verb, const char *object)
printf("call(%s, %s, %s) <--\n", api, verb, object);
fflush(stdout);
-#endif
}
/* sends an event */
void AFBClient::event(const char *event, const char *object)
{
-#ifdef AFB
int rc;
rc = afb_wsj1_send_event_s(wsj1, event, object);
if (rc < 0)
fprintf(stderr, "sending !%s(%s) failed: %m\n", event, object);
-#endif
}
diff --git a/AFBClient.h b/AFBClient.h
index c816e97..f6ad965 100644
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -3,7 +3,6 @@
#include <systemd/sd-event.h>
-#ifdef AFB
extern "C"
{
#include <json-c/json.h>
@@ -11,7 +10,6 @@ extern "C"
#include "afb-wsj1.h"
#include "afb-ws-client.h"
}
-#endif
class AFBClient
{