summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2018-04-29 22:36:12 +0200
committerFulup Ar Foll <fulup@iot.bzh>2018-04-29 22:36:12 +0200
commit8372b87f2be8fe5b8655001e92572af4d96ddbf6 (patch)
treef5a2865b59b486deedaa089ede7e5f94f99ef9fe
parentf83d651392b8556248600f2b1360b9306b845c3d (diff)
Hack config to bypass limitation and load plugin
-rw-r--r--conf.d/cmake/config.cmake4
-rw-r--r--conf.d/project/etc/4a-softmixer-config.json (renamed from conf.d/project/etc/config-softmixer-4a.json)1
-rw-r--r--mixer-binding/mixer-binding.c12
3 files changed, 7 insertions, 10 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 3ee2f8f..b1bfa96 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -18,7 +18,7 @@
# Project Info
# ------------------
-set(PROJECT_NAME softmixer-4a)
+set(PROJECT_NAME 4a-softmixer-afbd)
set(PROJECT_PRETTY_NAME "Audio SoftMixer")
set(PROJECT_DESCRIPTION "Soft Mixer for 4A (AGL Advanced Audio Architecture)")
set(PROJECT_URL "https://github.com/iotbzh/4a-softmixer")
@@ -197,7 +197,7 @@ set(AFB_REMPORT "1234" CACHE PATH "Default binder listening port")
# Print a helper message when every thing is finished
# ----------------------------------------------------
-set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --name afbd-${PROJECT_NAME} --port=${AFB_REMPORT} --workdir=${CMAKE_BINARY_DIR}/package --ldpaths=lib --roothttp=. --token=\"${AFB_TOKEN}\" --tracereq=common --verbose")
+set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --name afbd-${PROJECT_NAME} --port=${AFB_REMPORT} --workdir=${CMAKE_BINARY_DIR}/. --ldpath=package/lib --roothttp=package --token=\"${AFB_TOKEN}\" --tracereq=common --verbose")
set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
# Optional schema validator about now only XML, LUA and JSON
diff --git a/conf.d/project/etc/config-softmixer-4a.json b/conf.d/project/etc/4a-softmixer-config.json
index 345dde4..9d89f07 100644
--- a/conf.d/project/etc/config-softmixer-4a.json
+++ b/conf.d/project/etc/4a-softmixer-config.json
@@ -10,6 +10,7 @@
"plugins": [
{
"uid": "alsa-router",
+ "ldpath": "package/lib/plugins",
"info": "Map alsa-loop subdevices to 4A HAL streams"
}
],
diff --git a/mixer-binding/mixer-binding.c b/mixer-binding/mixer-binding.c
index ae83932..8fb4b50 100644
--- a/mixer-binding/mixer-binding.c
+++ b/mixer-binding/mixer-binding.c
@@ -74,6 +74,8 @@ STATIC int CtrlInitOneApi (AFB_ApiT apiHandle) {
}
// next generation dynamic API-V3 mode
+#include <signal.h>
+
STATIC int CtrlLoadOneApi (void *cbdata, AFB_ApiT apiHandle) {
CtlConfigT *ctrlConfig = (CtlConfigT*) cbdata;
@@ -81,8 +83,6 @@ STATIC int CtrlLoadOneApi (void *cbdata, AFB_ApiT apiHandle) {
// save closure as api's data context
afb_dynapi_set_userdata(apiHandle, ctrlConfig);
- AFB_ApiNotice (apiHandle, "debug1");
-
// add static controls verbs
int err = CtrlLoadStaticVerbs (apiHandle, CtrlApiVerbs);
if (err) {
@@ -90,13 +90,9 @@ STATIC int CtrlLoadOneApi (void *cbdata, AFB_ApiT apiHandle) {
goto OnErrorExit;
}
- AFB_ApiNotice (apiHandle, "debug2");
-
// load section for corresponding API
err= CtlLoadSections(apiHandle, ctrlConfig, ctrlSections);
- AFB_ApiNotice (apiHandle, "debug3");
-
// declare an event event manager for this API;
afb_dynapi_on_event(apiHandle, CtrlDispatchApiEvent);
@@ -119,9 +115,9 @@ PUBLIC int afbBindingVdyn(afb_dynapi *apiHandle) {
const char *dirList= getenv("CONTROL_CONFIG_PATH");
if (!dirList) dirList=CONTROL_CONFIG_PATH;
- const char *configPath = CtlConfigSearch(apiHandle, dirList, "config-");
+ const char *configPath = CtlConfigSearch(apiHandle, dirList, "4a-");
if (!configPath) {
- AFB_ApiError(apiHandle, "CtlPreInit: No config-%s-* config found in %s ", GetBinderName(), dirList);
+ AFB_ApiError(apiHandle, "CtlPreInit: No 4a-%s-* config found in %s ", GetBinderName(), dirList);
goto OnErrorExit;
}