Added bluez sound playback support

This adds sound playback for incoming sound from
connected bluetooth devices.
In this version, the softmixer relies on a modified
bluez-alsa version (https://github.com/iotbzh/bluez-alsa),
that provides an ioplug PCM bluezalsa connection proxy.

The softmixer api has a new verb to dynamically set the
device to listen to:

afb-client-demo ws://localhost:1234/api?token=\uuid=123 smixer bluezalsa_dev '{"interface":"hci0", "device":"F6:32:15:2A:80:70", "profile":"a2dp"}'

In this way it is possible to switch from a bluezalsa audio source to
another without any further configuration.

For now, only interface hci0 is supported.

This commit also migrates the softmixer binding to API v3

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

1 files changed, 5 insertions, 4 deletions

diff --git a/plugins/alsa/alsa-api-pcm.c b/plugins/alsa/alsa-api-pcm.c
index a51bb6f..5b6d3f5 100644
--- a/plugins/alsa/alsa-api-pcm.c
+++ b/plugins/alsa/alsa-api-pcm.c
@@ -232,11 +232,11 @@ OnErrorExit:
 }
 
 STATIC void ApiPcmVerbCB(AFB_ReqT request) {
-    apiVerbHandleT *handle = (apiVerbHandleT*) afb_request_get_vcbdata(request);
+    apiVerbHandleT *handle = (apiVerbHandleT*) afb_req_get_vcbdata(request);
     int error, verbose = 0, doInfo = 0, doToggle = 0, doMute = -1;
     json_object *volumeJ = NULL;
     json_object *responseJ = NULL;
-    json_object *argsJ = afb_request_json(request);
+    json_object *argsJ = afb_req_json(request);
 
     SoftMixerT *mixer = handle->mixer;
     AlsaSndCtlT *sndcard = handle->pcm->sndcard;
@@ -432,8 +432,9 @@ PUBLIC AlsaSndPcmT * ApiPcmAttachOne(SoftMixerT *mixer, const char *uid, snd_pcm
     int error;
 
     pcm->sndcard = (AlsaSndCtlT*) calloc(1, sizeof (AlsaSndCtlT));
-    error = wrap_json_unpack(argsJ, "{ss,s?s,s?s,s?i,s?i,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 !}"
             , "uid", &pcm->uid
+			, "pcmplug_params", &pcm->sndcard->cid.pcmplug_params
             , "path", &pcm->sndcard->cid.devpath
             , "cardid", &pcm->sndcard->cid.cardid
             , "device", &pcm->sndcard->cid.device
@@ -549,7 +550,7 @@ PUBLIC AlsaSndPcmT * ApiPcmAttachOne(SoftMixerT *mixer, const char *uid, snd_pcm
         handle->pcm = pcm;
         handle->mixer = mixer;
         pcm->verb=apiVerb;
-        error = afb_dynapi_add_verb(mixer->api, apiVerb, apiInfo, ApiPcmVerbCB, handle, NULL, 0);
+        error = afb_api_add_verb(mixer->api, apiVerb, apiInfo, ApiPcmVerbCB, handle, NULL, 0, 0);
         if (error) {
             AFB_ApiError(mixer->api, "ApiPcmAttachOne mixer=%s verb=%s fail to Register Master control ", mixer->uid, apiVerb);
             goto OnErrorExit;