diff options
author | Fulup Ar Foll <fulup@iot.bzh> | 2017-11-01 19:22:36 +0100 |
---|---|---|
committer | Fulup Ar Foll <fulup@iot.bzh> | 2017-11-01 19:22:36 +0100 |
commit | fb2566c629de780c8ddc88058c864ea08436d1de (patch) | |
tree | 7cba08126f8fd0a11102bbd506eaf70a67022b1f /nbproject | |
parent | bc799a90ab7cc23dbe7286eb38d64af545de417c (diff) |
Move to support Audio-4a High Level API
Diffstat (limited to 'nbproject')
-rw-r--r-- | nbproject/configurations.xml | 149 |
1 files changed, 82 insertions, 67 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 8977e53..07e636e 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -13,6 +13,10 @@ <in>Alsa-SetGet.c</in> <in>Alsa-Ucm.c</in> </df> + <df name="alsa-hook"> + <in>PolicyAlsaHook.c</in> + <in>PolicyHookTcp.c</in> + </df> <df name="Audio-Common"> <in>audio-common.c</in> <in>filescan-utils.c</in> @@ -70,9 +74,6 @@ <in>HighLevelApiConf.c</in> <in>HighLevelBinding.c</in> </df> - <df name="hook-plugin"> - <in>PolicyHookCb.c</in> - </df> <df name="MostVolume"> <df name="external"> <in>ConnectionInfo.cpp</in> @@ -126,10 +127,10 @@ <makefileType> <makeTool> <buildCommandWorkingDir>build</buildCommandWorkingDir> - <buildCommand>${MAKE} -f Makefile install</buildCommand> + <buildCommand>${MAKE} -f Makefile</buildCommand> <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> <executablePath>build/CMakeFiles/feature_tests.bin</executablePath> - <cTool flags="0"> + <cTool flags="2"> </cTool> </makeTool> <preBuild> @@ -141,9 +142,7 @@ <item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3"> <cTool flags="2"> <incDir> - <pElem>../../../opt/include/afb</pElem> <pElem>Audio-Common</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/Audio-Common</pElem> </incDir> </cTool> @@ -151,10 +150,7 @@ <item path="Audio-Common/filescan-utils.c" ex="false" tool="0" flavor2="3"> <cTool flags="0"> <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>Audio-Common</pElem> <pElem>build/Audio-Common</pElem> @@ -182,7 +178,6 @@ <cTool flags="2"> <incDir> <pElem>Audio-Common</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/Audio-Common</pElem> </incDir> </cTool> @@ -194,10 +189,7 @@ <item path="Controller-afb/ctl-binding.c" ex="false" tool="0" flavor2="3"> <cTool flags="0"> <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>Audio-Common</pElem> <pElem>build/Controller-afb</pElem> @@ -225,10 +217,7 @@ <item path="Controller-afb/ctl-dispatch.c" ex="false" tool="0" flavor2="3"> <cTool flags="0"> <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>Audio-Common</pElem> <pElem>build/Controller-afb</pElem> @@ -256,10 +245,7 @@ <item path="Controller-afb/ctl-lua.c" ex="false" tool="0" flavor2="3"> <cTool flags="0"> <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>Audio-Common</pElem> <pElem>build/Controller-afb</pElem> @@ -287,9 +273,7 @@ <item path="Controller-afb/ctl-misc.c" ex="false" tool="0" flavor2="3"> <cTool flags="2"> <incDir> - <pElem>../../../opt/include/afb</pElem> <pElem>Controller-afb</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/Controller-afb</pElem> </incDir> </cTool> @@ -297,10 +281,7 @@ <item path="Controller-afb/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3"> <cTool flags="0"> <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>Audio-Common</pElem> <pElem>build/Controller-afb</pElem> @@ -328,10 +309,7 @@ <item path="Controller-afb/ctl-timer.c" ex="false" tool="0" flavor2="3"> <cTool flags="0"> <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>Audio-Common</pElem> <pElem>build/Controller-afb</pElem> @@ -533,13 +511,60 @@ </incDir> </cTool> </item> - <folder path="0/Common"> + <item path="alsa-hook/PolicyAlsaHook.c" ex="false" tool="0" flavor2="3"> + <cTool flags="0"> + <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-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> + </item> + <item path="alsa-hook/PolicyHookTcp.c" ex="false" tool="0" flavor2="3"> + <cTool flags="2"> + <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>build/alsa-hook</pElem> + </incDir> + </cTool> + </item> + <folder path="0/Audio-Common"> <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>build/alsa-hook</pElem> + </incDir> + </cTool> + </folder> + <folder path="0/Common"> + <cTool> + <incDir> + <pElem>alsa-hook</pElem> <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include/afb</pElem> + <pElem>../../../opt/include</pElem> + <pElem>build/alsa-hook</pElem> + <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/lua5.3</pElem> <pElem>Audio-Common</pElem> <pElem>build/Controller-afb</pElem> @@ -567,13 +592,28 @@ </preprocessorList> </cTool> </folder> - <folder path="0/HAL-afb"> + <folder path="0/Controller-afb"> <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>build/alsa-hook</pElem> + </incDir> + </cTool> + </folder> + <folder path="0/HAL-afb"> + <cTool> + <incDir> + <pElem>alsa-hook</pElem> <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include/afb</pElem> + <pElem>../../../opt/include</pElem> + <pElem>build/alsa-hook</pElem> + <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/lua5.3</pElem> </incDir> <preprocessorList> @@ -595,7 +635,6 @@ <folder path="0/HAL-afb/HAL-interface"> <cTool> <incDir> - <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL-interface</pElem> </incDir> </cTool> @@ -606,7 +645,6 @@ <pElem>Audio-Common</pElem> <pElem>build/Controller-afb</pElem> <pElem>build/HAL-afb/HAL-plugin</pElem> - <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL-plugin</pElem> </incDir> <preprocessorList> @@ -620,7 +658,6 @@ <folder path="0/HAL-afb/HDA-intel"> <cTool> <incDir> - <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HDA-intel</pElem> <pElem>Audio-Common</pElem> <pElem>HAL-afb/HAL-interface</pElem> @@ -632,7 +669,6 @@ <cTool> <incDir> <pElem>HAL-afb/Jabra-Solemate</pElem> - <pElem>../../../opt/include/afb</pElem> <pElem>Audio-Common</pElem> <pElem>HAL-afb/HAL-interface</pElem> <pElem>build/HAL-afb/Jabra-Solemate</pElem> @@ -642,7 +678,6 @@ <folder path="0/HAL-afb/Scarlett-Focusrite"> <cTool> <incDir> - <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/Scarlett-Focusrite</pElem> <pElem>Audio-Common</pElem> <pElem>HAL-afb/HAL-interface</pElem> @@ -656,7 +691,6 @@ <pElem>Audio-Common</pElem> <pElem>build/Controller-afb</pElem> <pElem>build/HAL-afb/HAL-plugin</pElem> - <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/Unicens-USB</pElem> </incDir> <preprocessorList> @@ -670,15 +704,17 @@ <folder path="0/HighLevel-afb"> <cTool> <incDir> - <pElem>../../../opt/include</pElem> + <pElem>alsa-hook</pElem> <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include/afb</pElem> + <pElem>../../../opt/include</pElem> + <pElem>build/alsa-hook</pElem> + <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/lua5.3</pElem> <pElem>Audio-Common</pElem> <pElem>build/Controller-afb</pElem> <pElem>build/HAL-afb/HAL-plugin</pElem> - <pElem>../../../opt/include/afb</pElem> <pElem>HighLevel-afb</pElem> <pElem>Shared-Interface</pElem> <pElem>build/HighLevel-afb</pElem> @@ -704,10 +740,13 @@ <folder path="0/MostVolume"> <cTool> <incDir> - <pElem>../../../opt/include</pElem> + <pElem>alsa-hook</pElem> <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/json-c</pElem> + <pElem>../../../opt/include/afb</pElem> + <pElem>../../../opt/include</pElem> + <pElem>build/alsa-hook</pElem> + <pElem>/usr/include/p11-kit-1</pElem> <pElem>/usr/include/lua5.3</pElem> <pElem>Audio-Common</pElem> <pElem>build/Controller-afb</pElem> @@ -739,30 +778,6 @@ </incDir> </cTool> </folder> - <folder path="0/hook-plugin"> - <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/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> - </item> </conf> <conf name="Local_Alias" type="0"> <toolsSet> |