From 03776c5a3fa9adb02a8ebb43dcc693d116390e64 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Wed, 19 Dec 2018 10:59:37 +0100 Subject: Improve ALSA controls volume values conversion Rework halmap ALSA controls volume conversion to be able to add new types of volume conversions easily. Bug-AGL: SPEC-1313 Change-Id: I0949f25c24a349e7409233f51b3d5738ebc43a8a Signed-off-by: Jonathan Aillet --- .../4a-hal-controllers/4a-hal-controllers-alsacore-link.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to '4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c') diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c index 95fde6b..01b4ab2 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c @@ -425,7 +425,9 @@ void HalCtlsActionOnAlsaCtl(AFB_ReqT request) struct SpecificHalData *currentCtlHalData; struct CtlHalAlsaMap *currentAlsaCtl; - json_object *requestJson, *valueJ, *convertedJ; + json_object *requestJson, + *valueJ, + *convertedJ; apiHandle = (AFB_ApiT) AFB_ReqGetApi(request); if(! apiHandle) { @@ -481,8 +483,15 @@ void HalCtlsActionOnAlsaCtl(AFB_ReqT request) return; } - if(HalCtlsNormalizeJsonValues(apiHandle, ¤tAlsaCtl->ctl.alsaCtlProperties, valueJ, &convertedJ)) { - AFB_ReqFailF(request, "request_json", "Error when trying to convert request json '%s'", json_object_get_string(requestJson)); + if(HalCtlsConvertJsonValues(apiHandle, + ¤tAlsaCtl->ctl.alsaCtlProperties, + valueJ, + &convertedJ, + CONVERSION_NORMALIZED_TO_ALSACORE)) { + AFB_ReqFailF(request, + "request_json", + "Error when trying to convert request values '%s'", + json_object_get_string(valueJ)); return; } -- cgit 1.2.3-korg