summaryrefslogtreecommitdiffstats
path: root/signal-composer-binding/signal-composer.hpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-09-28 20:06:08 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-12-14 11:00:25 +0100
commit7b5a679d0ae117eb6b5bbcf516bf9e5051afd7dd (patch)
tree9b66692a0d25abba64a00bc8f5267a46007d70f1 /signal-composer-binding/signal-composer.hpp
parent0ea61ebe60b1be3b33c400bf1a8ebf9cc6644349 (diff)
Inheritance of some signals parameters from source
Stores sourceAPI as shared_ptr too. Change-Id: I2dcd919b3053f29812a9bece14feb4f620f23ce3 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.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/signal-composer-binding/signal-composer.hpp b/signal-composer-binding/signal-composer.hpp
index de7a799..f472c4f 100644
--- a/signal-composer-binding/signal-composer.hpp
+++ b/signal-composer-binding/signal-composer.hpp
@@ -28,7 +28,7 @@ private:
CtlConfigT* ctlConfig_;
static CtlSectionT ctlSections_[]; ///< Config Section definition (note: controls section index should match handle retrieval in)
- std::vector<SourceAPI> sourcesListV_;
+ std::vector<std::shared_ptr<SourceAPI>> sourcesListV_;
explicit Composer(const std::string& filepath);
Composer();
@@ -43,8 +43,8 @@ private:
static int loadSignals(CtlSectionT* section, json_object *signalsJ);
int initSourcesAPI();
- SourceAPI* getSourceAPI(const std::string& api);
- void processOptions(const char** opts, std::shared_ptr<Signal> sig, json_object* response) const;
+ 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:
static Composer& instance();
static void* createContext(void* ctx);