From 8c337984bde9a5e005212d34c4916752c724dc61 Mon Sep 17 00:00:00 2001 From: Fulup Ar Foll Date: Mon, 21 Aug 2017 18:08:19 +0200 Subject: Documentation and LUA for Ubuntu --- Controller-afb/ctl-lua.c | 4 +- README.md | 25 +++- conf.d/app-templates | 2 +- conf.d/cmake/config.cmake | 11 +- nbproject/configurations.xml | 287 +++++++++++++++++++++---------------------- 5 files changed, 178 insertions(+), 151 deletions(-) diff --git a/Controller-afb/ctl-lua.c b/Controller-afb/ctl-lua.c index 01cf1b9..412a158 100644 --- a/Controller-afb/ctl-lua.c +++ b/Controller-afb/ctl-lua.c @@ -673,9 +673,9 @@ STATIC void LuaDoAction (LuaDoActionT action, afb_req request) { const char *func; json_object *argsJ=NULL; - err= wrap_json_unpack (queryJ, "{s:s, s?o !}", "request", &func, "args", &argsJ); + err= wrap_json_unpack (queryJ, "{s:s, s?o !}", "target", &func, "args", &argsJ); if (err) { - AFB_ERROR ("LUA-DOCALL-SYNTAX missing func|args query=%s", json_object_get_string(queryJ)); + AFB_ERROR ("LUA-DOCALL-SYNTAX missing target|args query=%s", json_object_get_string(queryJ)); goto OnErrorExit; } diff --git a/README.md b/README.md index e9ad55f..16c15ec 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,13 @@ git pull --recurse-submodules https://github.com/iotbzh/audio-bindings * alsa-devel >= 1.1.2 Warning some distro like Fedora-25 still ship version 1.1.1 as default * lua >= 5.3 Most distribution only ship version 5.2 but binary package should be easy to find +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 @@ -35,8 +42,24 @@ git pull --recurse-submodules https://github.com/iotbzh/audio-bindings - Alsa-devel zypper --install alsa-devel # 42.3 is shipped default with 1.1.4 Fedora 26 (out of the box) - - Lua 5.3 + - Lua 5.3 - Alsa-devel 1.1.4 + + Ubuntu-16.4 + - LUA-5.3 is avaliable in binary through apt-get + - Alsa should be recompiled from source + + wget ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.4.1.tar.bz2 + tar -xjf alsa-lib-1.1.4.1.tar.bz2 + cd alsa-lib-1.1.4.1 + ./configure --prefix=/opt + + Ubuntu-17.04 (out of the box) + - Alsa 1.1.4 + - Lua 5.3 + + #WARNING: do not forget to upgrade your PKG_CONFIG_PATH=/opt/lib/pkgconfig or whatever is the place where + your installed alsa/lua. ``` diff --git a/conf.d/app-templates b/conf.d/app-templates index 350c5b9..3a90fb6 160000 --- a/conf.d/app-templates +++ b/conf.d/app-templates @@ -1 +1 @@ -Subproject commit 350c5b97459226f7e031c73edb3a79a2d99cb250 +Subproject commit 3a90fb6f2c4518ebab484cde90919c19456dc04c diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index b5e3a4c..5d35862 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -47,6 +47,14 @@ set (gcc_minimal_version 4.9) #set(CMAKE_C_COMPILER "gcc") #set(CMAKE_CXX_COMPILER "g++") +# When Present LUA is used by the controller +# --------------------------------------------------------------- +set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support") +set(LUA_PKG lua>=5.3) +if(OSRELEASE MATCHES "debian") +set(LUA_PKG lua-5.3) +endif() + # PKG_CONFIG required packages # ----------------------------- set (PKG_REQUIRED_LIST @@ -56,7 +64,7 @@ set (PKG_REQUIRED_LIST afb-daemon json-c libafbwsc - lua>=5.3 + ${LUA_PKG} ) # Controller project needed variables. @@ -64,7 +72,6 @@ set (PKG_REQUIRED_LIST # in the CMakeLists.txt of that target to correctly # expand variables. # ---------------------------------------------------- -set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support") set (CTL_PLUGIN_PRE "ctl-" CACHE STRING "Prefix for Controller share plugin") set (CTL_PLUGIN_EXT ".ctlso" CACHE STRING "Postfix for Controller share plugin") diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 86c4ff0..8e4a8a0 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -60,6 +60,20 @@ HalPlugPcm.c + + + + device_container.cpp + device_value.cpp + libmostvolume.cpp + setup.cpp + + + hal_most_unicens.c + wrap-json.c + wrap_unicens.c + wrap_volume.c + IntelHdaHAL.c @@ -2563,8 +2577,8 @@ false - - + + ${MAKE} -f Makefile install ${MAKE} -f Makefile clean build/CMakeFiles/feature_tests.bin - + @@ -2598,8 +2612,6 @@ - ../../../opt/include/afb - Alsa-afb ../../../opt/include/alsa /usr/include/json-c Audio-Common @@ -2609,31 +2621,15 @@ - + - ../../../opt/include - ../../../opt/include/alsa - /usr/include/p11-kit-1 - /usr/include/json-c - /usr/include/lua5.3 - Audio-Common build/Alsa-afb - - CONTROL_MAXPATH_LEN=255 - MAX_LINEAR_DB_SCALE=24 - MAX_SND_CARD=16 - NATIVE_LINUX - TLV_BYTE_SIZE=256 - alsa_lowlevel_EXPORTS - - ../../../opt/include/afb - Alsa-afb ../../../opt/include/alsa /usr/include/json-c Audio-Common @@ -2645,8 +2641,6 @@ - ../../../opt/include/afb - Alsa-afb ../../../opt/include/alsa /usr/include/json-c Audio-Common @@ -2658,8 +2652,6 @@ - ../../../opt/include/afb - Alsa-afb ../../../opt/include/alsa /usr/include/json-c Audio-Common @@ -2698,172 +2690,61 @@ - + - + - ../../../opt/include - ../../../opt/include/alsa - /usr/include/p11-kit-1 - /usr/include/json-c - /usr/include/lua5.3 - Audio-Common build/Controller-afb - - CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/home/fulup/opt/controller/config.d" - CONTROL_CONFIG_POST="control" - CONTROL_CONFIG_PRE="onload" - CONTROL_DOSCRIPT_PRE="doscript" - CONTROL_LUA_EVENT="luaevt" - CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d" - CONTROL_MAXPATH_LEN=255 - CONTROL_ONLOAD_PROFILE="onload-default-profile" - CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug" - CONTROL_SUPPORT_LUA - CTL_PLUGIN_MAGIC=2468013579 - MAX_LINEAR_DB_SCALE=24 - MAX_SND_CARD=16 - NATIVE_LINUX - TLV_BYTE_SIZE=256 - control_afb_EXPORTS - - + - ../../../opt/include - ../../../opt/include/alsa - /usr/include/p11-kit-1 /usr/include/json-c /usr/include/lua5.3 Audio-Common + ../../../opt/include build/Controller-afb - - CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/home/fulup/opt/controller/config.d" - CONTROL_CONFIG_POST="control" - CONTROL_CONFIG_PRE="onload" - CONTROL_DOSCRIPT_PRE="doscript" - CONTROL_LUA_EVENT="luaevt" - CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d" - CONTROL_MAXPATH_LEN=255 - CONTROL_ONLOAD_PROFILE="onload-default-profile" - CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug" - CONTROL_SUPPORT_LUA - CTL_PLUGIN_MAGIC=2468013579 - MAX_LINEAR_DB_SCALE=24 - MAX_SND_CARD=16 - NATIVE_LINUX - TLV_BYTE_SIZE=256 - control_afb_EXPORTS - - + - ../../../opt/include - ../../../opt/include/alsa - /usr/include/p11-kit-1 /usr/include/json-c /usr/include/lua5.3 Audio-Common + ../../../opt/include build/Controller-afb - - CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/home/fulup/opt/controller/config.d" - CONTROL_CONFIG_POST="control" - CONTROL_CONFIG_PRE="onload" - CONTROL_DOSCRIPT_PRE="doscript" - CONTROL_LUA_EVENT="luaevt" - CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d" - CONTROL_MAXPATH_LEN=255 - CONTROL_ONLOAD_PROFILE="onload-default-profile" - CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug" - CONTROL_SUPPORT_LUA - CTL_PLUGIN_MAGIC=2468013579 - MAX_LINEAR_DB_SCALE=24 - MAX_SND_CARD=16 - NATIVE_LINUX - TLV_BYTE_SIZE=256 - control_afb_EXPORTS - - ../../../opt/include/afb - Controller-afb /usr/include/json-c build/Controller-afb - + - ../../../opt/include - ../../../opt/include/alsa - /usr/include/p11-kit-1 /usr/include/json-c /usr/include/lua5.3 - Audio-Common build/Controller-afb - - CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/home/fulup/opt/controller/config.d" - CONTROL_CONFIG_POST="control" - CONTROL_CONFIG_PRE="onload" - CONTROL_DOSCRIPT_PRE="doscript" - CONTROL_LUA_EVENT="luaevt" - CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d" - CONTROL_MAXPATH_LEN=255 - CONTROL_ONLOAD_PROFILE="onload-default-profile" - CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug" - CONTROL_SUPPORT_LUA - CTL_PLUGIN_MAGIC=2468013579 - MAX_LINEAR_DB_SCALE=24 - MAX_SND_CARD=16 - NATIVE_LINUX - TLV_BYTE_SIZE=256 - audio_plugin_sample_EXPORTS - - + ../../../opt/include - ../../../opt/include/alsa - /usr/include/p11-kit-1 - /usr/include/json-c - /usr/include/lua5.3 - Audio-Common build/Controller-afb - - CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/home/fulup/opt/controller/config.d" - CONTROL_CONFIG_POST="control" - CONTROL_CONFIG_PRE="onload" - CONTROL_DOSCRIPT_PRE="doscript" - CONTROL_LUA_EVENT="luaevt" - CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d" - CONTROL_MAXPATH_LEN=255 - CONTROL_ONLOAD_PROFILE="onload-default-profile" - CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build:/home/fulup/opt/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug" - CONTROL_SUPPORT_LUA - CTL_PLUGIN_MAGIC=2468013579 - MAX_LINEAR_DB_SCALE=24 - MAX_SND_CARD=16 - NATIVE_LINUX - TLV_BYTE_SIZE=256 - control_afb_EXPORTS - Audio-Common + ../../../opt/include build/HAL-afb/HAL-interface @@ -2899,6 +2781,105 @@ + + + + ../../../opt/include/afb + HAL-afb/HAL_MOST_UNICENS + ../../../opt/include/alsa + /usr/include/json-c + Audio-Common + HAL-afb/HAL-interface + ../../../opt/include + build/HAL-afb/HAL_MOST_UNICENS + + + + + + + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src + + + + + + + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc + + + + + + + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc + + + + + + + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src + + + + + + + HAL-afb/HAL_MOST_UNICENS + /usr/include/json-c + build/HAL-afb/HAL_MOST_UNICENS + + + + + + + ../../../opt/include/afb + HAL-afb/HAL_MOST_UNICENS + /usr/include/json-c + build/HAL-afb/HAL_MOST_UNICENS + + + + + + + ../../../opt/include/afb + HAL-afb/HAL_MOST_UNICENS + HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc + build/HAL-afb/HAL_MOST_UNICENS + + + @@ -3007,6 +2988,14 @@ + + + + ../../../opt/include/afb + Alsa-afb + + + @@ -3041,6 +3030,14 @@ + + + + ../../../opt/include/afb + Controller-afb + + + -- cgit 1.2.3-korg