From f817ce67ff6344f181d221c859e1cb2231a3dac4 Mon Sep 17 00:00:00 2001 From: fulup Date: Tue, 8 Aug 2017 18:52:13 +0200 Subject: Early Draft of LUA integration --- nbproject/configurations.xml | 285 ++++++++++++++++++++++++------------------- 1 file changed, 160 insertions(+), 125 deletions(-) (limited to 'nbproject/configurations.xml') diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index e955bcb..0207747 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -21,6 +21,10 @@ PolicyHookCb.c + + audio-common.c + wrap-json.c + @@ -38,6 +42,12 @@ AudioCommonLib.c + + ctl-binding.c + ctl-events.c + ctl-lua.c + ctl-policy.c + hal-interface.c @@ -83,12 +93,6 @@ Mediator.cpp libmostvolume.cpp - - polctl-binding.c - - - audio-interface.c - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - @@ -293,15 +313,15 @@ ../../../opt/include/alsa /usr/include/p11-kit-1 /usr/include/json-c - Shared-Interface + Audio-Common build/ALSA-afb - CONTROL_CDEV_RX="/dev/inic-usb-crx" - CONTROL_CDEV_TX="/dev/inic-usb-ctx" + CONTROL_FILE_POLICY="onload-control-policy.json" + CONTROL_PATH_LUA="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" + CONTROL_PATH_POLICY="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" MAX_LINEAR_DB_SCALE=24 MAX_SND_CARD=16 - NATIVE_LINUX TLV_BYTE_SIZE=256 alsa_lowlevel_EXPORTS @@ -317,17 +337,37 @@ build/Alsa-Plugin/Alsa-Policy-Hook - CONTROL_CDEV_RX="/dev/inic-usb-crx" - CONTROL_CDEV_TX="/dev/inic-usb-ctx" + CONTROL_FILE_POLICY="onload-control-policy.json" + CONTROL_PATH_LUA="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" + CONTROL_PATH_POLICY="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" MAX_LINEAR_DB_SCALE=24 MAX_SND_CARD=16 - NATIVE_LINUX PIC TLV_BYTE_SIZE=256 policy_hook_cb_EXPORTS + + + + ../../../opt/include + ../../../opt/include/alsa + /usr/include/p11-kit-1 + /usr/include/json-c + Audio-Common + build/Audio-Common + + + CONTROL_FILE_POLICY="onload-control-policy.json" + CONTROL_PATH_LUA="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" + CONTROL_PATH_POLICY="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + TLV_BYTE_SIZE=256 + + + @@ -344,6 +384,28 @@ + + + + ../../../opt/include + ../../../opt/include/alsa + /usr/include/p11-kit-1 + /usr/include/json-c + /usr/include/lua5.3 + Audio-Common + build/Controler-afb + + + CONTROL_FILE_POLICY="onload-control-policy.json" + CONTROL_PATH_LUA="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" + CONTROL_PATH_POLICY="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + TLV_BYTE_SIZE=256 + control_afb_EXPORTS + + + @@ -351,8 +413,6 @@ ../../../opt/include/afb - CONTROL_CDEV_RX="/dev/inic-usb-crx" - CONTROL_CDEV_TX="/dev/inic-usb-ctx" MAX_SND_CARD=16 @@ -365,12 +425,14 @@ /usr/include/p11-kit-1 /usr/include/json-c HAL-afb/HAL-interface - Shared-Interface + Audio-Common build/HAL-afb/HAL-interface + CONTROL_FILE_POLICY="onload-control-policy.json" + CONTROL_PATH_LUA="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" + CONTROL_PATH_POLICY="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" MAX_LINEAR_DB_SCALE=24 - NATIVE_LINUX TLV_BYTE_SIZE=256 @@ -381,6 +443,10 @@ HAL-afb/HAL-plugin ../../../opt/include/alsa + + CONTROL_CDEV_RX="/dev/inic-usb-crx" + CONTROL_CDEV_TX="/dev/inic-usb-ctx" + @@ -391,12 +457,14 @@ /usr/include/p11-kit-1 /usr/include/json-c HAL-afb/HAL-interface - Shared-Interface + Audio-Common build/HAL-afb/HDA-intel + CONTROL_FILE_POLICY="onload-control-policy.json" + CONTROL_PATH_LUA="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" + CONTROL_PATH_POLICY="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" MAX_LINEAR_DB_SCALE=24 - NATIVE_LINUX TLV_BYTE_SIZE=256 hal_intel_hda_EXPORTS @@ -410,12 +478,14 @@ /usr/include/p11-kit-1 /usr/include/json-c HAL-afb/HAL-interface - Shared-Interface + Audio-Common build/HAL-afb/Jabra-Solemate + CONTROL_FILE_POLICY="onload-control-policy.json" + CONTROL_PATH_LUA="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" + CONTROL_PATH_POLICY="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" MAX_LINEAR_DB_SCALE=24 - NATIVE_LINUX TLV_BYTE_SIZE=256 hal_jabra_usb_EXPORTS @@ -429,12 +499,14 @@ /usr/include/p11-kit-1 /usr/include/json-c HAL-afb/HAL-interface - Shared-Interface + Audio-Common build/HAL-afb/Scarlett-Focusrite + CONTROL_FILE_POLICY="onload-control-policy.json" + CONTROL_PATH_LUA="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" + CONTROL_PATH_POLICY="/etc/default/audio-agent/policy:/home/fulup/.config/audio-agent:/home/fulup/opt/audio-agent/policy:/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/data" MAX_LINEAR_DB_SCALE=24 - NATIVE_LINUX TLV_BYTE_SIZE=256 hal_scalett_usb_EXPORTS @@ -446,6 +518,10 @@ HAL-afb/Unicens-USB /usr/include/json-c + + CONTROL_CDEV_RX="/dev/inic-usb-crx" + CONTROL_CDEV_TX="/dev/inic-usb-ctx" + @@ -464,47 +540,6 @@ - - - - ../../../opt/include - ../../../opt/include/alsa - /usr/include/p11-kit-1 - /usr/include/json-c - Shared-Interface - build/PolicyCtl-afb - - - CONTROL_CDEV_RX="/dev/inic-usb-crx" - CONTROL_CDEV_TX="/dev/inic-usb-ctx" - MAX_LINEAR_DB_SCALE=24 - MAX_SND_CARD=16 - NATIVE_LINUX - TLV_BYTE_SIZE=256 - polctl_afb_EXPORTS - - - - - - - ../../../opt/include - ../../../opt/include/alsa - /usr/include/p11-kit-1 - /usr/include/json-c - Shared-Interface - build/Shared-Interface - - - CONTROL_CDEV_RX="/dev/inic-usb-crx" - CONTROL_CDEV_TX="/dev/inic-usb-ctx" - MAX_LINEAR_DB_SCALE=24 - MAX_SND_CARD=16 - NATIVE_LINUX - TLV_BYTE_SIZE=256 - - - @@ -595,6 +630,10 @@ + + + + @@ -722,10 +761,6 @@ - - - - @@ -746,6 +781,16 @@ + + + + ../../../opt/include/afb + Shared-Interface + /usr/include/json-c + build/Shared-Interface + + + @@ -856,16 +901,6 @@ - - - - ../../../opt/include/afb - Shared-Interface - /usr/include/json-c - build/Shared-Interface - - - @@ -966,8 +1001,16 @@ tool="0" flavor2="2"> + + + + + + + + - - - - - - - - + + + + ../../../opt/include/afb + Shared-Interface + /usr/include/json-c + build/Shared-Interface + + + + + + + ../../../opt/include + ../../../opt/include/alsa + /usr/include/p11-kit-1 + /usr/include/json-c + Shared-Interface + build/PolicyCtl-afb + + + CONTROL_CDEV_RX="/dev/inic-usb-crx" + CONTROL_CDEV_TX="/dev/inic-usb-ctx" + MAX_LINEAR_DB_SCALE=24 + MAX_SND_CARD=16 + NATIVE_LINUX + TLV_BYTE_SIZE=256 + polctl_afb_EXPORTS + + + @@ -1187,37 +1253,6 @@ - - - - ../../../opt/include - ../../../opt/include/alsa - /usr/include/p11-kit-1 - /usr/include/json-c - Shared-Interface - build/PolicyCtl-afb - - - CONTROL_CDEV_RX="/dev/inic-usb-crx" - CONTROL_CDEV_TX="/dev/inic-usb-ctx" - MAX_LINEAR_DB_SCALE=24 - MAX_SND_CARD=16 - NATIVE_LINUX - TLV_BYTE_SIZE=256 - polctl_afb_EXPORTS - - - - - - - ../../../opt/include/afb - Shared-Interface - /usr/include/json-c - build/Shared-Interface - - - -- cgit 1.2.3-korg