diff options
| author |   Thierry Bultel <thierry.bultel@iot.bzh> | 2018-07-03 18:02:56 +0200 |
|---|---|---|
| committer | Thierry Bultel <thierry.bultel@iot.bzh> | 2018-07-03 18:02:56 +0200 |
| commit | a7486934a8c1f678da0d99c3e4151a67bb3c6cae (patch) | |
| tree | 8b084ff2c12d054a4493b602f72fe3c78506677e | |
| parent | 1065a98987848cd89a116c440ed476c96488ec1d (diff) | |
Uses the APIv3 compatibility to vdyn
Uses the new compatibility for vdyn based on V3
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
| m--------- | app-afb-helpers-submodule | 0 | ||||
| m--------- | app-controller-submodule | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 2 | ||||
| -rw-r--r-- | mixer-binding/mixer-binding.c | 3 | ||||
| -rw-r--r-- | plugins/alsa/alsa-api-mixer.c | 12 |
5 files changed, 2 insertions, 15 deletions
diff --git a/app-afb-helpers-submodule b/app-afb-helpers-submodule -Subproject c7cd527a8350f736b8013f65db6f5a52b8cb05d +Subproject 797d04f1906fc6a1bc80ee1c0eb8eb3fe93d0c6 diff --git a/app-controller-submodule b/app-controller-submodule -Subproject 0f3063b70fc10311323fec6d4493a5316e51d43 +Subproject b0da464b2560d2abcc286503517e6b5e915c96f diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 2104eff..1c5fedd 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -135,7 +135,7 @@ add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:$ add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/etc:${CMAKE_BINARY_DIR}/package/etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}") add_definitions(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/var:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}") add_definitions(-DCTL_PLUGIN_MAGIC=987456123) -add_definitions(-DUSE_API_DYN=1 -DAFB_BINDING_VERSION=0) +add_definitions(-DUSE_API_DYN=1 -DAFB_BINDING_VERSION=3 -DAFB_BINDING_WANT_DYNAPI=1) # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] diff --git a/mixer-binding/mixer-binding.c b/mixer-binding/mixer-binding.c index 20d4651..f79ccdb 100644 --- a/mixer-binding/mixer-binding.c +++ b/mixer-binding/mixer-binding.c @@ -93,8 +93,7 @@ OnErrorExit: return 1; } - -PUBLIC int afbBindingVdyn(afb_dynapi *apiHandle) { +PUBLIC int afbBindingEntry(afb_dynapi *apiHandle) { AFB_default = apiHandle; AFB_ApiNotice (apiHandle, "Controller in afbBindingVdyn"); diff --git a/plugins/alsa/alsa-api-mixer.c b/plugins/alsa/alsa-api-mixer.c index f17e122..e3538f8 100644 --- a/plugins/alsa/alsa-api-mixer.c +++ b/plugins/alsa/alsa-api-mixer.c @@ -634,21 +634,9 @@ OnErrorExit: return; } -STATIC void MixerPingVerb(AFB_ReqT request) { - static int count = 0; - count++; - - AFB_ReqInfo(request, "MixerAttachVerb: Controller:ping count=%d", count); - AFB_ReqSuccess(request, json_object_new_int(count), NULL); - - return; -} - - // Every HAL export the same API & Interface Mapping from SndCard to AudioLogic is done through alsaHalSndCardT STATIC AFB_ApiVerbs CtrlApiVerbs[] = { /* VERB'S NAME FUNCTION TO CALL SHORT DESCRIPTION */ - { .verb = "ping", .callback = MixerPingVerb, .info = "ping count test"}, { .verb = "attach", .callback = MixerAttachVerb, .info = "attach resources to mixer"}, { .verb = "remove", .callback = MixerRemoveVerb, .info = "remove existing mixer streams, zones, ..."}, { .verb = "info", .callback = MixerInfoVerb, .info = "list existing mixer streams, zones, ..."}, |