Modification about conf definition

- Argument for each signal subscription. (getSignalsArgs)
- differentiation between Signal as raw signal from another API
 and virtual signal depending upon other signals
- changing way to specify function with uri that specify everythings
 that could be needed to invoke a function.

Change-Id: I8917c5ae3c2c1e3fa48ddfdda41fc75eaba32bb7
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

1 files changed, 4 insertions, 4 deletions

diff --git a/signal-composer-binding/source.hpp b/signal-composer-binding/source.hpp
index c295b6e..560a137 100644
--- a/signal-composer-binding/source.hpp
+++ b/signal-composer-binding/source.hpp
@@ -26,19 +26,19 @@ private:
 	std::string api_;
 	std::string info_;
 	CtlActionT* init_;
-	CtlActionT* getSignal_;
+	CtlActionT* getSignals_;
 
-	std::vector<std::shared_ptr<Signal>> signalsList_;
+	std::map<std::shared_ptr<Signal>, bool> signalsMap_;
 
 public:
 	SourceAPI();
 	SourceAPI(const std::string& api, const std::string& info, CtlActionT* init, CtlActionT* getSignal);
 
 	std::string api() const;
-	void addSignal(const std::string& id, std::vector<std::string>& sources, const std::string& sClass, const std::string& unit, double frequency, CtlActionT* onReceived);
+	void addSignal(const std::string& id, const std::string& event, std::vector<std::string>& sources, const std::string& sClass, const std::string& unit, double frequency, CtlActionT* onReceived, json_object* getSignalsArgs);
 
 	std::vector<std::shared_ptr<Signal>> getSignals() const;
 	std::shared_ptr<Signal> searchSignal(const std::string& name) const;
 
-	int makeSubscription() const;
+	int makeSubscription();
 };