Fix alsa URI within attach response

2 files changed, 230 insertions, 19 deletions

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index a97ae0c..e0e102a 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -174,8 +174,6 @@
             flavor2="3">
         <cTool flags="1">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>app-controller-submodule/ctl-lib</pElem>
             <pElem>app-afb-helpers-submodule</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/app-controller-submodule/ctl-lib</pElem>
@@ -188,8 +186,6 @@
             flavor2="3">
         <cTool flags="1">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>app-controller-submodule/ctl-lib</pElem>
             <pElem>app-afb-helpers-submodule</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/app-controller-submodule/ctl-lib</pElem>
@@ -202,8 +198,6 @@
             flavor2="3">
         <cTool flags="1">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>app-controller-submodule/ctl-lib</pElem>
             <pElem>app-afb-helpers-submodule</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/app-controller-submodule/ctl-lib</pElem>
@@ -216,8 +210,6 @@
             flavor2="3">
         <cTool flags="1">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>app-controller-submodule/ctl-lib</pElem>
             <pElem>app-afb-helpers-submodule</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/app-controller-submodule/ctl-lib</pElem>
@@ -230,7 +222,6 @@
             flavor2="3">
         <cTool flags="1">
           <incDir>
-            <pElem>app-controller-submodule/ctl-lib</pElem>
             <pElem>build/app-controller-submodule/ctl-lib</pElem>
           </incDir>
         </cTool>
@@ -241,8 +232,6 @@
             flavor2="3">
         <cTool flags="1">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>app-controller-submodule/ctl-lib</pElem>
             <pElem>app-afb-helpers-submodule</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/app-controller-submodule/ctl-lib</pElem>
@@ -255,8 +244,6 @@
             flavor2="3">
         <cTool flags="1">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>app-controller-submodule/ctl-lib</pElem>
             <pElem>app-afb-helpers-submodule</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/app-controller-submodule/ctl-lib</pElem>
@@ -269,8 +256,6 @@
             flavor2="3">
         <cTool flags="1">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>app-controller-submodule/ctl-lib</pElem>
             <pElem>app-afb-helpers-submodule</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/app-controller-submodule/ctl-lib</pElem>
@@ -283,8 +268,6 @@
             flavor2="3">
         <cTool flags="1">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>app-controller-submodule/ctl-lib</pElem>
             <pElem>app-afb-helpers-submodule</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/app-controller-submodule/ctl-lib</pElem>
@@ -354,6 +337,18 @@
       <item path="plugins/alsa/alsa-api-loop.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -364,7 +359,16 @@
       <item path="plugins/alsa/alsa-api-mixer.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
           </incDir>
           <preprocessorList>
             <Elem>alsa_softmixer_EXPORTS</Elem>
@@ -374,6 +378,18 @@
       <item path="plugins/alsa/alsa-api-pcm.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -384,6 +400,18 @@
       <item path="plugins/alsa/alsa-api-ramp.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -394,6 +422,18 @@
       <item path="plugins/alsa/alsa-api-sink.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -404,6 +444,18 @@
       <item path="plugins/alsa/alsa-api-source.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -414,6 +466,18 @@
       <item path="plugins/alsa/alsa-api-streams.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -424,6 +488,18 @@
       <item path="plugins/alsa/alsa-api-zones.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -433,6 +509,20 @@
       </item>
       <item path="plugins/alsa/alsa-capture.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
+          <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
+          </incDir>
           <preprocessorList>
             <Elem>CONTROL_CONFIG_PATH="/home/fulup/opt/4a-softmixer/etc:/home/fulup/Workspace/Audio-4a/4a-softmixer/build/package/etc"</Elem>
             <Elem>CONTROL_LUA_PATH="/home/fulup/opt/4a-softmixer/data:/home/fulup/Workspace/Audio-4a/4a-softmixer/conf.d/project/lua.d"</Elem>
@@ -445,6 +535,18 @@
       <item path="plugins/alsa/alsa-core-ctl.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -455,6 +557,18 @@
       <item path="plugins/alsa/alsa-core-pcm.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -465,6 +579,18 @@
       <item path="plugins/alsa/alsa-effect-ramp.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -475,6 +601,18 @@
       <item path="plugins/alsa/alsa-plug-dmix.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -485,6 +623,18 @@
       <item path="plugins/alsa/alsa-plug-rate.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -495,6 +645,18 @@
       <item path="plugins/alsa/alsa-plug-route.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -505,6 +667,18 @@
       <item path="plugins/alsa/alsa-plug-vol.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -515,6 +689,18 @@
       <item path="plugins/alsa/alsa-softmixer.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -525,6 +711,18 @@
       <item path="plugins/alsa/alsa-utils-bypath.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
@@ -535,6 +733,18 @@
       <item path="plugins/alsa/alsa-utils-dump.c" ex="false" tool="0" flavor2="2">
         <cTool flags="0">
           <incDir>
+            <pElem>app-controller-submodule/ctl-lib</pElem>
+            <pElem>build/app-controller-submodule/ctl-lib</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>mixer-binding</pElem>
+            <pElem>app-afb-helpers-submodule</pElem>
+            <pElem>build/plugins/alsa</pElem>
             <pElem>/usr/include/lua5.3</pElem>
           </incDir>
           <preprocessorList>
diff --git a/plugins/alsa/alsa-api-mixer.c b/plugins/alsa/alsa-api-mixer.c
index a05e1cf..c97f8c6 100644
--- a/plugins/alsa/alsa-api-mixer.c
+++ b/plugins/alsa/alsa-api-mixer.c
@@ -78,7 +78,7 @@ STATIC void MixerInfoAction(AFB_ReqT request, json_object *argsJ) {
     if (json_object_get_type(argsJ) == json_type_null) {
         streams = 1;
         ramps = 1;
-        zones = 1;
+        zones = 0;
         captures = 0;
         playbacks = 0;
     } else {
@@ -111,8 +111,9 @@ STATIC void MixerInfoAction(AFB_ReqT request, json_object *argsJ) {
                         , "volume", streams[idx]->volume
                         , "mute", streams[idx]->mute
                         );
-                wrap_json_pack(&valueJ, "{ss,so}"
+                wrap_json_pack(&valueJ, "{ss,ss, so}"
                         , "uid", streams[idx]->uid
+                        , "alsa", streams[idx]->source
                         , "numid", numidJ
                         );
                 json_object_array_add(streamsJ, valueJ);