From e599b4ba129df475a9c8bb8290c3803f9dda664a Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 7 Dec 2017 18:49:09 +0100 Subject: Load additionnals object at runtime Later integrated in controller submodule Change-Id: I7d5c7431e60fc16cc2053747674fe4f14efd6a14 Signed-off-by: Romain Forlot --- signal-composer-binding/signal-composer.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'signal-composer-binding/signal-composer.hpp') diff --git a/signal-composer-binding/signal-composer.hpp b/signal-composer-binding/signal-composer.hpp index 6064bf2..8ae41e9 100644 --- a/signal-composer-binding/signal-composer.hpp +++ b/signal-composer-binding/signal-composer.hpp @@ -26,6 +26,7 @@ private: CtlConfigT* ctlConfig_; static CtlSectionT ctlSections_[]; ///< Config Section definition (note: controls section index should match handle retrieval in) + std::vector> newSourcesListV_; std::vector> sourcesListV_; explicit Composer(const std::string& filepath); @@ -45,6 +46,7 @@ private: static int loadSignals(AFB_ApiT apihandle, CtlSectionT* section, json_object *signalsJ); void initSourcesAPI(); + void execSignalsSubscription(); std::shared_ptr getSourceAPI(const std::string& api); void processOptions(const std::map& opts, std::shared_ptr sig, json_object* response) const; public: @@ -53,12 +55,12 @@ public: static void destroyContext(void* ctx); static std::vector parseURI(const std::string& uri); int loadConfig(const std::string& filepath); + int loadSources(json_object* sourcesJ); int loadSignals(json_object* signalsJ); + void initSignals(); CtlConfigT* ctlConfig(); std::vector> getAllSignals(); std::vector> searchSignals(const std::string& aName); json_object* getsignalValue(const std::string& sig, json_object* options); - - void execSignalsSubscription(); }; -- cgit 1.2.3-korg