From 3dbb28794e59dd8b6d885edbc290e62e4889f272 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Thu, 20 Dec 2018 11:39:25 +0100 Subject: Use latest version of controller submodule. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes of controller: (4ddd789 - Romain Forlot) memleak fixes (76e47a2 - Romain Forlot) Retrieve by default an int64 instead of int (61f072c - Romain Forlot) New function to retrieve Api's name from LUA (0249030 - Romain Forlot) Handle number and boolean to subcall an api's verb (8069ee6 - Romain Forlot) Fix: compiling a controller without LUA support (88d6ac0 - Frederic Marec) Fix Parse plugin (e849d36 - Clément Bénier) AFB:servsync: add string for query argument (303022b - Romain Forlot) Reworked pluginConfig function (0384c9a - Romain Forlot) Retrieve plugin list from api rather than a global (5865119 - Romain Forlot) Add setter/getter for user free defined pointer (c76dc6c - Romain Forlot) Pass the plugin to action. (a492cbf - Romain Forlot) Abort if one required API is missing (8e49f8d - Jonathan Aillet) Correct an error when no plugins are defined (73eec54 - Jonathan Aillet) Decrease print level when no onload action (ff20c39 - Jonathan Aillet) Add a 'params' fields for controller plugins (6abf6ad - Jonathan Aillet) Call wasn't done correctly in 'CtlConfigExec' (e37c3a8 - Romain Forlot) Add an Init step to the plugins load (dcf433f - Romain Forlot) Add ctlPlugins array to the ctlConfig structure (1d6110f - Jan-Simon Möller) Add gitreview file for flounder branch (d6eb01e - Romain Forlot) Change loading configuration object behavior (c3a70d7 - CorentinLGS) app-controller-submodule doc: Changed doc to fit new format. (82820f4 - Romain Forlot) Fix: compatibility with binder FF.RC4 (02bbf59 - Romain Forlot) Fix: Wrong variable definition (bdf1a6b - Thierry Bultel) ctl-lua: Fixed memory corruption (4386ec5 - Romain Forlot) Migration to v3 (789a8ae - Romain Forlot) Adds v3 function to get binding settings (3891dcc - Romain Forlot) New function returning the binding root directory (e7132f1 - Romain Forlot) Change the default GLOB pattern (36ed31c - Romain Forlot) Fix wrong computed length (29307ea - Romain Forlot) Add path to the installed widget path. (191292f - CorentinLGS) Controller: Converted README to a gitbook version. (4e30eb1 - Romain Forlot) New defaults useful functions on lua table (61cbc9a - Romain Forlot) More precise log message when loading a Lua file (535df7f - Romain Forlot) Fix: wrong legacy function signature (b79a761 - Romain Forlot) Split loading JSON controller file. (c3d7de2 - Romain Forlot) Release arguments once C function returned. (a58d83b - Romain Forlot) Fix : typo introduced in a previous commit. (86f65bd - 8000ff) Fixed character counting that was shortening paths (e32d98c - Jonathan Aillet) Keep json unmodified during action execution (88892db - Romain Forlot) Use prefix variable to find controller's plugins Change-Id: I4de78e4e3d82a2d6209455d5ff539e74931b812b Signed-off-by: Loïc Collignon --- ahl-binding/ahl-binding.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ahl-binding') diff --git a/ahl-binding/ahl-binding.cpp b/ahl-binding/ahl-binding.cpp index ce31499..56fc323 100644 --- a/ahl-binding/ahl-binding.cpp +++ b/ahl-binding/ahl-binding.cpp @@ -327,12 +327,12 @@ int ahl_binding_t::load_controller_config(const std::string& path) static CtlSectionT controller_sections[] = { - {.key = "plugins", .uid = nullptr, .info = nullptr, .loadCB = PluginConfig, .handle = nullptr, .actions = nullptr}, - {.key = "onload", .uid = nullptr, .info = nullptr, .loadCB = OnloadConfig, .handle = nullptr, .actions = nullptr}, - {.key = "controls", .uid = nullptr, .info = nullptr, .loadCB = ControlConfig, .handle = nullptr, .actions = nullptr}, - {.key = "events", .uid = nullptr, .info = nullptr, .loadCB = EventConfig, .handle = nullptr, .actions = nullptr}, - {.key = "roles", .uid = nullptr, .info = nullptr, .loadCB = ahl_api_config_roles, .handle = nullptr, .actions = nullptr }, - {.key = nullptr, .uid = nullptr, .info = nullptr, .loadCB = nullptr, .handle = nullptr, .actions = nullptr} + {.key = "plugins", .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = PluginConfig, .handle = nullptr, .actions = nullptr}, + {.key = "onload", .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = OnloadConfig, .handle = nullptr, .actions = nullptr}, + {.key = "controls", .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = ControlConfig, .handle = nullptr, .actions = nullptr}, + {.key = "events", .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = EventConfig, .handle = nullptr, .actions = nullptr}, + {.key = "roles", .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = ahl_api_config_roles, .handle = nullptr, .actions = nullptr }, + {.key = nullptr, .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = nullptr, .handle = nullptr, .actions = nullptr} }; CtlLoadSections(handle_, controller_config, controller_sections); -- cgit 1.2.3-korg