diff options
author | Fulup Ar Foll <fulup@iot.bzh> | 2017-08-22 13:58:57 +0200 |
---|---|---|
committer | Fulup Ar Foll <fulup@iot.bzh> | 2017-08-22 13:59:39 +0200 |
commit | 900bb5fd6b48a83c636e61a400464725b41e0d96 (patch) | |
tree | ce94f07963f7ab6ff63d2bbc23f9808af76b3221 | |
parent | 0b718e49e2ae9e99247d3b5c31bb3fa24e08caab (diff) |
Minor Fix on LUA script search path
-rw-r--r-- | Controller-afb/ctl-apidef.h | 30 | ||||
-rw-r--r-- | Controller-afb/ctl-apidef.json | 24 | ||||
-rw-r--r-- | Controller-afb/ctl-lua.c | 19 | ||||
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | conf.d/project/lua.d/onload-aaaa-03-oncall.lua | 2 | ||||
-rw-r--r-- | htdocs/audio-control.html | 3 | ||||
-rw-r--r-- | nbproject/configurations.xml | 546 |
7 files changed, 307 insertions, 321 deletions
diff --git a/Controller-afb/ctl-apidef.h b/Controller-afb/ctl-apidef.h index 100fc79..9ce9e05 100644 --- a/Controller-afb/ctl-apidef.h +++ b/Controller-afb/ctl-apidef.h @@ -41,16 +41,12 @@ static const char _afb_description_v2_control[] = "ons/navigation\"},\"parameters\":[{\"in\":\"query\",\"name\":\"func\",\"" "required\":true,\"schema\":{\"type\":\"string\"}},{\"in\":\"query\",\"na" "me\":\"args\",\"required\":false,\"schema\":{\"type\":\"array\"}}],\"res" - "ponses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}},\"/execlu" - "a\":{\"description\":\"Execute LUA string script.\",\"get\":{\"x-permiss" - "ions\":{\"$ref\":\"#/components/x-permissions/navigation\"},\"parameters" - "\":[{\"in\":\"query\",\"required\":true,\"schema\":{\"type\":\"string\"}" - "}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}},\"" - "/scriptlua\":{\"description\":\"Execute LUA string script.\",\"get\":{\"" - "x-permissions\":{\"$ref\":\"#/components/x-permissions/navigation\"},\"p" - "arameters\":[{\"in\":\"query\",\"name\":\"filename\",\"required\":true,\"" - "schema\":{\"type\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/co" - "mponents/responses/200\"}}}}}}" + "ponses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}},\"/debugl" + "ua\":{\"description\":\"Execute LUA string script.\",\"get\":{\"x-permis" + "sions\":{\"$ref\":\"#/components/x-permissions/navigation\"},\"parameter" + "s\":[{\"in\":\"query\",\"name\":\"filename\",\"required\":true,\"schema\"" + ":{\"type\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components" + "/responses/200\"}}}}}}" ; static const struct afb_auth _afb_auths_v2_control[] = { @@ -60,8 +56,7 @@ static const struct afb_auth _afb_auths_v2_control[] = { void ctlapi_monitor(struct afb_req req); void ctlapi_dispatch(struct afb_req req); void ctlapi_request(struct afb_req req); - void ctlapi_execlua(struct afb_req req); - void ctlapi_scriptlua(struct afb_req req); + void ctlapi_debuglua(struct afb_req req); static const struct afb_verb_v2 _afb_verbs_v2_control[] = { { @@ -86,15 +81,8 @@ static const struct afb_verb_v2 _afb_verbs_v2_control[] = { .session = AFB_SESSION_NONE_V2 }, { - .verb = "execlua", - .callback = ctlapi_execlua, - .auth = &_afb_auths_v2_control[0], - .info = NULL, - .session = AFB_SESSION_NONE_V2 - }, - { - .verb = "scriptlua", - .callback = ctlapi_scriptlua, + .verb = "debuglua", + .callback = ctlapi_debuglua, .auth = &_afb_auths_v2_control[0], .info = NULL, .session = AFB_SESSION_NONE_V2 diff --git a/Controller-afb/ctl-apidef.json b/Controller-afb/ctl-apidef.json index f292eec..e2207d0 100644 --- a/Controller-afb/ctl-apidef.json +++ b/Controller-afb/ctl-apidef.json @@ -201,29 +201,7 @@ } } }, - "/execlua": { - "description": "Execute LUA string script.", - "get": { - "x-permissions": { - "$ref": "#/components/x-permissions/navigation" - }, - "parameters": [ - { - "in": "query", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "$ref": "#/components/responses/200" - } - } - } - }, - "/scriptlua": { + "/debuglua": { "description": "Execute LUA string script.", "get": { "x-permissions": { diff --git a/Controller-afb/ctl-lua.c b/Controller-afb/ctl-lua.c index 412a158..2aaa3a5 100644 --- a/Controller-afb/ctl-lua.c +++ b/Controller-afb/ctl-lua.c @@ -698,24 +698,29 @@ STATIC void LuaDoAction (LuaDoActionT action, afb_req request) { } case LUA_DOSCRIPT: { // Fulup need to fix argument passing - const char *script; - char*func=NULL; char *filename; char*fullpath; char luaScriptPath[CONTROL_MAXPATH_LEN]; - json_object *argsJ=NULL; int index; // scan luascript search path once static json_object *luaScriptPathJ =NULL; - err= wrap_json_unpack (queryJ, "{s:s, s?s s?o !}", "target", &script,"function", &func, "args", &argsJ); + // extract value from query + const char *target=NULL,*func=NULL; + json_object *argsJ=NULL; + err= wrap_json_unpack (queryJ, "{s:s,s?s,s?s,s?o !}","target", &target,"path",&luaScriptPathJ,"function",&func,"args",&argsJ); if (err) { - AFB_ERROR ("LUA-DOSCRIPT-SYNTAX:missing script|(args,arg) query=%s", json_object_get_string(queryJ)); + AFB_ERROR ("LUA-DOSCRIPT-SYNTAX:missing target|[path]|[function]|[args] query=%s", json_object_get_string(queryJ)); goto OnErrorExit; } // search for filename=script in CONTROL_LUA_PATH - if (!luaScriptPathJ) luaScriptPathJ= ScanForConfig(CONTROL_LUA_PATH , CTL_SCAN_RECURSIVE,CONTROL_DOSCRIPT_PRE "-", script); + if (!luaScriptPathJ) { + strncpy(luaScriptPath,CONTROL_DOSCRIPT_PRE, sizeof(luaScriptPath)); + strncat(luaScriptPath,"-", sizeof(luaScriptPath)); + strncat(luaScriptPath,target, sizeof(luaScriptPath)); + luaScriptPathJ= ScanForConfig(CONTROL_LUA_PATH , CTL_SCAN_RECURSIVE,luaScriptPath,".lua"); + } for (index=0; index < json_object_array_length(luaScriptPathJ); index++) { json_object *entryJ=json_object_array_get_idx(luaScriptPathJ, index); @@ -801,7 +806,7 @@ PUBLIC void ctlapi_request (afb_req request) { LuaDoAction (LUA_DOCALL, request); } -PUBLIC void ctlapi_scriptlua (afb_req request) { +PUBLIC void ctlapi_debuglua (afb_req request) { LuaDoAction (LUA_DOSCRIPT, request); } @@ -31,10 +31,6 @@ git pull --recurse-submodules https://github.com/iotbzh/audio-bindings On Ubuntu 16.4 you should recompile AlsaLib from source ftp://ftp.alsa-project.org/pub/lib/ as today latest stable is 1.1.4. -``` - -``` - ``` OpenSuse diff --git a/conf.d/project/lua.d/onload-aaaa-03-oncall.lua b/conf.d/project/lua.d/onload-aaaa-03-oncall.lua index 23b538e..f9ccb67 100644 --- a/conf.d/project/lua.d/onload-aaaa-03-oncall.lua +++ b/conf.d/project/lua.d/onload-aaaa-03-oncall.lua @@ -60,7 +60,7 @@ end function _Test_Call_Sync (request, args) AFB:notice ("Test_Call_Sync args=%s", args) - local err, response= AFB:service_sync ("alsacore","ping", args) + local err, response= AFB:servsync ("alsacore","ping", args) if (err) then AFB:fail ("AFB:service_call_sync fail"); else diff --git a/htdocs/audio-control.html b/htdocs/audio-control.html index fe1120b..06010e5 100644 --- a/htdocs/audio-control.html +++ b/htdocs/audio-control.html @@ -32,8 +32,7 @@ <br> <li><button onclick="callbinder('control','request' , {'target':'_Simple_Echo_Args', 'args':{speed:20}});">LUA function</button></li> <li><button onclick="callbinder('control','request' , {'target':'_Simple_Timer_Test', args:{label:'MyTimer', 'delay':3000, 'count':10}});">LUA Timer</button></li> - <li><button onclick="callbinder('control','scriptlua', {'target':'helloworld.lua', args:{'arg1':'abcd', 'next':7890, 'last':[1,2,3,4]}});">LUA script</button></li> - <li><button onclick="callbinder('control','execlua','print(\'Bonjours\'); return true, 1234');">LUA string</button></li> + <li><button onclick="callbinder('control','debuglua' , {'target':'helloworld', args:{'arg1':'abcd', 'next':7890, 'last':[1,2,3,4]}});">LUA script</button></li> </ol> diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index fbe11e4..59c2cdd 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -132,8 +132,8 @@ <rebuildPropChanged>false</rebuildPropChanged> </toolsSet> <flagsDictionary> - <element flagsID="0" commonFlags="-g -fPIC -fPIC"/> - <element flagsID="1" commonFlags="-g -fPIC -fPIC -g"/> + <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" @@ -148,7 +148,7 @@ <buildCommand>${MAKE} -f Makefile install</buildCommand> <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> <executablePath>build/CMakeFiles/feature_tests.bin</executablePath> - <cTool flags="0"> + <cTool flags="-g -fPIC -fPIC"> </cTool> </makeTool> <preBuild> @@ -245,14 +245,12 @@ </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="2"> <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>Controller-afb</pElem> <pElem>build/Controller-afb</pElem> </incDir> </cTool> @@ -260,8 +258,6 @@ <item path="Controller-afb/ctl-dispatch.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>/usr/include/lua5.3</pElem> <pElem>Audio-Common</pElem> @@ -271,41 +267,19 @@ </cTool> </item> <item path="Controller-afb/ctl-lua.c" ex="false" tool="0" flavor2="3"> - <cTool flags="0"> + <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>Audio-Common</pElem> + <pElem>../../../opt/include</pElem> <pElem>build/Controller-afb</pElem> </incDir> - <preprocessorList> - <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/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="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:/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-dev/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>control_afb_EXPORTS</Elem> - </preprocessorList> </cTool> </item> <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> @@ -314,8 +288,6 @@ <item path="Controller-afb/ctl-plugin-sample.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>/usr/include/lua5.3</pElem> <pElem>build/Controller-afb</pElem> @@ -325,8 +297,6 @@ <item path="Controller-afb/ctl-timer.c" ex="false" tool="0" flavor2="3"> <cTool flags="2"> <incDir> - <pElem>../../../opt/include/afb</pElem> - <pElem>Controller-afb</pElem> <pElem>../../../opt/include</pElem> <pElem>build/Controller-afb</pElem> </incDir> @@ -339,6 +309,7 @@ <cTool flags="2"> <incDir> <pElem>Audio-Common</pElem> + <pElem>../../../opt/include</pElem> <pElem>build/HAL-afb/HAL-interface</pElem> </incDir> </cTool> @@ -365,6 +336,105 @@ <cTool flags="2"> </cTool> </item> + <item path="HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c" + ex="false" + tool="0" + flavor2="3"> + <cTool flags="2"> + <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> + </item> + <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp" + ex="false" + tool="1" + flavor2="4"> + <ccTool flags="1"> + <incDir> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> + </incDir> + </ccTool> + </item> + <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp" + ex="false" + tool="1" + flavor2="4"> + <ccTool flags="1"> + <incDir> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> + </incDir> + </ccTool> + </item> + <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp" + ex="false" + tool="1" + flavor2="4"> + <ccTool flags="1"> + <incDir> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> + </incDir> + </ccTool> + </item> + <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp" + ex="false" + tool="1" + flavor2="4"> + <ccTool flags="1"> + <incDir> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> + </incDir> + </ccTool> + </item> + <item path="HAL-afb/HAL_MOST_UNICENS/wrap-json.c" + ex="false" + tool="0" + flavor2="3"> + <cTool flags="2"> + <incDir> + <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> + </incDir> + </cTool> + </item> + <item path="HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c" + ex="false" + tool="0" + flavor2="3"> + <cTool flags="2"> + <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> + </item> + <item path="HAL-afb/HAL_MOST_UNICENS/wrap_volume.c" + ex="false" + tool="0" + flavor2="3"> + <cTool flags="2"> + <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> + <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> + </incDir> + </cTool> + </item> <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3"> <cTool flags="2"> </cTool> @@ -505,6 +575,14 @@ </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> @@ -2577,12 +2655,11 @@ <rebuildPropChanged>false</rebuildPropChanged> </toolsSet> <flagsDictionary> - <element flagsID="0" commonFlags="-fPIC -fPIC"/> - <element flagsID="1" commonFlags="-g -fPIC -fPIC"/> - <element flagsID="2" commonFlags="-g -fPIC -fPIC -g"/> - <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> @@ -2594,7 +2671,7 @@ <buildCommand>${MAKE} -f Makefile install</buildCommand> <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> <executablePath>build/CMakeFiles/feature_tests.bin</executablePath> - <cTool flags="1"> + <cTool flags="-g -fPIC -fPIC"> </cTool> </makeTool> <preBuild> @@ -2607,308 +2684,300 @@ ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="2"> </cTool> </item> <item path="Alsa-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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> </item> <item path="Alsa-afb/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="2"> + <incDir> + <pElem>build/Alsa-afb</pElem> + </incDir> </cTool> </item> <item path="Alsa-afb/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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> </item> <item path="Alsa-afb/Alsa-SetGet.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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> </item> <item path="Alsa-afb/Alsa-Ucm.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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> </item> <item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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> </item> <item path="Audio-Common/filescan-utils.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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> </item> <item path="Audio-Common/wrap-json.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="2"> + <incDir> + <pElem>Audio-Common</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>build/Audio-Common</pElem> + </incDir> </cTool> </item> <item path="Common/AudioCommonLib.c" ex="false" tool="0" flavor2="2"> - <cTool flags="2"> + <cTool flags="0"> </cTool> </item> <item path="Controller-afb/ctl-binding.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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>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="doscript"</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>control_afb_EXPORTS</Elem> - </preprocessorList> </cTool> </item> <item path="Controller-afb/ctl-dispatch.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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>Audio-Common</pElem> + <pElem>../../../opt/include</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="doscript"</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>control_afb_EXPORTS</Elem> - </preprocessorList> </cTool> </item> <item path="Controller-afb/ctl-lua.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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>Audio-Common</pElem> + <pElem>../../../opt/include</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="doscript"</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>control_afb_EXPORTS</Elem> - </preprocessorList> </cTool> </item> <item path="Controller-afb/ctl-misc.c" ex="false" tool="0" flavor2="3"> - <cTool flags="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> </item> <item path="Controller-afb/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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>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="doscript"</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="1"> + <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>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="doscript"</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>control_afb_EXPORTS</Elem> - </preprocessorList> </cTool> </item> <item path="HAL-afb/HAL-interface/hal-interface.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="2"> + <incDir> + <pElem>Audio-Common</pElem> + <pElem>../../../opt/include</pElem> + <pElem>build/HAL-afb/HAL-interface</pElem> + </incDir> </cTool> </item> <item path="HAL-afb/HAL-interface/hal-volramp.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="2"> + <incDir> + <pElem>Audio-Common</pElem> + <pElem>build/HAL-afb/HAL-interface</pElem> + </incDir> </cTool> </item> <item path="HAL-afb/HAL-interface/hal-volume.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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="1"> + <cTool flags="2"> + <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> </item> <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp" ex="false" tool="1" flavor2="0"> - <ccTool flags="0"> + <ccTool flags="1"> + <incDir> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> + </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp" ex="false" tool="1" flavor2="0"> - <ccTool flags="0"> + <ccTool flags="1"> + <incDir> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> + </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp" ex="false" tool="1" flavor2="0"> - <ccTool flags="0"> + <ccTool flags="1"> + <incDir> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> + </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp" ex="false" tool="1" flavor2="0"> - <ccTool flags="0"> + <ccTool flags="1"> + <incDir> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem> + </incDir> </ccTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/wrap-json.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="2"> + <incDir> + <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> + <pElem>/usr/include/json-c</pElem> + <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> + </incDir> </cTool> </item> <item path="HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="2"> + <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> </item> <item path="HAL-afb/HAL_MOST_UNICENS/wrap_volume.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="2"> + <incDir> + <pElem>../../../opt/include/afb</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS</pElem> + <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> + <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> + </incDir> </cTool> </item> <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="2"> </cTool> </item> <item path="HAL-afb/Jabra-Solemate/JabraUsbHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <cTool flags="2"> </cTool> </item> <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c" ex="false" tool="0" flavor2="3"> - <cTool flags="1"> + <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> @@ -2917,7 +2986,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> @@ -2925,11 +2994,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"> @@ -2969,11 +3038,11 @@ <folder path="0/Alsa-Plugin"> <cTool> <incDir> - <pElem>../../../opt/include</pElem> + <pElem>Alsa-Plugin/Alsa-Policy-Hook</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>../../../opt/include/afb</pElem> + <pElem>../../../opt/include</pElem> <pElem>build/Alsa-Plugin/Alsa-Policy-Hook</pElem> </incDir> <preprocessorList> @@ -2990,42 +3059,9 @@ <folder path="0/Alsa-afb"> <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>/usr/include/lua5.3</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>/usr/include/lua5.3</pElem> - <pElem>Audio-Common</pElem> - <pElem>build/Audio-Common</pElem> + <pElem>../../../opt/include/afb</pElem> + <pElem>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> - </preprocessorList> </cTool> </folder> <folder path="0/Common"> @@ -3062,6 +3098,14 @@ </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> @@ -3100,13 +3144,9 @@ <folder path="0/HAL-afb/HAL-interface"> <cTool> <incDir> + <pElem>../../../opt/include/afb</pElem> <pElem>HAL-afb/HAL-interface</pElem> - <pElem>Audio-Common</pElem> - <pElem>build/HAL-afb/HAL-interface</pElem> </incDir> - <preprocessorList> - <Elem>NATIVE_LINUX</Elem> - </preprocessorList> </cTool> </folder> <folder path="0/HAL-afb/HAL-plugin"> @@ -3134,57 +3174,37 @@ </preprocessorList> </cTool> </folder> - <folder path="0/HAL-afb/HAL_MOST_UNICENS"> - <cTool> - <incDir> - <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem> - <pElem>HAL-afb/HAL-interface</pElem> - <pElem>Audio-Common</pElem> - <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem> - </incDir> - <preprocessorList> - <Elem>NATIVE_LINUX</Elem> - <Elem>hal_most_unicens_EXPORTS</Elem> - </preprocessorList> - </cTool> - </folder> <folder path="0/HAL-afb/HDA-intel"> <cTool> <incDir> - <pElem>HAL-afb/HAL-interface</pElem> + <pElem>../../../opt/include/afb</pElem> + <pElem>HAL-afb/HDA-intel</pElem> <pElem>Audio-Common</pElem> + <pElem>HAL-afb/HAL-interface</pElem> <pElem>build/HAL-afb/HDA-intel</pElem> </incDir> - <preprocessorList> - <Elem>NATIVE_LINUX</Elem> - <Elem>hal_intel_hda_EXPORTS</Elem> - </preprocessorList> </cTool> </folder> <folder path="0/HAL-afb/Jabra-Solemate"> <cTool> <incDir> - <pElem>HAL-afb/HAL-interface</pElem> + <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> </incDir> - <preprocessorList> - <Elem>NATIVE_LINUX</Elem> - <Elem>hal_jabra_usb_EXPORTS</Elem> - </preprocessorList> </cTool> </folder> <folder path="0/HAL-afb/Scarlett-Focusrite"> <cTool> <incDir> - <pElem>HAL-afb/HAL-interface</pElem> + <pElem>../../../opt/include/afb</pElem> + <pElem>HAL-afb/Scarlett-Focusrite</pElem> <pElem>Audio-Common</pElem> + <pElem>HAL-afb/HAL-interface</pElem> <pElem>build/HAL-afb/Scarlett-Focusrite</pElem> </incDir> - <preprocessorList> - <Elem>NATIVE_LINUX</Elem> - <Elem>hal_scalett_usb_EXPORTS</Elem> - </preprocessorList> </cTool> </folder> <folder path="0/HAL-afb/Unicens-USB"> |