Updated to latest App Template

24 files changed, 719 insertions, 221 deletions

diff --git a/Alsa-afb/Alsa-ApiHat.c b/Alsa-afb/Alsa-ApiHat.c
index a8663ca..e22f2d5 100644
--- a/Alsa-afb/Alsa-ApiHat.c
+++ b/Alsa-afb/Alsa-ApiHat.c
@@ -31,7 +31,7 @@
 #include "Alsa-ApiHat.h"
 
 STATIC int AlsaInit(void) {
-    int rc= prctl(PR_SET_NAME, "afb-audio-agent",NULL,NULL,NULL);
+    int rc= prctl(PR_SET_NAME, "afb-aaaa-agent",NULL,NULL,NULL);
     if (rc) AFB_ERROR("ERROR: AlsaCore fail to rename process");
 
     return rc;
diff --git a/Alsa-afb/CMakeLists.txt b/Alsa-afb/CMakeLists.txt
index 38b957d..fab49ae 100644
--- a/Alsa-afb/CMakeLists.txt
+++ b/Alsa-afb/CMakeLists.txt
@@ -36,6 +36,3 @@ PROJECT_TARGET_ADD(alsa-lowlevel)
         ${link_libraries}
     )
 
-    # installation directory
-    INSTALL(TARGETS ${TARGET_NAME}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/Audio-Common/filescan-utils.c b/Audio-Common/filescan-utils.c
index af0b5c9..4a5613f 100644
--- a/Audio-Common/filescan-utils.c
+++ b/Audio-Common/filescan-utils.c
@@ -113,9 +113,12 @@ PUBLIC const char *GetBinderName() {
     
     if (binderName) return binderName;
     
-    // retrieve binder name from process name afb-name-trailer
-    prctl(PR_GET_NAME, psName,NULL,NULL,NULL);
-    binderName=(char*)GetMidleName(psName);
+    binderName= getenv("AFB_BINDER_NAME");
+    if (!binderName) {
+        // retrieve binder name from process name afb-name-trailer
+        prctl(PR_GET_NAME, psName,NULL,NULL,NULL);
+        binderName=(char*)GetMidleName(psName);
+    }
     
     return binderName;
 }
\ No newline at end of file
diff --git a/Controller-afb/CMakeLists.txt b/Controller-afb/CMakeLists.txt
index d1eb886..c7602f8 100644
--- a/Controller-afb/CMakeLists.txt
+++ b/Controller-afb/CMakeLists.txt
@@ -16,7 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
-ADD_COMPILE_OPTIONS(-DCONTROL_ONLOAD_DEFAULT="onload-default")
+ADD_COMPILE_OPTIONS(-DCONTROL_ONLOAD_PROFILE="onload-default-profile")
 
 ADD_COMPILE_OPTIONS(-DCONTROL_DOSCRIPT_PRE="doscript")
 ADD_COMPILE_OPTIONS(-DCONTROL_CONFIG_PRE="onload")
@@ -57,9 +57,6 @@ PROJECT_TARGET_ADD(control-afb)
         ${link_libraries}
     )
 
-    # installation directory
-    INSTALL(TARGETS ${TARGET_NAME}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX} )
 
 PROJECT_TARGET_ADD(audio-plugin-sample)
 
diff --git a/Controller-afb/README.md b/Controller-afb/README.md
index e6cab72..9bab485 100644
--- a/Controller-afb/README.md
+++ b/Controller-afb/README.md
@@ -30,7 +30,7 @@ Each bloc in the configuration file are defined with
  * info:  optional used for documentation purpose only
 
 Note by default controller config search path is defined at compilation time, but path might be overloaded with CONTROL_CONFIG_PATH
-environment variable.
+environment variable. Setenv 'CONTROL_ONLOAD_PROFILE'=xxxx to overload 'onload-default-profile' initialisation sequence.
 
 ### Config is organised in 4 sections:
 
diff --git a/Controller-afb/ctl-binding.c b/Controller-afb/ctl-binding.c
index 8771fc0..ec33f82 100644
--- a/Controller-afb/ctl-binding.c
+++ b/Controller-afb/ctl-binding.c
@@ -55,9 +55,12 @@ PUBLIC int CtlBindingInit () {
     errcount += LuaLibInit();
 #endif
     
+    const char *profile= getenv("CONTROL_ONLOAD_PROFILE");
+    if (!profile) profile=CONTROL_ONLOAD_PROFILE;
+    
     // now that everything is initialised execute the onload action
-    if (!errcount)
-        errcount += DispatchOnLoad(CONTROL_ONLOAD_DEFAULT);
+    if (!errcount) 
+        errcount += DispatchOnLoad(CONTROL_ONLOAD_PROFILE);
     
     AFB_DEBUG ("Audio Policy Control Binding Done errcount=%d", errcount);
     return errcount;
diff --git a/Controller-afb/ctl-dispatch.c b/Controller-afb/ctl-dispatch.c
index 1708204..0104229 100644
--- a/Controller-afb/ctl-dispatch.c
+++ b/Controller-afb/ctl-dispatch.c
@@ -178,6 +178,8 @@ PUBLIC void DispatchOneEvent(const char *evtLabel, json_object *eventJ) {
 // Event name is mapped on control label and executed as a standard control
 
 PUBLIC int DispatchOnLoad(const char *onLoadLabel) {
+    if (!configHandle) return 1;
+    
     DispatchHandleT **onloads = configHandle->onloads;
 
     int err = DispatchOneControl(CTL_SOURCE_ONLOAD, onloads, onLoadLabel, NULL, NULL_AFBREQ);
@@ -650,7 +652,7 @@ PUBLIC int DispatchInit() {
 
     // no dispatch config found remove control API from binder
     if (!luaLoaded) {
-        AFB_WARNING("DISPATCH-INIT:WARNING Not Found Control dispatch file [%s]", controlFile);
+        AFB_WARNING("DISPATCH-INIT:WARNING (setenv CONTROL_CONFIG_PATH) No Config '%s-*.json' in '%s'", controlFile, dirList);
     }
 
     AFB_NOTICE("DISPATCH-INIT:SUCCES: Audio Control Dispatch Init");
diff --git a/Controller-afb/ctl-lua.c b/Controller-afb/ctl-lua.c
index 4ef6b65..3f45055 100644
--- a/Controller-afb/ctl-lua.c
+++ b/Controller-afb/ctl-lua.c
@@ -965,7 +965,10 @@ PUBLIC int LuaLibInit () {
     strncat (fullprefix, GetBinderName(), sizeof(fullprefix));
     strncat (fullprefix, "-", sizeof(fullprefix));
     
-    json_object *luaScriptPathJ = ScanForConfig(CONTROL_LUA_PATH , CTL_SCAN_RECURSIVE, fullprefix, "lua");
+    const char *dirList= getenv("CONTROL_LUA_PATH");
+    if (!dirList) dirList=CONTROL_LUA_PATH;
+  
+    json_object *luaScriptPathJ = ScanForConfig(dirList , CTL_SCAN_RECURSIVE, fullprefix, "lua");
     
     // open a new LUA interpretor
     luaState = luaL_newstate();
@@ -1021,7 +1024,7 @@ PUBLIC int LuaLibInit () {
     
     // no policy config found remove control API from binder
     if (index == 0)  {
-        AFB_WARNING ("POLICY-INIT:WARNING No Control LUA file in path=[%s]", CONTROL_LUA_PATH);
+        AFB_WARNING ("POLICY-INIT:WARNING (setenv CONTROL_LUA_PATH) No LUA '%s*.lua' in '%s'", fullprefix, dirList);
     }
        
     AFB_DEBUG ("Audio control-LUA Init Done");
diff --git a/HAL-afb/HDA-intel/CMakeLists.txt b/HAL-afb/HDA-intel/CMakeLists.txt
index aa67e0b..380e493 100644
--- a/HAL-afb/HDA-intel/CMakeLists.txt
+++ b/HAL-afb/HDA-intel/CMakeLists.txt
@@ -37,6 +37,3 @@ PROJECT_TARGET_ADD(hal-intel-hda)
         audio-common
     )
 
-    # installation directory
-    INSTALL(TARGETS ${TARGET_NAME}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/HAL-afb/Jabra-Solemate/CMakeLists.txt b/HAL-afb/Jabra-Solemate/CMakeLists.txt
index bf61dad..41d6915 100644
--- a/HAL-afb/Jabra-Solemate/CMakeLists.txt
+++ b/HAL-afb/Jabra-Solemate/CMakeLists.txt
@@ -36,7 +36,3 @@ PROJECT_TARGET_ADD(hal-jabra-usb)
         hal-interface
         audio-common
     )
-
-    # installation directory
-    INSTALL(TARGETS ${TARGET_NAME}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/HAL-afb/Scarlett-Focusrite/CMakeLists.txt b/HAL-afb/Scarlett-Focusrite/CMakeLists.txt
index 1cc83e6..90ee92a 100644
--- a/HAL-afb/Scarlett-Focusrite/CMakeLists.txt
+++ b/HAL-afb/Scarlett-Focusrite/CMakeLists.txt
@@ -36,7 +36,3 @@ PROJECT_TARGET_ADD(hal-scalett-usb)
         hal-interface
         audio-common
     )
-
-    # installation directory
-    INSTALL(TARGETS ${TARGET_NAME}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/README.md b/README.md
index 2063677..e9ad55f 100644
--- a/README.md
+++ b/README.md
@@ -113,9 +113,7 @@ from the wrong relative directory, either you have to use 'set solib-search-path
 # ToBeBone (WorkInProgess: This list is getting longer every day)
 -------------------------------------------------------------------
 
-* Support response from LUA with nested table (currently fail miserably)
-* Add timer base callback from Lua
-* Enable export of LUA commands directly from Plugin
+ * Allow LUA to run a shell command
 
 # Running an debugging on a target
 -------------------------------------------------------
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject 9a737858056dae3348e4659ed5e9168d39f1b23
+Subproject 350c5b97459226f7e031c73edb3a79a2d99cb25
diff --git a/conf.d/project/config.d/CMakeLists.txt b/conf.d/project/json.d/CMakeLists.txt
index 8070997..8070997 100644
--- a/conf.d/project/config.d/CMakeLists.txt
+++ b/conf.d/project/json.d/CMakeLists.txt
diff --git a/conf.d/project/config.d/onload-audio-control.json b/conf.d/project/json.d/onload-audio-control.json
index 77a8fce..77a8fce 100644
--- a/conf.d/project/config.d/onload-audio-control.json
+++ b/conf.d/project/json.d/onload-audio-control.json
diff --git a/conf.d/project/config.d/onload-daemon-standalone.json b/conf.d/project/json.d/onload-daemon-standalone.json
index de52c22..de52c22 100644
--- a/conf.d/project/config.d/onload-daemon-standalone.json
+++ b/conf.d/project/json.d/onload-daemon-standalone.json
diff --git a/conf.d/project/lua.d/onload-audio-0utils.lua b/conf.d/project/lua.d/onload-aaaa-00-utils.lua
index b8ecd7e..b8ecd7e 100644
--- a/conf.d/project/lua.d/onload-audio-0utils.lua
+++ b/conf.d/project/lua.d/onload-aaaa-00-utils.lua
diff --git a/conf.d/project/lua.d/onload-audio-controls.lua b/conf.d/project/lua.d/onload-aaaa-01-controls.lua
index 24c4f71..24c4f71 100644
--- a/conf.d/project/lua.d/onload-audio-controls.lua
+++ b/conf.d/project/lua.d/onload-aaaa-01-controls.lua
diff --git a/conf.d/project/lua.d/onload-audio-timer.lua b/conf.d/project/lua.d/onload-aaaa-02-timer.lua
index db7a937..db7a937 100644
--- a/conf.d/project/lua.d/onload-audio-timer.lua
+++ b/conf.d/project/lua.d/onload-aaaa-02-timer.lua
diff --git a/conf.d/project/lua.d/onload-audio-oncall.lua b/conf.d/project/lua.d/onload-aaaa-03-oncall.lua
index 23b538e..23b538e 100644
--- a/conf.d/project/lua.d/onload-audio-oncall.lua
+++ b/conf.d/project/lua.d/onload-aaaa-03-oncall.lua
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
deleted file mode 100644
index 3b052c9..0000000
--- a/data/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-###########################################################################
-# Copyright 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-
-
-##################################################
-# Control Policy Config file
-##################################################
-PROJECT_TARGET_ADD(Control_config)
-
-    file(GLOB XML_FILES "*.json")
-
-    add_input_files("${XML_FILES}")
-
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-	LABELS "DATA"
-	OUTPUT_NAME ${TARGET_NAME}
-    )
diff --git a/data/default-control-policy.json b/data/default-control-policy.json
deleted file mode 100644
index c6f8bd0..0000000
--- a/data/default-control-policy.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-    "$schema": "ToBeDone",
-    "metadata": {
-        "label": "sample-audio-policy",
-        "info": "Provide Default Audio Policy for Multimedia, Navigation and Emergency",
-        "version": "1.0"
-    },
-    "onload": {
-        "info": "controller initialisation config",
-        "plugin": "sample-audio-policy.so",
-        "actions": [
-            {
-                "info": "Call policy sharelib install entrypoint",
-                "callback": "SamplePolicyInstall",
-                "query": {"arg1" : "first_arg", "nextarg": "second arg value"}
-            }, {
-                "info": "Assert AlsaCore Presence",   
-                "api": "alsacore",
-                "verb": "ping"
-            }
-        ]
-    },
-    "controls": 
-            [{
-                    "label": "multimedia",
-                    "actions": [
-                        {
-                            "label": "multimedia-policy-cb",
-                            "info": "Call Sharelib Sample Callback",
-                            "callback": "samplePolicyCB",
-                            "query": {
-                            "arg1": "snoopy",
-                            "arg2": "toto"
-                            }
-                        }, {
-                            "label": "multimedia-policy-ucm",
-                            "info": "Subcall AlSA UCM navigation",   
-                            "api": "alsacore",
-                            "verb": "ucmset",
-                            "query": {
-                                "verb": "multimedia"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "label":"navigation",
-                    "action" : {
-                        "api": "alsacore",
-                        "verb": "ucmset",
-                        "query": {
-                            "verb": "navigation"
-                        },
-                        "optional": true,
-                        "timeout": 100
-                    }
-                }, {
-                    "label":"emergency",
-                    "action": {
-                        "api": "alsacore",
-                        "verb": "ucmset",
-                        "query": {
-                            "verb": "emergency"
-                        }
-                    }
-                }]
-    ,
-    "events": [
-        {
-            "label": "SampleEvent",
-            "comment": "define action when receiving a given event",
-            "actions": [
-                {
-                    "info": "Event Callback-1",
-                    "callback": "ProcessEventCB",
-                    "query": {
-                        "arg": "action-1"
-                    }
-                }, {
-                    "info": "Event Callback-2",
-                    "callback": "ProcessEventCB",
-                    "query": {
-                        "arg": "action-2"
-                    }
-                }
-            ]
-        }
-    ]
-}
-
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 235c3b0..cf14956 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -49,6 +49,7 @@
         <in>ctl-lua.c</in>
         <in>ctl-misc.c</in>
         <in>ctl-plugin-sample.c</in>
+        <in>ctl-policy.c</in>
         <in>ctl-timer.c</in>
       </df>
       <df name="HAL-afb">
@@ -118,11 +119,10 @@
         <rebuildPropChanged>false</rebuildPropChanged>
       </toolsSet>
       <flagsDictionary>
-        <element flagsID="0" commonFlags="-g -fPIC -fPIC"/>
-        <element flagsID="1" commonFlags="-g -fPIC -fPIC -g"/>
-        <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 -g"/>
+        <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/>
+        <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -g -g -fPIC"/>
+        <element flagsID="3"
                  commonFlags="-mtune=generic -march=x86-64 -g -ggdb -g -ggdb -fPIC"/>
       </flagsDictionary>
       <codeAssistance>
@@ -134,7 +134,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>
@@ -147,11 +147,11 @@
             ex="false"
             tool="0"
             flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -162,14 +162,14 @@
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>build/Alsa-afb</pElem>
           </incDir>
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -180,7 +180,7 @@
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-SetGet.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -191,7 +191,7 @@
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-Ucm.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -202,7 +202,7 @@
         </cTool>
       </item>
       <item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/afb</pElem>
             <pElem>Audio-Common</pElem>
@@ -212,7 +212,7 @@
         </cTool>
       </item>
       <item path="Audio-Common/filescan-utils.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/afb</pElem>
             <pElem>Audio-Common</pElem>
@@ -222,7 +222,7 @@
         </cTool>
       </item>
       <item path="Audio-Common/wrap-json.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>Audio-Common</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -231,45 +231,19 @@
         </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="0">
+        <cTool flags="1">
           <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-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>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="2">
+        <cTool flags="1">
           <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>
@@ -279,10 +253,8 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-lua.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <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>
@@ -292,20 +264,16 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-misc.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <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="1">
           <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>
@@ -313,10 +281,8 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-timer.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>Controller-afb</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/Controller-afb</pElem>
           </incDir>
@@ -326,9 +292,10 @@
             ex="false"
             tool="0"
             flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>Audio-Common</pElem>
+            <pElem>../../../opt/include</pElem>
             <pElem>build/HAL-afb/HAL-interface</pElem>
           </incDir>
         </cTool>
@@ -337,7 +304,7 @@
             ex="false"
             tool="0"
             flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>Audio-Common</pElem>
             <pElem>build/HAL-afb/HAL-interface</pElem>
@@ -345,36 +312,36 @@
         </cTool>
       </item>
       <item path="HAL-afb/HAL-interface/hal-volume.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <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="1">
         </cTool>
       </item>
       <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
         </cTool>
       </item>
       <item path="HAL-afb/Jabra-Solemate/JabraUsbHAL.c"
             ex="false"
             tool="0"
             flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
         </cTool>
       </item>
       <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c"
             ex="false"
             tool="0"
             flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
         </cTool>
       </item>
       <item path="HAL-afb/Unicens-USB/UnicensHAL.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>Shared-Interface</pElem>
             <pElem>HAL-afb/HAL-interface</pElem>
@@ -383,7 +350,7 @@
         </cTool>
       </item>
       <item path="HAL-afb/Unicens-USB/UnicensVol.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>HAL-afb/HAL-interface</pElem>
             <pElem>build/HAL-afb/Unicens-USB</pElem>
@@ -391,11 +358,11 @@
         </cTool>
       </item>
       <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="3">
+        <cTool flags="2">
         </cTool>
       </item>
       <item path="HighLevel-afb/HighLevelBinding.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="3">
+        <cTool flags="2">
         </cTool>
       </item>
       <item path="MostVolume/DeviceContainer.cpp" ex="false" tool="1" flavor2="4">
@@ -505,6 +472,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>
@@ -2562,5 +2537,655 @@
         </cTool>
       </folder>
     </conf>
+    <conf name="Demo-AudioController" type="0">
+      <toolsSet>
+        <compilerSet>GNU|GNU</compilerSet>
+        <dependencyChecking>false</dependencyChecking>
+        <rebuildPropChanged>false</rebuildPropChanged>
+      </toolsSet>
+      <flagsDictionary>
+        <element flagsID="0" commonFlags="-g -fPIC -fPIC"/>
+        <element flagsID="1" commonFlags="-g -fPIC -fPIC -g"/>
+        <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>
+        <includeAdditional>true</includeAdditional>
+      </codeAssistance>
+      <makefileType>
+        <makeTool>
+          <buildCommandWorkingDir>build</buildCommandWorkingDir>
+          <buildCommand>${MAKE} -f Makefile install</buildCommand>
+          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
+          <executablePath>build/CMakeFiles/feature_tests.bin</executablePath>
+          <cTool flags="0">
+          </cTool>
+        </makeTool>
+        <preBuild>
+          <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir>
+          <preBuildCommand>cmake ..</preBuildCommand>
+          <preBuildFirst>true</preBuildFirst>
+        </preBuild>
+      </makefileType>
+      <item path="Alsa-Plugin/Alsa-Policy-Hook/PolicyHookCb.c"
+            ex="false"
+            tool="0"
+            flavor2="3">
+        <cTool flags="2">
+        </cTool>
+      </item>
+      <item path="Alsa-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
+          <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>Alsa-afb</pElem>
+            <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="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/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>
+      </item>
+      <item path="Alsa-afb/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
+          <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>Alsa-afb</pElem>
+            <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="2">
+          <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>Alsa-afb</pElem>
+            <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="2">
+          <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>Alsa-afb</pElem>
+            <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="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="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="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="1">
+        </cTool>
+      </item>
+      <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>
+          </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-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>
+          </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-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>
+          </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>
+        </cTool>
+      </item>
+      <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>
+          </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>audio_plugin_sample_EXPORTS</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <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>
+          </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="HAL-afb/HAL-interface/hal-interface.c"
+            ex="false"
+            tool="0"
+            flavor2="3">
+        <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-volramp.c"
+            ex="false"
+            tool="0"
+            flavor2="3">
+        <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="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="2">
+        </cTool>
+      </item>
+      <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
+        </cTool>
+      </item>
+      <item path="HAL-afb/Jabra-Solemate/JabraUsbHAL.c"
+            ex="false"
+            tool="0"
+            flavor2="3">
+        <cTool flags="2">
+        </cTool>
+      </item>
+      <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c"
+            ex="false"
+            tool="0"
+            flavor2="3">
+        <cTool flags="2">
+        </cTool>
+      </item>
+      <item path="HAL-afb/Unicens-USB/UnicensHAL.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="4">
+          <incDir>
+            <pElem>Shared-Interface</pElem>
+            <pElem>HAL-afb/HAL-interface</pElem>
+            <pElem>build/HAL-afb/Unicens-USB</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="HAL-afb/Unicens-USB/UnicensVol.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="4">
+          <incDir>
+            <pElem>HAL-afb/HAL-interface</pElem>
+            <pElem>build/HAL-afb/Unicens-USB</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="3">
+        </cTool>
+      </item>
+      <item path="HighLevel-afb/HighLevelBinding.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="3">
+        </cTool>
+      </item>
+      <item path="MostVolume/DeviceContainer.cpp" ex="false" tool="1" flavor2="4">
+      </item>
+      <item path="MostVolume/DeviceValue.cpp" ex="false" tool="1" flavor2="4">
+      </item>
+      <item path="MostVolume/Mediator.cpp" ex="false" tool="1" flavor2="4">
+      </item>
+      <item path="MostVolume/external/ConnectionInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="4">
+      </item>
+      <item path="MostVolume/external/Console.c" ex="false" tool="0" flavor2="2">
+      </item>
+      <item path="MostVolume/external/MacAddr.cpp" ex="false" tool="1" flavor2="4">
+      </item>
+      <item path="MostVolume/external/MostIpc.cpp" ex="false" tool="1" flavor2="4">
+      </item>
+      <item path="MostVolume/external/MostMsg.cpp" ex="false" tool="1" flavor2="4">
+      </item>
+      <item path="MostVolume/external/MostMsgTx.cpp" ex="false" tool="1" flavor2="4">
+      </item>
+      <item path="MostVolume/external/MsgAddr.cpp" ex="false" tool="1" flavor2="4">
+      </item>
+      <item path="MostVolume/external/MsgFilter.cpp" ex="false" tool="1" flavor2="4">
+      </item>
+      <item path="MostVolume/external/Shadow_NetworkMaster.cpp"
+            ex="false"
+            tool="1"
+            flavor2="4">
+      </item>
+      <item path="MostVolume/external/Thread.cpp" ex="false" tool="1" flavor2="4">
+      </item>
+      <item path="MostVolume/libmostvolume.cpp" ex="false" tool="1" flavor2="4">
+      </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_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>
+      <folder path="0/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/Controller-afb</pElem>
+            <pElem>build/HAL-afb/HAL-plugin</pElem>
+            <pElem>/usr/include/alsa</pElem>
+            <pElem>build/Common</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem>
+            <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem>
+            <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_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>CTL_PLUGIN_MAGIC=2468013579</Elem>
+            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
+            <Elem>MAX_SND_CARD=16</Elem>
+            <Elem>TLV_BYTE_SIZE=256</Elem>
+            <Elem>audio_plugin_sample_EXPORTS</Elem>
+            <Elem>control_afb_EXPORTS</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/HAL-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>
+          </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_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>CTL_PLUGIN_MAGIC=2468013579</Elem>
+            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
+            <Elem>MAX_SND_CARD=16</Elem>
+            <Elem>TLV_BYTE_SIZE=256</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/HAL-afb/HAL-interface">
+        <cTool>
+          <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>HAL-afb/HAL-interface</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/HAL-afb/HAL-plugin">
+        <cTool>
+          <incDir>
+            <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>
+            <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem>
+            <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem>
+            <Elem>audio_plugin_sample_EXPORTS</Elem>
+            <Elem>control_afb_EXPORTS</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <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>
+            <pElem>build/HAL-afb/HDA-intel</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/HAL-afb/Jabra-Solemate">
+        <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>
+          </incDir>
+        </cTool>
+      </folder>
+      <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>
+            <pElem>build/HAL-afb/Scarlett-Focusrite</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/HAL-afb/Unicens-USB">
+        <cTool>
+          <incDir>
+            <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>
+            <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem>
+            <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem>
+            <Elem>audio_plugin_sample_EXPORTS</Elem>
+            <Elem>control_afb_EXPORTS</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/HighLevel-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/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>
+          </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_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>CTL_PLUGIN_MAGIC=2468013579</Elem>
+            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
+            <Elem>MAX_SND_CARD=16</Elem>
+            <Elem>TLV_BYTE_SIZE=256</Elem>
+            <Elem>audio_plugin_sample_EXPORTS</Elem>
+            <Elem>control_afb_EXPORTS</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/MostVolume">
+        <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/Controller-afb</pElem>
+            <pElem>build/HAL-afb/HAL-plugin</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_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>CTL_PLUGIN_MAGIC=2468013579</Elem>
+            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
+            <Elem>MAX_SND_CARD=16</Elem>
+            <Elem>TLV_BYTE_SIZE=256</Elem>
+            <Elem>audio_plugin_sample_EXPORTS</Elem>
+            <Elem>control_afb_EXPORTS</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+    </conf>
   </confs>
 </configurationDescriptor>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index db3bdab..b229af2 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -33,6 +33,10 @@
                     <name>Local_Raw_Controller</name>
                     <type>0</type>
                 </confElem>
+                <confElem>
+                    <name>Demo-AudioController</name>
+                    <type>0</type>
+                </confElem>
             </confList>
             <formatting>
                 <project-formatting-style>false</project-formatting-style>