From 39384e722d9fd7d162012b682aed41b35d16d003 Mon Sep 17 00:00:00 2001
From: fulup <fulup.arfoll@iot.bzh>
Date: Sun, 30 Jul 2017 21:36:54 +0200
Subject: Fix HTML5 demo with Volume Ramping

---
 HAL-afb/HAL-interface/hal-interface.c |   3 +-
 htdocs/alsa-hal.html                  |   6 ++
 nbproject/configurations.xml          | 111 ++++++++++++++--------------------
 3 files changed, 53 insertions(+), 67 deletions(-)

diff --git a/HAL-afb/HAL-interface/hal-interface.c b/HAL-afb/HAL-interface/hal-interface.c
index 76cdbd8..cba10d7 100644
--- a/HAL-afb/HAL-interface/hal-interface.c
+++ b/HAL-afb/HAL-interface/hal-interface.c
@@ -39,6 +39,7 @@ STATIC const char *halCtlsLabels[] = {
     [Vol_Ramp_Set_Delay] = "Volume_Ramp_Delay",        
     [Vol_Ramp_Set_Down]  = "Volume_Ramp_Down",        
     [Vol_Ramp_Set_Up]    = "Volume_Ramp_Up",        
+    [Vol_Ramp_Set_Slave] = "Volume_Ramp_Slave",        
        
    [EndHalCrlTag] = NULL
 };
@@ -70,7 +71,7 @@ STATIC int halCtlStringToIndex (const char* label) {
     alsaHalMapT *halCtls= halSndCard->ctls;
 
     for (int idx = 0;  halCtls[idx].tag != EndHalCrlTag; idx++) {
-       if (!strcmp (halCtls[idx].label, label)) return idx;
+       if (halCtls[idx].label && !strcmp (halCtls[idx].label, label)) return idx;
     }
     
     // not found
diff --git a/htdocs/alsa-hal.html b/htdocs/alsa-hal.html
index 7377bd4..f1d5aaf 100644
--- a/htdocs/alsa-hal.html
+++ b/htdocs/alsa-hal.html
@@ -37,6 +37,12 @@
     <li><button onclick="callbinder(sndcard,'ctl-set', [{tag:4, val:25},{tag:5, val:25}])">Set[{tag:4, val:25},{tag:5, val:25}]</button></li>
     <li><button onclick="callbinder(sndcard,'ctl-set', [{tag:4, val:[55,45]},{tag:5, val:[45,55]}])">Set[{tag:4, val:[55,45]},{tag:5, val:[45,55]}]]</button></li>
     <br>
+    
+    <li>
+        <label for="volramp">Volume Ramp</label>
+        <input id="volramp" type="number" min=0 max=100 step=10 maxlength=3 placeholder="Enter 0-100" onChange="callbinder(sndcard,'ctl-set', {label:'Volume_Ramp', val:this.value})">
+    </li>
+    <br>
     </ol>
     
     <div id="main" style="visibility:hidden">
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index a54b713..afcd6dc 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -82,10 +82,9 @@
       </toolsSet>
       <flagsDictionary>
         <element flagsID="0" commonFlags="-g -fPIC -fPIC -g"/>
-        <element flagsID="1" commonFlags="-g -ggdb -fPIC -fPIC -g -ggdb"/>
-        <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/>
-        <element flagsID="3" commonFlags="-mtune=generic -march=x86-64 -g -g -fPIC"/>
-        <element flagsID="4"
+        <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/>
+        <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -g -g -fPIC"/>
+        <element flagsID="3"
                  commonFlags="-mtune=generic -march=x86-64 -g -ggdb -g -ggdb -fPIC"/>
       </flagsDictionary>
       <codeAssistance>
@@ -105,39 +104,25 @@
         </preBuild>
       </makefileType>
       <item path="ALSA-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="1">
+        <cTool flags="3">
           <incDir>
-            <pElem>../../../opt/include</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
-            <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>Shared-Interface</pElem>
+            <pElem>../../../opt/include</pElem>
             <pElem>build/ALSA-afb</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem>
-            <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem>
-            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
-            <Elem>MAX_SND_CARD=16</Elem>
-            <Elem>TLV_BYTE_SIZE=256</Elem>
-            <Elem>alsa_lowlevel_EXPORTS</Elem>
-          </preprocessorList>
         </cTool>
       </item>
       <item path="ALSA-afb/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>ALSA-afb</pElem>
             <pElem>build/ALSA-afb</pElem>
           </incDir>
         </cTool>
       </item>
       <item path="ALSA-afb/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>ALSA-afb</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>Shared-Interface</pElem>
             <pElem>../../../opt/include</pElem>
@@ -146,10 +131,8 @@
         </cTool>
       </item>
       <item path="ALSA-afb/Alsa-SetGet.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>ALSA-afb</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>Shared-Interface</pElem>
             <pElem>../../../opt/include</pElem>
@@ -158,10 +141,8 @@
         </cTool>
       </item>
       <item path="ALSA-afb/Alsa-Ucm.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>ALSA-afb</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>Shared-Interface</pElem>
             <pElem>build/ALSA-afb</pElem>
@@ -176,7 +157,7 @@
             ex="false"
             tool="0"
             flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>Shared-Interface</pElem>
             <pElem>../../../opt/include</pElem>
@@ -188,7 +169,7 @@
             ex="false"
             tool="0"
             flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>Shared-Interface</pElem>
             <pElem>build/HAL-afb/HAL-interface</pElem>
@@ -196,47 +177,56 @@
         </cTool>
       </item>
       <item path="HAL-afb/HAL-interface/hal-volume.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>build/HAL-afb/HAL-interface</pElem>
           </incDir>
         </cTool>
       </item>
       <item path="HAL-afb/HAL-plugin/HalPlugCb.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
+            <pElem>HAL-afb/HAL-plugin</pElem>
             <pElem>build/HAL-afb/HAL-plugin</pElem>
           </incDir>
         </cTool>
       </item>
       <item path="HAL-afb/HAL-plugin/HalPlugCtl.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
+            <pElem>HAL-afb/HAL-plugin</pElem>
             <pElem>build/HAL-afb/HAL-plugin</pElem>
           </incDir>
         </cTool>
       </item>
       <item path="HAL-afb/HAL-plugin/HalPlugPcm.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>HAL-afb/HAL-plugin</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>build/HAL-afb/HAL-plugin</pElem>
           </incDir>
+          <preprocessorList>
+            <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem>
+            <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem>
+            <Elem>MAX_SND_CARD=16</Elem>
+          </preprocessorList>
         </cTool>
       </item>
       <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="1">
+        <cTool flags="3">
         </cTool>
       </item>
       <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c"
             ex="false"
             tool="0"
             flavor2="3">
-        <cTool flags="1">
+        <cTool flags="3">
         </cTool>
       </item>
       <item path="HAL-afb/Unicens-USB/UnicensHAL.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>Shared-Interface</pElem>
             <pElem>HAL-afb/HAL-interface</pElem>
@@ -246,7 +236,7 @@
         </cTool>
       </item>
       <item path="HAL-afb/Unicens-USB/UnicensVol.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>HAL-afb/HAL-interface</pElem>
             <pElem>build/HAL-afb/Unicens-USB</pElem>
@@ -254,7 +244,7 @@
         </cTool>
       </item>
       <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="3">
+        <cTool flags="2">
           <incDir>
             <pElem>Shared-Interface</pElem>
             <pElem>../../../opt/include</pElem>
@@ -263,7 +253,7 @@
         </cTool>
       </item>
       <item path="HighLevel-afb/HighLevelBinding.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="3">
+        <cTool flags="2">
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>Shared-Interface</pElem>
@@ -307,9 +297,17 @@
       <item path="MostVolume/libmostvolume.cpp" ex="false" tool="1" flavor2="4">
       </item>
       <item path="Shared-Interface/audio-interface.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
         </cTool>
       </item>
+      <folder path="0/ALSA-afb">
+        <cTool>
+          <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>ALSA-afb</pElem>
+          </incDir>
+        </cTool>
+      </folder>
       <folder path="0/Common">
         <cTool>
           <incDir>
@@ -345,47 +343,28 @@
           </incDir>
         </cTool>
       </folder>
-      <folder path="0/HAL-afb/HAL-plugin">
-        <cTool>
-          <incDir>
-            <pElem>HAL-afb/HAL-plugin</pElem>
-          </incDir>
-        </cTool>
-      </folder>
       <folder path="0/HAL-afb/HDA-intel">
         <cTool>
           <incDir>
-            <pElem>../../../opt/include</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
-            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>HAL-afb/HDA-intel</pElem>
             <pElem>/usr/include/json-c</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
             <pElem>Shared-Interface</pElem>
+            <pElem>HAL-afb/HAL-interface</pElem>
+            <pElem>../../../opt/include</pElem>
             <pElem>build/HAL-afb/HDA-intel</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
-            <Elem>TLV_BYTE_SIZE=256</Elem>
-            <Elem>hal_intel_hda_EXPORTS</Elem>
-          </preprocessorList>
         </cTool>
       </folder>
       <folder path="0/HAL-afb/Scarlett-Focusrite">
         <cTool>
           <incDir>
-            <pElem>../../../opt/include</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
-            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>HAL-afb/Scarlett-Focusrite</pElem>
             <pElem>/usr/include/json-c</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
             <pElem>Shared-Interface</pElem>
+            <pElem>HAL-afb/HAL-interface</pElem>
+            <pElem>../../../opt/include</pElem>
             <pElem>build/HAL-afb/Scarlett-Focusrite</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
-            <Elem>TLV_BYTE_SIZE=256</Elem>
-            <Elem>hal_scalett_usb_EXPORTS</Elem>
-          </preprocessorList>
         </cTool>
       </folder>
       <folder path="0/HAL-afb/Unicens-USB">
-- 
cgit 1.2.3-korg