diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-03-29 17:44:48 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-04-19 17:30:28 +0200 |
| commit | cbfe3d859515a593fbad5edd82f5a9162749476b (patch) | |
| tree | 5deca53d5963be2e02dd7df0a1f94c5aa7203420 /signal-composer-binding/signal-composer.cpp | |
| parent | a53418f75db2d4a9f0cb941de812b27024381b07 (diff) | |
Git submodule migration to separated librariesguppy_7.0.2guppy/7.0.27.0.2
Replace controller binder functions definition with the binder ones
and remove the submodules in favor of the separated libraries.
Bug-AGL: SPEC-2139
Change-Id: I06e5e7a03a918bf0ce139636104e1a73d2442a09
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'signal-composer-binding/signal-composer.cpp')
| -rw-r--r-- | signal-composer-binding/signal-composer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/signal-composer-binding/signal-composer.cpp b/signal-composer-binding/signal-composer.cpp index 324d96e..9abe54e 100644 --- a/signal-composer-binding/signal-composer.cpp +++ b/signal-composer-binding/signal-composer.cpp @@ -84,7 +84,7 @@ Composer::~Composer() free(ctlConfig_); } -CtlActionT* Composer::convert2Action(AFB_ApiT apihandle, const std::string& name, json_object* actionJ) +CtlActionT* Composer::convert2Action(afb_api_t apihandle, const std::string& name, json_object* actionJ) { CtlActionT *ctlAction = new CtlActionT; @@ -96,7 +96,7 @@ CtlActionT* Composer::convert2Action(AFB_ApiT apihandle, const std::string& name return nullptr; } -int Composer::loadOneSourceAPI(AFB_ApiT apihandle, json_object* sourceJ) +int Composer::loadOneSourceAPI(afb_api_t apihandle, json_object* sourceJ) { json_object *initJ = nullptr, *getSignalsJ = nullptr, @@ -158,7 +158,7 @@ int Composer::loadOneSourceAPI(AFB_ApiT apihandle, json_object* sourceJ) return err; } -int Composer::loadSourcesAPI(AFB_ApiT apihandle, CtlSectionT* section, json_object *sourcesJ) +int Composer::loadSourcesAPI(afb_api_t apihandle, CtlSectionT* section, json_object *sourcesJ) { int err = 0; Composer& composer = instance(); @@ -209,7 +209,7 @@ int Composer::loadSourcesAPI(AFB_ApiT apihandle, CtlSectionT* section, json_obje return err; } -int Composer::loadOneSignal(AFB_ApiT apihandle, json_object* signalJ) +int Composer::loadOneSignal(afb_api_t apihandle, json_object* signalJ) { json_object *onReceivedJ = nullptr, *dependsJ = nullptr, @@ -334,7 +334,7 @@ int Composer::loadOneSignal(AFB_ApiT apihandle, json_object* signalJ) return err; } -int Composer::loadSignals(AFB_ApiT apihandle, CtlSectionT* section, json_object *signalsJ) +int Composer::loadSignals(afb_api_t apihandle, CtlSectionT* section, json_object *signalsJ) { int err = 0; Composer& composer = instance(); @@ -421,7 +421,7 @@ void Composer::destroyContext(void* ctx) delete(reinterpret_cast<clientAppCtx*>(ctx)); } -int Composer::loadConfig(AFB_ApiT api, std::string& filepath) +int Composer::loadConfig(afb_api_t api, std::string& filepath) { const char *dirList= getenv("CONTROL_CONFIG_PATH"); if (!dirList) dirList=CONTROL_CONFIG_PATH; @@ -482,7 +482,7 @@ void Composer::initSourcesAPI() } } -int Composer::initSignals(AFB_ReqT request) +int Composer::initSignals(afb_req_t request) { for(int i=0; i < sourcesListV_.size(); i++) { @@ -581,7 +581,7 @@ json_object* Composer::getsignalValue(const std::string& sig, json_object* optio return finalResponse; } -int Composer::execSignalsSubscription(AFB_ReqT request) +int Composer::execSignalsSubscription(afb_req_t request) { int err = 0;; for(std::shared_ptr<SourceAPI> srcAPI: sourcesListV_) |