summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2018-05-31 10:30:49 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2018-05-31 19:00:27 +0200
commit67c6759d5bd0f11289fff1bdd11a8dc28bf82ec7 (patch)
treef975f43b2338bb9af4d268672414f78a557db195
parent415d0eea2eb8a1dae47f6cadc73e4fd7675dd8c3 (diff)
alsa-hook: Update to future version of app-framework-binder
The subcall behaviour changes. This commits updates the code to the upcoming behaviour. Change-Id: Ib43b085017536feeb379750bbdef4616d69651cd Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--alsa-hook/PolicyAlsaHook.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/alsa-hook/PolicyAlsaHook.c b/alsa-hook/PolicyAlsaHook.c
index 3a48f83..e93edae 100644
--- a/alsa-hook/PolicyAlsaHook.c
+++ b/alsa-hook/PolicyAlsaHook.c
@@ -246,6 +246,7 @@ static struct afb_proto_ws_client_itf itf = {
#else
.on_reply_success = OnSuccessCB,
.on_reply_fail = OnFailureCB,
+ .on_subcall = NULL,
#endif
.on_event_create = NULL,
.on_event_remove = NULL,
@@ -253,7 +254,6 @@ static struct afb_proto_ws_client_itf itf = {
.on_event_unsubscribe = NULL,
.on_event_push = OnEventCB,
.on_event_broadcast = NULL,
- .on_subcall = NULL,
};
int OnTimeoutCB (sd_event_source* source, uint64_t timer, void* handle) {
@@ -295,7 +295,11 @@ static int CallWithTimeout(afbClientT *afbClient, afbRequestT *afbRequest, int c
// release action is optional
if (afbRequest->apiverb) {
if (afbClient->verbose) printf("CALL-REQUEST verb=%s query=%s tag=%s session=%s\n", afbRequest->apiverb, json_object_get_string(queryJ), afbRequest->callIdTag, afbClient->uid);
- err = afb_proto_ws_client_call(afbClient->pws, afbRequest->apiverb, queryJ, afbClient->uid, afbRequest);
+ err = afb_proto_ws_client_call(afbClient->pws, afbRequest->apiverb, queryJ, afbClient->uid, afbRequest
+#if defined(AFB_PROTO_WS_VERSION) && (AFB_PROTO_WS_VERSION >= 3)
+ , NULL
+#endif
+ );
if (err < 0 ) goto OnErrorExit;
}