From 67c6759d5bd0f11289fff1bdd11a8dc28bf82ec7 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Thu, 31 May 2018 10:30:49 +0200 Subject: alsa-hook: Update to future version of app-framework-binder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The subcall behaviour changes. This commits updates the code to the upcoming behaviour. Change-Id: Ib43b085017536feeb379750bbdef4616d69651cd Signed-off-by: José Bollo --- alsa-hook/PolicyAlsaHook.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'alsa-hook') 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; } -- cgit 1.2.3-korg