diff options
author | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-12-19 10:59:37 +0100 |
---|---|---|
committer | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-12-20 15:18:36 +0100 |
commit | 5283492076fa4a0e537c255337d4139ab33896f7 (patch) | |
tree | 9e599eacfac0053541ce3faa8577626c13739be7 /4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c | |
parent | d4d1991ec1a666e798f27fc78e77a19c0bbf4ef3 (diff) |
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 <jonathan.aillet@iot.bzh>
Diffstat (limited to '4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c')
-rw-r--r-- | 4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c | 15 |
1 files changed, 12 insertions, 3 deletions
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 00acd4f..d5cd81f 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_request_get_dynapi(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; } |