diff options
Diffstat (limited to 'conf.d')
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 7 | ||||
| -rw-r--r-- | conf.d/project/etc/4a-softmixer-config.json | 22 |
3 files changed, 12 insertions, 17 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject 829dd697c1797893753962df6af1a9ad1592263 +Subproject 6621af007c13b12bb1d33d0edf75db600a42f74 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 7a2cbf3..afba6b7 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -74,7 +74,7 @@ set (PKG_REQUIRED_LIST afb-daemon>=4.0 libmicrohttpd>=0.9.55 uuid - alsa>=1.1.2 + alsa>=1.1.2 ) # Prefix path where will be installed the files @@ -130,9 +130,8 @@ list(APPEND link_libraries afb-helpers) # CACHE STRING "Compilation flags for RELEASE build type.") set(CONTROL_SUPPORT_LUA 1) -list(APPEND PKG_REQUIRED_LIST lua>=5.3) -add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_BINARY_DIR}/package/lib/plugins") -add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc") +add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins") +add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_BINARY_DIR}/package/etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc") add_definitions(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/data") add_definitions(-DCTL_PLUGIN_MAGIC=987456123) add_definitions(-DUSE_API_DYN=1 -DAFB_BINDING_VERSION=dyn) diff --git a/conf.d/project/etc/4a-softmixer-config.json b/conf.d/project/etc/4a-softmixer-config.json index 2b4db11..e67709f 100644 --- a/conf.d/project/etc/4a-softmixer-config.json +++ b/conf.d/project/etc/4a-softmixer-config.json @@ -1,19 +1,18 @@ { - "schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", + "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", "metadata": { "uid": "Soft Mixer", "version": "1.0", "api": "softmixer", "info": "Soft Mixer emulating hardware mixer" }, - "plugins": [ + "resources": [ { "uid": "alsa-softmixer", "info": "Map alsa-loop subdevices to 4A HAL streams", "spath":"./plugins/alsa:../conf.d/project/lua.d", - "file": ["alsa-router.ctlso", "softmixer-simple.lua"], - "lua2c_prefix": "smix", - "lua2c": ["snd_cards", "snd_zones", "snd_loops", "snd_streams"] + "libs": ["alsa-router.ctlso", "softmixer-simple.lua"], + "lua": {"prefix":"smix","functions": ["snd_cards", "snd_zones", "snd_loops", "snd_streams"]} } ], @@ -21,26 +20,23 @@ { "uid": "init-soft-mixer", "info": "Initialise Audio Router", - "uri": "lua://alsa-softmixer", - "function": "_init_softmixer_" + "action": "lua://alsa-softmixer#_init_softmixer_" } ], "controls": [ { "uid": "mixer-config", - "uri": "lua://alsa-softmixer", - "function": "_mixer_config_" + "action": "lua://alsa-softmixer#_mixer_config_" }, { "uid": "snd-cards", - "uri": "plugin://alsa-softmixer", - "function": "snd_cards" + "action": "plugin://alsa-softmixer#snd_cards" }, { "uid": "snd-zone", - "uri": "plugin://alsa-softmixer", - "function": "snd_zones" + "action": "plugin://alsa-softmixer#snd_zones" } ] + } |