From 86cfccd0951f7c82f409eb763bc991042055c134 Mon Sep 17 00:00:00 2001 From: Fulup Ar Foll Date: Thu, 2 Nov 2017 21:51:03 +0100 Subject: Change Init return code to ignore errors --- nbproject/configurations.xml | 300 +++++++++++++++++++++++-------------------- 1 file changed, 158 insertions(+), 142 deletions(-) diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 5bf556e..9790959 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -57,12 +57,6 @@ wrap_unicens.c wrap_volume.c - - IntelHdaHAL.c - - - JabraUsbHAL.c - ScarlettUsbHAL.c @@ -77,10 +71,16 @@ hal-volramp.c hal-volume.c + + IntelHdaHAL.c + HighLevelApiConf.c HighLevelBinding.c + + JabraUsbHAL.c + ConnectionInfo.cpp @@ -137,7 +137,7 @@ ${MAKE} -f Makefile install ${MAKE} -f Makefile clean build/CMakeFiles/feature_tests.bin - + @@ -511,8 +511,8 @@ - - + + @@ -523,8 +523,8 @@ - - + + @@ -562,22 +562,11 @@ - - - ../../../opt/include/afb - afb-utilities - /usr/include/json-c - build/afb-utilities - + - - - afb-utilities - /usr/include/json-c - build/afb-utilities - + @@ -655,7 +644,15 @@ /usr/include/lua5.3 + CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/usr/local/controller/config.d" + CONTROL_CONFIG_POST="control" + CONTROL_CONFIG_PRE="onload" + CONTROL_LUA_EVENT="luaevt" + CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/usr/local/controller/ctl-lua.d" CONTROL_MAXPATH_LEN=255 + CONTROL_ONLOAD_DEFAULT="onload-default" + CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/audio-bindings/ctlplug:/usr/lib/afb/ctlplug" + CTL_PLUGIN_MAGIC=2468013579 MAX_LINEAR_DB_SCALE=24 MAX_SND_CARD=16 TLV_BYTE_SIZE=256 @@ -668,16 +665,6 @@ ../../../opt/include/afb HAL-afb/HAL-interface - - CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/usr/local/controller/config.d" - CONTROL_CONFIG_POST="control" - CONTROL_CONFIG_PRE="onload" - CONTROL_LUA_EVENT="luaevt" - CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/usr/local/controller/ctl-lua.d" - CONTROL_ONLOAD_DEFAULT="onload-default" - CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/audio-bindings/ctlplug:/usr/lib/afb/ctlplug" - CTL_PLUGIN_MAGIC=2468013579 - @@ -692,39 +679,11 @@ CONTROL_CDEV_RX="/dev/inic-usb-crx" CONTROL_CDEV_TX="/dev/inic-usb-ctx" - CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/usr/local/controller/config.d" - CONTROL_CONFIG_POST="control" - CONTROL_CONFIG_PRE="onload" - CONTROL_LUA_EVENT="luaevt" - CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/usr/local/controller/ctl-lua.d" - CONTROL_ONLOAD_DEFAULT="onload-default" - CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/audio-bindings/ctlplug:/usr/lib/afb/ctlplug" - CTL_PLUGIN_MAGIC=2468013579 audio_plugin_sample_EXPORTS control_afb_EXPORTS - - - - ../../../opt/include/afb - HDA-intel - hal-utilities - build/HDA-intel - - - - - - - Jabra-Solemate - ../../../opt/include/afb - hal-utilities - build/Jabra-Solemate - - - @@ -734,16 +693,6 @@ HAL-afb/HAL-interface build/HAL-afb/Scarlett-Focusrite - - CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/usr/local/controller/config.d" - CONTROL_CONFIG_POST="control" - CONTROL_CONFIG_PRE="onload" - CONTROL_LUA_EVENT="luaevt" - CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/usr/local/controller/ctl-lua.d" - CONTROL_ONLOAD_DEFAULT="onload-default" - CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/audio-bindings/ctlplug:/usr/lib/afb/ctlplug" - CTL_PLUGIN_MAGIC=2468013579 - @@ -758,19 +707,31 @@ CONTROL_CDEV_RX="/dev/inic-usb-crx" CONTROL_CDEV_TX="/dev/inic-usb-ctx" - CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/usr/local/controller/config.d" - CONTROL_CONFIG_POST="control" - CONTROL_CONFIG_PRE="onload" - CONTROL_LUA_EVENT="luaevt" - CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/usr/local/controller/ctl-lua.d" - CONTROL_ONLOAD_DEFAULT="onload-default" - CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/audio-bindings/ctlplug:/usr/lib/afb/ctlplug" - CTL_PLUGIN_MAGIC=2468013579 audio_plugin_sample_EXPORTS control_afb_EXPORTS + + + + /usr/include/json-c + ../../../opt/include + /usr/include/p11-kit-1 + ../../../opt/include/alsa + hal-utilities-4a + build/HDA-intel + + + CONTROL_MAXPATH_LEN=255 + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + hal_intel_hda_EXPORTS + + + @@ -805,6 +766,26 @@ + + + + /usr/include/json-c + ../../../opt/include + /usr/include/p11-kit-1 + ../../../opt/include/alsa + hal-utilities-4a + build/Jabra-Solemate + + + CONTROL_MAXPATH_LEN=255 + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + hal_jabra_usb_EXPORTS + + + @@ -835,6 +816,101 @@ + + + + /usr/include/json-c + ../../../opt/include + /usr/include/p11-kit-1 + ../../../opt/include/alsa + afb-utilities + build/afb-utilities + + + CONTROL_MAXPATH_LEN=255 + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + + + + + + + /usr/include/json-c + ../../../opt/include + /usr/include/p11-kit-1 + ../../../opt/include/alsa + hal-utilities-4a + build/hal-utilities-4a + + + CONTROL_MAXPATH_LEN=255 + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + + + + + + + /usr/include/json-c + ../../../opt/include + /usr/include/p11-kit-1 + ../../../opt/include/alsa + hal-utilities-4a + build/hal-utilities-4a + + + CONTROL_MAXPATH_LEN=255 + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + + + + + + + /usr/include/json-c + ../../../opt/include + /usr/include/p11-kit-1 + ../../../opt/include/alsa + hal-utilities-4a + build/hal-utilities-4a + + + CONTROL_MAXPATH_LEN=255 + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + + + + + + + /usr/include/json-c + ../../../opt/include + /usr/include/p11-kit-1 + ../../../opt/include/alsa + hal-utilities-4a + build/hal-utilities-4a + + + CONTROL_MAXPATH_LEN=255 + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + + + @@ -901,7 +977,7 @@ ${MAKE} -f Makefile install ${MAKE} -f Makefile clean build/CMakeFiles/feature_tests.bin - + @@ -1211,10 +1287,6 @@ - - - - @@ -1223,10 +1295,6 @@ - - - - @@ -1420,28 +1488,6 @@ - - - - ../../../opt/include/afb - HAL-afb/HDA-intel - Audio-Common - HAL-afb/HAL-interface - build/HAL-afb/HDA-intel - - - - - - - HAL-afb/Jabra-Solemate - ../../../opt/include/afb - Audio-Common - HAL-afb/HAL-interface - build/HAL-afb/Jabra-Solemate - - - @@ -1567,7 +1613,7 @@ ${MAKE} -f Makefile populate ${MAKE} -f Makefile clean build/CMakeFiles/feature_tests.bin - + @@ -1877,10 +1923,6 @@ - - - - @@ -1889,10 +1931,6 @@ - - - - @@ -2086,28 +2124,6 @@ - - - - ../../../opt/include/afb - HAL-afb/HDA-intel - Audio-Common - HAL-afb/HAL-interface - build/HAL-afb/HDA-intel - - - - - - - HAL-afb/Jabra-Solemate - ../../../opt/include/afb - Audio-Common - HAL-afb/HAL-interface - build/HAL-afb/Jabra-Solemate - - - -- cgit 1.2.3-korg