Remove obsolete links to softmixer controls

Remove obsolete links to playbacks/captures softmixer controls.
These links are not used anymore (only 'halmap' controls are used).
It also means that references to controls in 'halmixer' section
of json configuration files must be removed (as it's done for example
json configuration file in this commit).

BUG-AGL : SPEC-2329

Change-Id: Ic5a7f055d09b44021d817c04d56023fed3c0e478
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>

1 files changed, 9 insertions, 51 deletions

diff --git a/src/4a-internals-hal/4a-internals-hal-cb.c b/src/4a-internals-hal/4a-internals-hal-cb.c
index bca4d82..4c5fb68 100644
--- a/src/4a-internals-hal/4a-internals-hal-cb.c
+++ b/src/4a-internals-hal/4a-internals-hal-cb.c
@@ -442,8 +442,7 @@ int InternalHalHalMapConfig(afb_api_t apiHandle, CtlSectionT *section, json_obje
  ******************************************************************************/
 
 json_object *InternalHalGetJsonArrayForMixerDataTable(afb_api_t apiHandle,
-						      struct InternalHalMixerData **mixerDataList,
-						      enum MixerDataType dataType)
+						      struct InternalHalMixerData **mixerDataList)
 {
 	int wrapRet;
 
@@ -464,30 +463,12 @@ json_object *InternalHalGetJsonArrayForMixerDataTable(afb_api_t apiHandle,
 
 	currentMixerData = *mixerDataList;
 	while(currentMixerData) {
-		switch(dataType) {
-			case MIXER_DATA_STREAMS:
-				wrapRet = wrap_json_pack(&currentMixerDataJ,
-							 "{s:s s:s}",
-							 "name", currentMixerData->verb,
-							 "cardId", currentMixerData->streamCardId);
-				break;
-
-			case MIXER_DATA_PLAYBACKS:
-			case MIXER_DATA_CAPTURES :
-				wrapRet = wrap_json_pack(&currentMixerDataJ,
-							 "{s:s s:s}",
-							 "name", currentMixerData->verb,
-							 "mixer-name", currentMixerData->verbToCall,
-							 "uid", currentMixerData->streamCardId ? currentMixerData->streamCardId : "none");
-				break;
-
-			default:
-				json_object_put(mixerDataArrayJ);
-				return NULL;
-		}
-
+		wrapRet = wrap_json_pack(&currentMixerDataJ,
+					 "{s:s s:s}",
+					 "name", currentMixerData->verb,
+					 "cardId", currentMixerData->streamCardId);
 		if(wrapRet) {
-			AFB_API_ERROR(apiHandle, "Didn't succeed to allocate current mixer/playbacks/captures json object");
+			AFB_API_ERROR(apiHandle, "Didn't succeed to allocate current mixer json object");
 			json_object_put(mixerDataArrayJ);
 			return NULL;
 		}
@@ -529,7 +510,7 @@ json_object *InternalHalGetJsonArrayForControls(afb_api_t apiHandle, struct Inte
 					 "name", currentAlsaMapDataT->ctls[idx].uid,
 					 "info", currentAlsaMapDataT->ctls[idx].info ? currentAlsaMapDataT->ctls[idx].info : "none");
 		if(wrapRet) {
-			AFB_API_ERROR(apiHandle, "Didn't succeed to allocate current mixer/playbacks/captures json object");
+			AFB_API_ERROR(apiHandle, "Didn't succeed to allocate current streams json object");
 			json_object_put(alsaMapDataArray);
 			return NULL;
 		}
@@ -555,8 +536,6 @@ void InternalHalInfo(afb_req_t request)
 		    *toReturnJ = NULL,
 		    *requestAnswer,
 		    *streamsArray,
-		    *playbacksArray,
-		    *capturesArray,
 		    *controlsArray;
 
 	apiHandle = afb_req_get_api(request);
@@ -602,29 +581,12 @@ void InternalHalInfo(afb_req_t request)
 	}
 
 	streamsArray = InternalHalGetJsonArrayForMixerDataTable(apiHandle,
-								&currentHalData->internalHalData->streamsData,
-								MIXER_DATA_STREAMS);
+								&currentHalData->internalHalData->streamsData);
 	if(! streamsArray) {
 		afb_req_fail(request, "streams_data", "Didn't succeed to generate streams data array");
 		return;
 	}
 
-	playbacksArray = InternalHalGetJsonArrayForMixerDataTable(apiHandle,
-								  &currentHalData->internalHalData->playbacksData,
-								  MIXER_DATA_PLAYBACKS);
-	if(! playbacksArray) {
-		afb_req_fail(request, "playbacks_data", "Didn't succeed to generate playbacks data array");
-		return;
-	}
-
-	capturesArray = InternalHalGetJsonArrayForMixerDataTable(apiHandle,
-								 &currentHalData->internalHalData->capturesData,
-								 MIXER_DATA_CAPTURES);
-	if(! capturesArray) {
-		afb_req_fail(request, "captures_data", "Didn't succeed to generate captures data array");
-		return;
-	}
-
 	controlsArray = InternalHalGetJsonArrayForControls(apiHandle,
 							   currentHalData->internalHalData->alsaMapT);
 	if(! controlsArray) {
@@ -633,18 +595,14 @@ void InternalHalInfo(afb_req_t request)
 	}
 
 	wrapRet = wrap_json_pack(&requestAnswer,
-				 "{s:o s:o s:o s:o}",
+				 "{s:o s:o}",
 				 "streams", streamsArray,
-				 "playbacks", playbacksArray,
-				 "captures", capturesArray,
 				 "controls", controlsArray);
 	if(wrapRet) {
 		afb_req_fail(request,
 			     "halinfo_json_object",
 			     "Didn't succeed to allocate hal info response json object");
 		json_object_put(streamsArray);
-		json_object_put(playbacksArray);
-		json_object_put(capturesArray);
 		json_object_put(controlsArray);
 		return;
 	}