diff options
| -rw-r--r-- | Controller-afb/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | conf.d/autobuild/agl/autobuild | 5 | ||||
| -rwxr-xr-x | conf.d/autobuild/linux/autobuild | 5 | ||||
| -rw-r--r-- | conf.d/project/lua.d/debug-helloworld.lua (renamed from conf.d/project/lua.d/doscript-helloworld.lua) | 0 | ||||
| -rw-r--r-- | nbproject/configurations.xml | 213 |
5 files changed, 116 insertions, 109 deletions
diff --git a/Controller-afb/CMakeLists.txt b/Controller-afb/CMakeLists.txt index c7602f8..9d27947 100644 --- a/Controller-afb/CMakeLists.txt +++ b/Controller-afb/CMakeLists.txt @@ -18,7 +18,7 @@ ADD_COMPILE_OPTIONS(-DCONTROL_ONLOAD_PROFILE="onload-default-profile") -ADD_COMPILE_OPTIONS(-DCONTROL_DOSCRIPT_PRE="doscript") +ADD_COMPILE_OPTIONS(-DCONTROL_DOSCRIPT_PRE="debug") ADD_COMPILE_OPTIONS(-DCONTROL_CONFIG_PRE="onload") ADD_COMPILE_OPTIONS(-DCONTROL_CONFIG_POST="control") ADD_COMPILE_OPTIONS(-DCONTROL_CONFIG_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/config.d:${CMAKE_INSTALL_PREFIX}/controller/config.d") diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild index 759f6be..4811441 100755 --- a/conf.d/autobuild/agl/autobuild +++ b/conf.d/autobuild/agl/autobuild @@ -18,7 +18,7 @@ THISFILE := $(lastword $(MAKEFILE_LIST)) BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build) DEST := ${BUILD_DIR}/target -.PHONY: all clean distclean configure build package help +.PHONY: all clean distclean configure build package help update all: help @@ -35,6 +35,9 @@ help: @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt" @echo "Don't use your build dir as DEST as wgt file is generated at this location" +update: configure + @cmake --build ${BUILD_DIR} --target autobuild + clean: @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild index 759f6be..4811441 100755 --- a/conf.d/autobuild/linux/autobuild +++ b/conf.d/autobuild/linux/autobuild @@ -18,7 +18,7 @@ THISFILE := $(lastword $(MAKEFILE_LIST)) BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build) DEST := ${BUILD_DIR}/target -.PHONY: all clean distclean configure build package help +.PHONY: all clean distclean configure build package help update all: help @@ -35,6 +35,9 @@ help: @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt" @echo "Don't use your build dir as DEST as wgt file is generated at this location" +update: configure + @cmake --build ${BUILD_DIR} --target autobuild + clean: @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean diff --git a/conf.d/project/lua.d/doscript-helloworld.lua b/conf.d/project/lua.d/debug-helloworld.lua index 7a41971..7a41971 100644 --- a/conf.d/project/lua.d/doscript-helloworld.lua +++ b/conf.d/project/lua.d/debug-helloworld.lua diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 59c2cdd..3501376 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -132,11 +132,12 @@ <rebuildPropChanged>false</rebuildPropChanged> </toolsSet> <flagsDictionary> - <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" + <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" commonFlags="-mtune=generic -march=x86-64 -g -ggdb -g -ggdb -fPIC"/> </flagsDictionary> <codeAssistance> @@ -148,7 +149,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="0"> </cTool> </makeTool> <preBuild> @@ -161,103 +162,59 @@ ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> </cTool> </item> <item path="Alsa-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> - <incDir> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> - <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> - </incDir> + <cTool flags="0"> </cTool> </item> <item path="Alsa-afb/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> - <incDir> - <pElem>build/Alsa-afb</pElem> - </incDir> + <cTool flags="0"> </cTool> </item> <item path="Alsa-afb/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> - <incDir> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> - <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> - </incDir> + <cTool flags="0"> </cTool> </item> <item path="Alsa-afb/Alsa-SetGet.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> - <incDir> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> - <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> - </incDir> + <cTool flags="0"> </cTool> </item> <item path="Alsa-afb/Alsa-Ucm.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> - <incDir> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>Audio-Common</pElem> - <pElem>../../../opt/include</pElem> - <pElem>build/Alsa-afb</pElem> - </incDir> + <cTool flags="0"> </cTool> </item> <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 flags="0"> </cTool> </item> <item path="Audio-Common/filescan-utils.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 flags="0"> </cTool> </item> <item path="Audio-Common/wrap-json.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> - <incDir> - <pElem>Audio-Common</pElem> - <pElem>/usr/include/json-c</pElem> - <pElem>build/Audio-Common</pElem> - </incDir> + <cTool flags="0"> </cTool> </item> <item path="Common/AudioCommonLib.c" ex="false" tool="0" flavor2="2"> - <cTool flags="0"> + <cTool flags="1"> </cTool> </item> <item path="Controller-afb/ctl-binding.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>Controller-afb</pElem> <pElem>build/Controller-afb</pElem> </incDir> </cTool> </item> <item path="Controller-afb/ctl-dispatch.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>Controller-afb</pElem> <pElem>/usr/include/json-c</pElem> <pElem>/usr/include/lua5.3</pElem> <pElem>Audio-Common</pElem> @@ -267,8 +224,10 @@ </cTool> </item> <item path="Controller-afb/ctl-lua.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>Controller-afb</pElem> <pElem>/usr/include/json-c</pElem> <pElem>/usr/include/lua5.3</pElem> <pElem>Audio-Common</pElem> @@ -278,25 +237,50 @@ </cTool> </item> <item path="Controller-afb/ctl-misc.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>Controller-afb</pElem> <pElem>/usr/include/json-c</pElem> <pElem>build/Controller-afb</pElem> </incDir> </cTool> </item> <item path="Controller-afb/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <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> </incDir> + <preprocessorList> + <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings/conf.d/project/config.d:/home/fulup/opt/controller/config.d"</Elem> + <Elem>CONTROL_CONFIG_POST="control"</Elem> + <Elem>CONTROL_CONFIG_PRE="onload"</Elem> + <Elem>CONTROL_DOSCRIPT_PRE="debug"</Elem> + <Elem>CONTROL_LUA_EVENT="luaevt"</Elem> + <Elem>CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d"</Elem> + <Elem>CONTROL_MAXPATH_LEN=255</Elem> + <Elem>CONTROL_ONLOAD_PROFILE="onload-default-profile"</Elem> + <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings/build:/home/fulup/opt/controller-plugins:/usr/lib/afb/controller-plugins/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>TLV_BYTE_SIZE=256</Elem> + <Elem>audio_plugin_sample_EXPORTS</Elem> + </preprocessorList> </cTool> </item> <item path="Controller-afb/ctl-timer.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>Controller-afb</pElem> <pElem>../../../opt/include</pElem> <pElem>build/Controller-afb</pElem> </incDir> @@ -306,10 +290,9 @@ ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> <pElem>Audio-Common</pElem> - <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HAL-interface</pElem> </incDir> </cTool> @@ -318,7 +301,7 @@ ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> <pElem>Audio-Common</pElem> <pElem>build/HAL-afb/HAL-interface</pElem> @@ -326,29 +309,26 @@ </cTool> </item> <item path="HAL-afb/HAL-interface/hal-volume.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <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="2"> + <cTool flags="3"> </cTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> - <pElem>../../../opt/include/alsa</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>Audio-Common</pElem> <pElem>HAL-afb/HAL-interface</pElem> - <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> </incDir> </cTool> @@ -357,7 +337,7 @@ ex="false" tool="1" flavor2="4"> - <ccTool flags="1"> + <ccTool flags="2"> <incDir> <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> @@ -368,7 +348,7 @@ ex="false" tool="1" flavor2="4"> - <ccTool flags="1"> + <ccTool flags="2"> <incDir> <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> @@ -379,7 +359,7 @@ ex="false" tool="1" flavor2="4"> - <ccTool flags="1"> + <ccTool flags="2"> <incDir> <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> @@ -390,7 +370,7 @@ ex="false" tool="1" flavor2="4"> - <ccTool flags="1"> + <ccTool flags="2"> <incDir> <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> @@ -401,10 +381,9 @@ ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> </incDir> </cTool> @@ -413,11 +392,10 @@ ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> - <pElem>/usr/include/json-c</pElem> <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> </incDir> </cTool> @@ -426,7 +404,7 @@ ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> @@ -436,25 +414,25 @@ </cTool> </item> <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> </cTool> </item> <item path="HAL-afb/Jabra-Solemate/JabraUsbHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> </cTool> </item> <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="2"> + <cTool flags="3"> </cTool> </item> <item path="HAL-afb/Unicens-USB/UnicensHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="4"> + <cTool flags="5"> <incDir> <pElem>Shared-Interface</pElem> <pElem>HAL-afb/HAL-interface</pElem> @@ -463,7 +441,7 @@ </cTool> </item> <item path="HAL-afb/Unicens-USB/UnicensVol.c" ex="false" tool="0" flavor2="3"> - <cTool flags="4"> + <cTool flags="5"> <incDir> <pElem>HAL-afb/HAL-interface</pElem> <pElem>build/HAL-afb/Unicens-USB</pElem> @@ -471,11 +449,11 @@ </cTool> </item> <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="4"> </cTool> </item> <item path="HighLevel-afb/HighLevelBinding.c" ex="false" tool="0" flavor2="3"> - <cTool flags="3"> + <cTool flags="4"> </cTool> </item> <item path="MostVolume/DeviceContainer.cpp" ex="false" tool="1" flavor2="4"> @@ -536,9 +514,40 @@ <folder path="0/Alsa-afb"> <cTool> <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>Alsa-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>Audio-Common</pElem> + <pElem>build/Alsa-afb</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_lowlevel_EXPORTS</Elem> + </preprocessorList> + </cTool> + </folder> + <folder path="0/Audio-Common"> + <cTool> + <incDir> + <pElem>../../../opt/include</pElem> + <pElem>../../../opt/include/alsa</pElem> + <pElem>/usr/include/p11-kit-1</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>Audio-Common</pElem> + <pElem>build/Audio-Common</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/Common"> @@ -575,14 +584,6 @@ </preprocessorList> </cTool> </folder> - <folder path="0/Controller-afb"> - <cTool> - <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>Controller-afb</pElem> - </incDir> - </cTool> - </folder> <folder path="0/HAL-afb"> <cTool> <incDir> |