diff options
Diffstat (limited to '4a-hal/4a-hal-controllers')
3 files changed, 4 insertions, 71 deletions
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c index fb70962..90b4940 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c @@ -24,7 +24,7 @@ #include <wrap-json.h> #include "../4a-hal-utilities/4a-hal-utilities-data.h" -#include "../4a-hal-utilities/4a-hal-utilities-verbs-loader.h" +#include "../4a-hal-utilities/4a-hal-utilities-appfw-responses-handler.h" #include "4a-hal-controllers-cb.h" #include "4a-hal-controllers-mixer-handler.h" @@ -139,7 +139,7 @@ void HalCtlsActionOnStream(afb_request *request) strcat(verbToCall, request->verb); if(afb_dynapi_call_sync(apiHandle, apiToCall, verbToCall, json_object_get(requestJson), &returnJ)) { - HalCtlsHandleMixerCallError(request, apiToCall, verbToCall, returnJ, "stream_action"); + HalUtlHandleAppFwCallErrorInRequest(request, apiToCall, verbToCall, returnJ, "stream_action"); } else if(json_object_object_get_ex(returnJ, "response", &toReturnJ)){ afb_request_success_f(request, toReturnJ, "Action %s correctly transfered to %s without any error raised", @@ -254,7 +254,7 @@ void HalCtlsInitMixer(afb_request *request) // TODO JAI: test hal status (card is detected) if(afb_dynapi_call_sync(apiHandle, apiToCall, "create", json_object_get(currentCtlHalData->ctlHalSpecificData->halMixerJ), &returnJ)) { - HalCtlsHandleMixerCallError(request, apiToCall, "create", returnJ, "mixer_create"); + HalUtlHandleAppFwCallErrorInRequest(request, apiToCall, "create", returnJ, "mixer_create"); } else if(json_object_object_get_ex(returnJ, "response", &toReturnJ)) { err = HalCtlsHandleMixerAttachResponse(request, ¤tCtlHalData->ctlHalSpecificData->ctlHalStreamsData, toReturnJ); diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c index 64910b5..77bc4b6 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c @@ -27,75 +27,9 @@ #include "4a-hal-controllers-cb.h" /******************************************************************************* - * HAL controllers hanlde mixer responses functions * + * HAL controllers handle mixer response function * ******************************************************************************/ -void HalCtlsHandleMixerCallError(AFB_ReqT request, char *apiCalled, char *verbCalled, json_object *callReturnJ, char *errorStatus) -{ - char *returnedStatus, *returnedInfo; - - json_object *returnedRequestJ, *returnedStatusJ, *returnedInfoJ; - - if(! json_object_object_get_ex(callReturnJ, "request", &returnedRequestJ)) { - AFB_ReqFail(request, errorStatus, "Couldn't get response request object"); - return; - } - - if(! json_object_is_type(returnedRequestJ, json_type_object)) { - AFB_ReqFail(request, errorStatus, "Response request object is not valid"); - return; - } - - if(! json_object_object_get_ex(returnedRequestJ, "status", &returnedStatusJ)) { - AFB_ReqFail(request, errorStatus, "Couldn't get response status object"); - return; - } - - if(! json_object_is_type(returnedStatusJ, json_type_string)) { - AFB_ReqFail(request, errorStatus, "Response status object is not valid"); - return; - } - - returnedStatus = (char *) json_object_get_string(returnedStatusJ); - - if(! strcmp(returnedStatus, "unknown-api")) { - AFB_ReqFailF(request, - errorStatus, - "Api %s not found", - apiCalled); - return; - } - - if(! strcmp(returnedStatus, "unknown-verb")) { - AFB_ReqFailF(request, - errorStatus, - "Verb %s of api %s not found", - verbCalled, - apiCalled); - return; - } - - if(! json_object_object_get_ex(returnedRequestJ, "info", &returnedInfoJ)) { - AFB_ReqFail(request, errorStatus, "Couldn't get response info object"); - return; - } - - if(! json_object_is_type(returnedInfoJ, json_type_string)) { - AFB_ReqFail(request, errorStatus, "Response info object is not valid"); - return; - } - - returnedInfo = (char *) json_object_get_string(returnedInfoJ); - - AFB_ReqFailF(request, - errorStatus, - "Api %s and verb %s found, but this error was raised : '%s' with this info : '%s'", - apiCalled, - verbCalled, - returnedStatus, - returnedInfo); -} - int HalCtlsHandleMixerAttachResponse(AFB_ReqT request, struct CtlHalStreamsDataT *currentHalStreamsData, json_object *mixerResponseJ) { int err = 0; diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h index 7e32a0f..9ad486d 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h @@ -24,7 +24,6 @@ #include "../4a-hal-utilities/4a-hal-utilities-data.h" -void HalCtlsHandleMixerCallError(AFB_ReqT request, char *apiCalled, char *verbCalled, json_object *callReturnJ, char *errorStatus); int HalCtlsHandleMixerAttachResponse(AFB_ReqT request, struct CtlHalStreamsDataT *currentHalStreamsData, json_object *MixerResponseJ); #endif /* _HAL_CTLS_SOFTMIXER_LINK_INCLUDE_ */
\ No newline at end of file |