diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-11-02 15:58:45 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-12-14 11:00:25 +0100 |
| commit | 6ee4db6878464642ddf9f0909748841a45b58a88 (patch) | |
| tree | 4c3588d216e903174f1281b757e98816d7323afa /signal-composer-binding/signal-composer.hpp | |
| parent | ed2c3d0267e3c5e1392635dacad2752de935d6b4 (diff) | |
Migrate to ctl-utilities library
New version of controller as a library. Loading additionnals
files from each sections.
Change-Id: I4f5e78d0baf9650cb8d1cc1da26f8e1fd73b792c
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'signal-composer-binding/signal-composer.hpp')
| -rw-r--r-- | signal-composer-binding/signal-composer.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/signal-composer-binding/signal-composer.hpp b/signal-composer-binding/signal-composer.hpp index 024336b..cd9c28f 100644 --- a/signal-composer-binding/signal-composer.hpp +++ b/signal-composer-binding/signal-composer.hpp @@ -18,7 +18,6 @@ #include <vector> #include <string> - #include "source.hpp" class Composer @@ -34,15 +33,16 @@ private: ~Composer(); CtlActionT* convert2Action(const std::string& name, json_object* action); - static int pluginsLoad(CtlSectionT *section, json_object *pluginsJ); + void loadAdditionnalFiles(json_object* filesJ); + static int pluginsLoad(AFB_ApiT apiHandle, CtlSectionT *section, json_object *pluginsJ); int loadOneSourceAPI(json_object* sourcesJ); - static int loadSourcesAPI(CtlSectionT* section, json_object *signalsJ); + static int loadSourcesAPI(AFB_ApiT apihandle, CtlSectionT* section, json_object *signalsJ); int loadOneSignal(json_object* signalsJ); - static int loadSignals(CtlSectionT* section, json_object *signalsJ); + static int loadSignals(AFB_ApiT apihandle, CtlSectionT* section, json_object *signalsJ); - int initSourcesAPI(); + void initSourcesAPI(); std::shared_ptr<SourceAPI> getSourceAPI(const std::string& api); void processOptions(const std::map<std::string, int>& opts, std::shared_ptr<Signal> sig, json_object* response) const; public: @@ -58,5 +58,5 @@ public: std::vector<std::shared_ptr<Signal>> searchSignals(const std::string& aName); json_object* getsignalValue(const std::string& sig, json_object* options); - int execSignalsSubscription(); + void execSignalsSubscription(); }; |