summaryrefslogtreecommitdiffstats
path: root/nbproject
diff options
context:
space:
mode:
authorfulup <fulup.arfoll@iot.bzh>2017-10-27 15:24:39 +0200
committerfulup <fulup.arfoll@iot.bzh>2017-10-27 15:24:39 +0200
commitec938c9ea7f17c5ccfbd9992eed8fe206cd76253 (patch)
tree407bb38be73c303391bffd3ea6fd4714f562cae8 /nbproject
parent036268ddd8c62114faf9afd4da3c35ffa2b6ecba (diff)
Moved from TCP WS to Unix WebSocket
Diffstat (limited to 'nbproject')
-rw-r--r--nbproject/configurations.xml192
1 files changed, 51 insertions, 141 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index cc487a3..61e4fab 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -13,11 +13,6 @@
<in>Alsa-SetGet.c</in>
<in>Alsa-Ucm.c</in>
</df>
- <df name="Alsa-Plugin">
- <df name="Alsa-Policy-Hook">
- <in>PolicyHookCb.c</in>
- </df>
- </df>
<df name="Audio-Common">
<in>audio-common.c</in>
<in>filescan-utils.c</in>
@@ -143,10 +138,6 @@
<preBuildFirst>true</preBuildFirst>
</preBuild>
</makefileType>
- <item path="Alsa-Policy-Hook/PolicyHookCb.c" ex="false" tool="0" flavor2="3">
- <cTool flags="0">
- </cTool>
- </item>
<item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3">
<cTool flags="2">
<incDir>
@@ -476,64 +467,72 @@
<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="0">
+ <cTool flags="2">
+ <incDir>
+ <pElem>../../../opt/include/afb</pElem>
+ <pElem>afb-utilities</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>build/afb-utilities</pElem>
+ </incDir>
</cTool>
</item>
<item path="afb-utilities/wrap-json.c" ex="false" tool="0" flavor2="3">
- <cTool flags="0">
+ <cTool flags="2">
+ <incDir>
+ <pElem>afb-utilities</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>build/afb-utilities</pElem>
+ </incDir>
</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>
- </item>
- <folder path="0/Alsa-Plugin">
- <cTool>
+ <cTool flags="2">
<incDir>
- <pElem>../../../opt/include</pElem>
<pElem>../../../opt/include/alsa</pElem>
- <pElem>/usr/include/p11-kit-1</pElem>
<pElem>/usr/include/json-c</pElem>
- <pElem>/usr/include/lua5.3</pElem>
- <pElem>build/Alsa-Plugin/Alsa-Policy-Hook</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>build/alsa-binding</pElem>
</incDir>
- <preprocessorList>
- <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/usr/local/controller/config.d"</Elem>
- <Elem>CONTROL_CONFIG_POST="control"</Elem>
- <Elem>CONTROL_CONFIG_PRE="onload"</Elem>
- <Elem>CONTROL_DOSCRIPT_PRE="doscript"</Elem>
- <Elem>CONTROL_LUA_EVENT="luaevt"</Elem>
- <Elem>CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/usr/local/controller/ctl-lua.d"</Elem>
- <Elem>CONTROL_MAXPATH_LEN=255</Elem>
- <Elem>CONTROL_ONLOAD_DEFAULT="onload-default"</Elem>
- <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/audio-bindings/ctlplug:/usr/lib/afb/ctlplug"</Elem>
- <Elem>CONTROL_SUPPORT_LUA</Elem>
- <Elem>CTL_PLUGIN_MAGIC=2468013579</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_hook_cb_EXPORTS</Elem>
- </preprocessorList>
</cTool>
- </folder>
+ </item>
<folder path="0/Common">
<cTool>
<incDir>
@@ -732,67 +731,28 @@
</preprocessorList>
</cTool>
</folder>
- <folder path="0/afb-utilities">
- <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>afb-utilities</pElem>
- <pElem>build/afb-utilities</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>
- </preprocessorList>
- </cTool>
- </folder>
<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>afb-utilities</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/hook-plugin">
<cTool>
<incDir>
+ <pElem>hook-plugin</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/hook-plugin</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_hook_cb_EXPORTS</Elem>
- </preprocessorList>
</cTool>
</folder>
<item path="hook-plugin/PolicyHookCb.c" ex="false" tool="0" flavor2="3">
- <cTool flags="0">
+ <cTool flags="2">
</cTool>
</item>
</conf>
@@ -819,7 +779,7 @@
<buildCommand>${MAKE} -f Makefile install</buildCommand>
<cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
<executablePath>build/CMakeFiles/feature_tests.bin</executablePath>
- <cTool flags="-g -fPIC -fPIC">
+ <cTool flags="2">
</cTool>
</makeTool>
<preBuild>
@@ -827,10 +787,6 @@
<preBuildCommand>cmake ..</preBuildCommand>
</preBuild>
</makefileType>
- <item path="Alsa-Policy-Hook/PolicyHookCb.c" ex="false" tool="0" flavor2="3">
- <cTool flags="2">
- </cTool>
- </item>
<item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3">
<cTool flags="2">
<incDir>
@@ -1198,27 +1154,6 @@
</incDir>
</cTool>
</item>
- <folder path="0/Alsa-Plugin">
- <cTool>
- <incDir>
- <pElem>Alsa-Plugin/Alsa-Policy-Hook</pElem>
- <pElem>../../../opt/include/alsa</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>../../../opt/include/afb</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>build/Alsa-Plugin/Alsa-Policy-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_hook_cb_EXPORTS</Elem>
- </preprocessorList>
- </cTool>
- </folder>
<folder path="0/Common">
<cTool>
<incDir>
@@ -1485,7 +1420,7 @@
<buildCommand>${MAKE} -f Makefile populate</buildCommand>
<cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
<executablePath>build/CMakeFiles/feature_tests.bin</executablePath>
- <cTool flags="-g -fPIC -fPIC">
+ <cTool flags="2">
</cTool>
</makeTool>
<preBuild>
@@ -1493,10 +1428,6 @@
<preBuildCommand>cmake ..</preBuildCommand>
</preBuild>
</makefileType>
- <item path="Alsa-Policy-Hook/PolicyHookCb.c" ex="false" tool="0" flavor2="3">
- <cTool flags="2">
- </cTool>
- </item>
<item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3">
<cTool flags="2">
<incDir>
@@ -1864,27 +1795,6 @@
</incDir>
</cTool>
</item>
- <folder path="0/Alsa-Plugin">
- <cTool>
- <incDir>
- <pElem>Alsa-Plugin/Alsa-Policy-Hook</pElem>
- <pElem>../../../opt/include/alsa</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>../../../opt/include/afb</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>build/Alsa-Plugin/Alsa-Policy-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_hook_cb_EXPORTS</Elem>
- </preprocessorList>
- </cTool>
- </folder>
<folder path="0/Common">
<cTool>
<incDir>