alsa-api-pcm: added an 'optional' parameter

This adds a boolean 'optional' parameter for both playback and
capture devices. When the device is not detected, the stream(s)
that use is are not created, without leading to the exit of the
softmixer.

Change-Id: I3effbd61bfe1d1d4a7cde573354b9db791f759cc
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>

1 files changed, 17 insertions, 3 deletions

diff --git a/plugins/alsa/alsa-api-pcm.c b/plugins/alsa/alsa-api-pcm.c
index 50246e1..0421119 100644
--- a/plugins/alsa/alsa-api-pcm.c
+++ b/plugins/alsa/alsa-api-pcm.c
@@ -392,6 +392,9 @@ PUBLIC void ApiPcmParamsShow(SoftMixerT * mixer, const char *msg, const AlsaPcmH
 PUBLIC AlsaPcmHwInfoT * ApiPcmSetParams(SoftMixerT *mixer, const char *uid, json_object * paramsJ) {
 
     const char *format = NULL, *access = NULL;
+
+    AFB_API_NOTICE(mixer->api, "%s for %s: params are %s", __func__, uid, json_object_get_string(paramsJ));
+
 	AlsaPcmHwInfoT *params = calloc(1, sizeof (AlsaPcmHwInfoT));
 	if (params == NULL) {
 		SOFTMIXER_NOMEM(mixer->api);
@@ -502,7 +505,9 @@ PUBLIC void ApiPcmDelete(SoftMixerT * mixer, AlsaSndPcmT * pcm) {
 
 	pcmChannelsDestroy(mixer, pcm);
 
-	snd_ctl_close(card->ctl);
+	if (card->ctl)
+		snd_ctl_close(card->ctl);
+
 	free(card);
 	free ((char*)pcm->mute.name);
 	free ((char*)pcm->volume.name);
@@ -554,7 +559,7 @@ PUBLIC AlsaSndPcmT * ApiPcmAttachOne(SoftMixerT *mixer, const char *uid, snd_pcm
 	}
 	CDS_INIT_LIST_HEAD(&pcm->sndcard->registryList);
 
-	error = wrap_json_unpack(argsJ, "{ss,s?s,s?s,s?s,s?i,s?i,s?o,s?o,s?o,s?o !}"
+	error = wrap_json_unpack(argsJ, "{ss,s?s,s?s,s?s,s?i,s?i,s?o,s?o,s?o,s?o,s?b !}"
             , "uid", &pcm->uid
 			, "pcmplug_params", &pcm->sndcard->cid.pcmplug_params
             , "path", &pcm->sndcard->cid.devpath
@@ -565,9 +570,10 @@ PUBLIC AlsaSndPcmT * ApiPcmAttachOne(SoftMixerT *mixer, const char *uid, snd_pcm
             , "source", &sourceJ
             , "params", &paramsJ
 			, "quirks", &quirksJ
+			, "optional", &pcm->optional
             );
     if (error) {
-(??)		AFB_ApiError(mixer->api, "%s: hal=%s missing 'uid|path|cardid|device|sink|source|params|quirks' error=%s args=%s",
+		AFB_ApiError(mixer->api, "%s: hal=%s missing 'uid|path|cardid|device|sink|source|params|quirks|optional' error=%s args=%s",
 				__func__, uid, wrap_json_get_error_string(error), json_object_get_string(argsJ));
 		goto fail_pcm_sndcard;
     }
@@ -577,9 +583,17 @@ PUBLIC AlsaSndPcmT * ApiPcmAttachOne(SoftMixerT *mixer, const char *uid, snd_pcm
 	else
 		pcm->isPcmPlug = false;
 
+	pcm->sndcard->optional = pcm->optional;
+
     // try to open sound card control interface
     pcm->sndcard->ctl = AlsaByPathOpenCtl(mixer, pcm->uid, pcm->sndcard);
     if (!pcm->sndcard->ctl) {
+		if (pcm->optional) {
+
+			AFB_API_INFO(mixer->api, "%s: hal=%s Fail to open OPTIONAL sndcard uid=%s devpath=%s cardid=%s",
+					__func__, uid, pcm->uid, pcm->sndcard->cid.devpath, pcm->sndcard->cid.cardid);
+			goto done;
+		}
 
 		AFB_ApiError(mixer->api, "%s: hal=%s Fail to open sndcard uid=%s devpath=%s cardid=%s",
 				__func__, uid, pcm->uid, pcm->sndcard->cid.devpath, pcm->sndcard->cid.cardid);