diff options
author | fulup <fulup.arfoll@iot.bzh> | 2017-07-23 01:23:37 +0200 |
---|---|---|
committer | fulup <fulup.arfoll@iot.bzh> | 2017-07-23 01:23:37 +0200 |
commit | a7a6ae4be87ee9178905ab784d84a4c0a8303f9b (patch) | |
tree | e5aa96fba9c7ed59f60dd1641fc30c2eeb512e50 /nbproject | |
parent | 044828c43097362973c82088a7afee760eab06ec (diff) |
Added TLV->DBscale into HAL control
1st Working version of HAL ctl-get with TLV
Cleanup HTML5 test pages
WIP Only
Diffstat (limited to 'nbproject')
-rw-r--r-- | nbproject/configurations.xml | 109 |
1 files changed, 71 insertions, 38 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index adb9376..18d1e63 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -15,6 +15,8 @@ <df name="HAL-afb"> <df name="HAL-interface"> <in>hal-interface.c</in> + <in>hal-volmap.c</in> + <in>hal-volmap.h</in> </df> <df name="HAL-plugin"> <in>HalPlugCb.c</in> @@ -80,9 +82,10 @@ </toolsSet> <flagsDictionary> <element flagsID="0" commonFlags="-g -fPIC -fPIC -g"/> - <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" + <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" commonFlags="-mtune=generic -march=x86-64 -g -ggdb -g -ggdb -fPIC"/> </flagsDictionary> <codeAssistance> @@ -102,44 +105,51 @@ </preBuild> </makefileType> <item path="ALSA-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="4"> <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>Shared-Interface</pElem> + <pElem>../../../opt/include</pElem> <pElem>build/ALSA-afb</pElem> </incDir> </cTool> </item> <item path="ALSA-afb/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="4"> <incDir> <pElem>build/ALSA-afb</pElem> </incDir> </cTool> </item> <item path="ALSA-afb/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="4"> <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>Shared-Interface</pElem> + <pElem>../../../opt/include</pElem> <pElem>build/ALSA-afb</pElem> </incDir> </cTool> </item> <item path="ALSA-afb/Alsa-SetGet.c" ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="4"> <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>Shared-Interface</pElem> + <pElem>../../../opt/include</pElem> <pElem>build/ALSA-afb</pElem> </incDir> </cTool> </item> <item path="ALSA-afb/Alsa-Ucm.c" ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="4"> <incDir> <pElem>../../../opt/include/alsa</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>Shared-Interface</pElem> <pElem>../../../opt/include</pElem> <pElem>build/ALSA-afb</pElem> </incDir> @@ -153,72 +163,86 @@ ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="1"> + <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>../../../opt/include</pElem> + <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/p11-kit-1</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>HAL-afb/HAL-interface</pElem> + <pElem>Shared-Interface</pElem> + <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="3"> + <item path="HAL-afb/HAL-interface/hal-volmap.c" ex="false" tool="0" flavor2="3"> + <cTool flags="1"> <incDir> - <pElem>HAL-afb/HAL-plugin</pElem> + <pElem>../../../opt/include</pElem> <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/p11-kit-1</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>HAL-afb/HAL-interface</pElem> + <pElem>Shared-Interface</pElem> + <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"> + <incDir> <pElem>../../../opt/include</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="3"> + <cTool flags="4"> <incDir> - <pElem>HAL-afb/HAL-plugin</pElem> - <pElem>../../../opt/include/alsa</pElem> <pElem>../../../opt/include</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="1"> + <cTool flags="2"> <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="3"> + <cTool flags="4"> </cTool> </item> <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="4"> </cTool> </item> <item path="HAL-afb/Unicens-USB/UnicensHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="4"> <incDir> + <pElem>Shared-Interface</pElem> + <pElem>HAL-afb/HAL-interface</pElem> <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/Unicens-USB</pElem> </incDir> </cTool> </item> <item path="HAL-afb/Unicens-USB/UnicensVol.c" ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="4"> <incDir> + <pElem>HAL-afb/HAL-interface</pElem> <pElem>build/HAL-afb/Unicens-USB</pElem> </incDir> </cTool> </item> <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> <pElem>Shared-Interface</pElem> <pElem>../../../opt/include</pElem> @@ -227,7 +251,7 @@ </cTool> </item> <item path="HighLevel-afb/HighLevelBinding.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> <pElem>/usr/include/json-c</pElem> <pElem>Shared-Interface</pElem> @@ -271,7 +295,7 @@ <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="3"> + <cTool flags="4"> </cTool> </item> <folder path="0/ALSA-afb"> @@ -311,13 +335,16 @@ </folder> <folder path="0/HAL-afb/HAL-interface"> <cTool> + <preprocessorList> + <Elem>MAX_LINEAR_DB_SCALE=24</Elem> + </preprocessorList> + </cTool> + </folder> + <folder path="0/HAL-afb/HAL-plugin"> + <cTool> <incDir> - <pElem>HAL-afb/HAL-interface</pElem> + <pElem>HAL-afb/HAL-plugin</pElem> <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>Shared-Interface</pElem> - <pElem>../../../opt/include</pElem> - <pElem>build/HAL-afb/HAL-interface</pElem> </incDir> </cTool> </folder> @@ -350,8 +377,6 @@ <incDir> <pElem>HAL-afb/Unicens-USB</pElem> <pElem>../../../opt/include/alsa</pElem> - <pElem>Shared-Interface</pElem> - <pElem>HAL-afb/HAL-interface</pElem> </incDir> </cTool> </folder> @@ -457,6 +482,10 @@ <cTool flags="3"> </cTool> </item> + <item path="HAL-afb/HAL-interface/hal-volmap.c" ex="false" tool="0" flavor2="0"> + </item> + <item path="HAL-afb/HAL-interface/hal-volmap.h" ex="false" tool="3" flavor2="0"> + </item> <item path="HAL-afb/HAL-plugin/HalPlugCb.c" ex="false" tool="0" flavor2="3"> <cTool flags="3"> <incDir> @@ -709,6 +738,10 @@ <cTool flags="1"> </cTool> </item> + <item path="HAL-afb/HAL-interface/hal-volmap.c" ex="false" tool="0" flavor2="0"> + </item> + <item path="HAL-afb/HAL-interface/hal-volmap.h" ex="false" tool="3" flavor2="0"> + </item> <item path="HAL-afb/HAL-plugin/HalPlugCb.c" ex="false" tool="0" flavor2="3"> <cTool flags="1"> <incDir> |