aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--alsa-binding/Alsa-RegEvt.c2
-rw-r--r--nbproject/configurations.xml144
2 files changed, 77 insertions, 69 deletions
diff --git a/alsa-binding/Alsa-RegEvt.c b/alsa-binding/Alsa-RegEvt.c
index 224d513..c3c0b51 100644
--- a/alsa-binding/Alsa-RegEvt.c
+++ b/alsa-binding/Alsa-RegEvt.c
@@ -252,7 +252,7 @@ PUBLIC void alsaEvtSubcribe(afb_req request) {
// increase usage count and return success
sndHandles[idx].ucount++;
afb_req_success(request, NULL, NULL);
- // use OnErrorExit
+ return;
OnErrorExit:
if (ctlDev) snd_ctl_close(ctlDev);
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 75116a1..7ce8763 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -1416,12 +1416,11 @@
<rebuildPropChanged>false</rebuildPropChanged>
</toolsSet>
<flagsDictionary>
- <element flagsID="0" commonFlags="-g -fPIC -fPIC"/>
- <element flagsID="1" commonFlags="-g -fPIC -fPIC -g"/>
- <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
- <element flagsID="3" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/>
- <element flagsID="4" commonFlags="-mtune=generic -march=x86-64 -g -g -fPIC"/>
- <element flagsID="5"
+ <element flagsID="0" commonFlags="-g -fPIC -fPIC -g"/>
+ <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
+ <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>
@@ -1433,7 +1432,7 @@
<buildCommand>${MAKE} -f Makefile</buildCommand>
<cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
<executablePath>build/CMakeFiles/feature_tests.bin</executablePath>
- <cTool flags="3">
+ <cTool flags="2">
</cTool>
</makeTool>
<preBuild>
@@ -1443,7 +1442,7 @@
</preBuild>
</makefileType>
<item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>../../../opt/include/afb</pElem>
<pElem>Audio-Common</pElem>
@@ -1453,7 +1452,7 @@
</cTool>
</item>
<item path="Audio-Common/filescan-utils.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>../../../opt/include/afb</pElem>
<pElem>Audio-Common</pElem>
@@ -1463,7 +1462,7 @@
</cTool>
</item>
<item path="Audio-Common/wrap-json.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>Audio-Common</pElem>
<pElem>/usr/include/json-c</pElem>
@@ -1472,18 +1471,18 @@
</cTool>
</item>
<item path="Common/AudioCommonLib.c" ex="false" tool="0" flavor2="2">
- <cTool flags="1">
+ <cTool flags="0">
</cTool>
</item>
<item path="Controller-afb/ctl-binding.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>build/Controller-afb</pElem>
</incDir>
</cTool>
</item>
<item path="Controller-afb/ctl-dispatch.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>/usr/include/json-c</pElem>
<pElem>/usr/include/lua5.3</pElem>
@@ -1494,7 +1493,7 @@
</cTool>
</item>
<item path="Controller-afb/ctl-lua.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>/usr/include/json-c</pElem>
<pElem>/usr/include/lua5.3</pElem>
@@ -1505,7 +1504,7 @@
</cTool>
</item>
<item path="Controller-afb/ctl-misc.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>/usr/include/json-c</pElem>
<pElem>build/Controller-afb</pElem>
@@ -1513,7 +1512,7 @@
</cTool>
</item>
<item path="Controller-afb/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>/usr/include/json-c</pElem>
<pElem>/usr/include/lua5.3</pElem>
@@ -1522,7 +1521,7 @@
</cTool>
</item>
<item path="Controller-afb/ctl-timer.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>../../../opt/include</pElem>
<pElem>build/Controller-afb</pElem>
@@ -1533,7 +1532,7 @@
ex="false"
tool="0"
flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>Audio-Common</pElem>
<pElem>build/HAL-afb/HAL-interface</pElem>
@@ -1544,7 +1543,7 @@
ex="false"
tool="0"
flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>Audio-Common</pElem>
<pElem>build/HAL-afb/HAL-interface</pElem>
@@ -1552,21 +1551,21 @@
</cTool>
</item>
<item path="HAL-afb/HAL-interface/hal-volume.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>build/HAL-afb/HAL-interface</pElem>
</incDir>
</cTool>
</item>
<item path="HAL-afb/HAL-plugin/HalPlugPcm.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
</cTool>
</item>
<item path="HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c"
ex="false"
tool="0"
flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>../../../opt/include/afb</pElem>
<pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
@@ -1580,35 +1579,35 @@
ex="false"
tool="1"
flavor2="4">
- <ccTool flags="2">
+ <ccTool flags="1">
</ccTool>
</item>
<item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp"
ex="false"
tool="1"
flavor2="4">
- <ccTool flags="2">
+ <ccTool flags="1">
</ccTool>
</item>
<item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp"
ex="false"
tool="1"
flavor2="4">
- <ccTool flags="2">
+ <ccTool flags="1">
</ccTool>
</item>
<item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp"
ex="false"
tool="1"
flavor2="4">
- <ccTool flags="2">
+ <ccTool flags="1">
</ccTool>
</item>
<item path="HAL-afb/HAL_MOST_UNICENS/wrap-json.c"
ex="false"
tool="0"
flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
<pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
@@ -1619,7 +1618,7 @@
ex="false"
tool="0"
flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>../../../opt/include/afb</pElem>
<pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
@@ -1631,7 +1630,7 @@
ex="false"
tool="0"
flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>../../../opt/include/afb</pElem>
<pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
@@ -1641,25 +1640,25 @@
</cTool>
</item>
<item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
</cTool>
</item>
<item path="HAL-afb/Jabra-Solemate/JabraUsbHAL.c"
ex="false"
tool="0"
flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
</cTool>
</item>
<item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c"
ex="false"
tool="0"
flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
</cTool>
</item>
<item path="HAL-afb/Unicens-USB/UnicensHAL.c" ex="false" tool="0" flavor2="3">
- <cTool flags="5">
+ <cTool flags="4">
<incDir>
<pElem>Shared-Interface</pElem>
<pElem>HAL-afb/HAL-interface</pElem>
@@ -1668,7 +1667,7 @@
</cTool>
</item>
<item path="HAL-afb/Unicens-USB/UnicensVol.c" ex="false" tool="0" flavor2="3">
- <cTool flags="5">
+ <cTool flags="4">
<incDir>
<pElem>HAL-afb/HAL-interface</pElem>
<pElem>build/HAL-afb/Unicens-USB</pElem>
@@ -1676,11 +1675,11 @@
</cTool>
</item>
<item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3">
- <cTool flags="4">
+ <cTool flags="3">
</cTool>
</item>
<item path="HighLevel-afb/HighLevelBinding.c" ex="false" tool="0" flavor2="3">
- <cTool flags="4">
+ <cTool flags="3">
</cTool>
</item>
<item path="MostVolume/DeviceContainer.cpp" ex="false" tool="1" flavor2="4">
@@ -1718,7 +1717,7 @@
<item path="MostVolume/libmostvolume.cpp" ex="false" tool="1" flavor2="4">
</item>
<item path="afb-utilities/filescan-utils.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>../../../opt/include/afb</pElem>
<pElem>afb-utilities</pElem>
@@ -1728,7 +1727,7 @@
</cTool>
</item>
<item path="afb-utilities/wrap-json.c" ex="false" tool="0" flavor2="3">
- <cTool flags="3">
+ <cTool flags="2">
<incDir>
<pElem>afb-utilities</pElem>
<pElem>/usr/include/json-c</pElem>
@@ -1737,27 +1736,55 @@
</cTool>
</item>
<item path="alsa-binding/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3">
- <cTool flags="0">
+ <cTool flags="2">
+ <incDir>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>build/alsa-binding</pElem>
+ </incDir>
</cTool>
</item>
<item path="alsa-binding/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3">
- <cTool flags="0">
+ <cTool flags="2">
+ <incDir>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>build/alsa-binding</pElem>
+ </incDir>
</cTool>
</item>
<item path="alsa-binding/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3">
- <cTool flags="0">
+ <cTool flags="2">
+ <incDir>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>build/alsa-binding</pElem>
+ </incDir>
</cTool>
</item>
<item path="alsa-binding/Alsa-SetGet.c" ex="false" tool="0" flavor2="3">
- <cTool flags="0">
+ <cTool flags="2">
+ <incDir>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>build/alsa-binding</pElem>
+ </incDir>
</cTool>
</item>
<item path="alsa-binding/Alsa-Ucm.c" ex="false" tool="0" flavor2="3">
- <cTool flags="0">
+ <cTool flags="2">
+ <incDir>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>build/alsa-binding</pElem>
+ </incDir>
</cTool>
</item>
<item path="alsa-hook/PolicyAlsaHook.c" ex="false" tool="0" flavor2="3">
- <cTool flags="0">
+ <cTool flags="2">
</cTool>
</item>
<folder path="0/Common">
@@ -1997,40 +2024,21 @@
<folder path="0/alsa-binding">
<cTool>
<incDir>
- <pElem>/usr/include/json-c</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>/usr/include/p11-kit-1</pElem>
- <pElem>../../../opt/include/alsa</pElem>
- <pElem>build/alsa-binding</pElem>
+ <pElem>../../../opt/include/afb</pElem>
+ <pElem>alsa-binding</pElem>
</incDir>
- <preprocessorList>
- <Elem>CONTROL_MAXPATH_LEN=255</Elem>
- <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
- <Elem>MAX_SND_CARD=16</Elem>
- <Elem>NATIVE_LINUX</Elem>
- <Elem>TLV_BYTE_SIZE=256</Elem>
- <Elem>alsa_4a_EXPORTS</Elem>
- </preprocessorList>
</cTool>
</folder>
<folder path="0/alsa-hook">
<cTool>
<incDir>
+ <pElem>alsa-hook</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
<pElem>/usr/include/json-c</pElem>
+ <pElem>../../../opt/include/afb</pElem>
<pElem>../../../opt/include</pElem>
- <pElem>/usr/include/p11-kit-1</pElem>
- <pElem>../../../opt/include/alsa</pElem>
<pElem>build/alsa-hook</pElem>
</incDir>
- <preprocessorList>
- <Elem>CONTROL_MAXPATH_LEN=255</Elem>
- <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
- <Elem>MAX_SND_CARD=16</Elem>
- <Elem>NATIVE_LINUX</Elem>
- <Elem>PIC</Elem>
- <Elem>TLV_BYTE_SIZE=256</Elem>
- <Elem>policy_alsa_hook_EXPORTS</Elem>
- </preprocessorList>
</cTool>
</folder>
</conf>