Refactored VSHL into vshl-core and vshl-capabilities.

vshl-core: This API is responsible for request arbitration. Verbs exposed are

1. startListening
2. cancelListening
3. subscribe
4. enumerateVoiceAgents
5. setDefaultVoiceAgent Used by applications to subscribe to dialog, connection and auth states of underlying low level voiceagent bindings. Used by applications to trigger voice recognition routine of the underlying low level voiceagent binding.

vshl-capabilities: This API exposes publish and subscribe methods for all the speech framework domains/capabilities. For eg. navigation, phonecontrol etc. This API is used by apps and low level voice agent binding to subscribe and publish these capability messages whenever applicable. The code for this is agl-service-voice-high-capabilities repository.

This specific commit is for vshl-core API.

Change-Id: I1101db19b57ee918482a178843641b088508ac5d
Signed-off-by: Naveen Bobbili  <nbobbili@amazon.com>

1 files changed, 18 insertions, 14 deletions

diff --git a/src/plugins/voiceagents/VoiceAgentsDataManager.h b/src/plugins/voiceagents/VoiceAgentsDataManager.h
index a4c9143..a91d7eb 100644
--- a/src/plugins/voiceagents/VoiceAgentsDataManager.h
+++ b/src/plugins/voiceagents/VoiceAgentsDataManager.h
@@ -27,8 +27,7 @@
 #include "interfaces/voiceagents/IVoiceAgentsChangeObserver.h"
 #include "voiceagents/include/VoiceAgent.h"
 #include "voiceagents/include/VoiceAgentEventsHandler.h"
-
-namespace vshl {
+namespace vshlcore {
 namespace voiceagents {
 /*
  * This class implements the data model for voiceagents.
@@ -39,8 +38,8 @@ class VoiceAgentsDataManager {
 public:
     // Create a VoiceAgentsDataManager.
     static std::unique_ptr<VoiceAgentsDataManager> create(
-        shared_ptr<vshl::common::interfaces::ILogger> logger,
-        shared_ptr<vshl::common::interfaces::IAFBApi> afbApi);
+        shared_ptr<vshlcore::common::interfaces::ILogger> logger,
+        shared_ptr<vshlcore::common::interfaces::IAFBApi> afbApi);
 
     /**
      * Activates the list of voiceagents.
@@ -84,22 +83,22 @@ public:
     bool removeVoiceAgent(const string& voiceAgentId);
 
     // Returns the set of all voice agents in @c VoiceAgentsDataManger cache
-    std::set<std::shared_ptr<vshl::common::interfaces::IVoiceAgent>> getAllVoiceAgents();
+    std::set<std::shared_ptr<vshlcore::common::interfaces::IVoiceAgent>> getAllVoiceAgents();
 
     // Returns the event filter that belongs to the core module.
-    shared_ptr<vshl::common::interfaces::IEventFilter> getEventFilter() const;
+    shared_ptr<vshlcore::common::interfaces::IEventFilter> getEventFilter() const;
 
     // Subscribe to an event coming from the voiceagent.
     bool subscribeToVshlEventFromVoiceAgent(
-        vshl::common::interfaces::IAFBRequest& request,
+        vshlcore::common::interfaces::IAFBRequest& request,
         const string eventName,
         const string voiceagentId);
 
     // Adds a new voiceagent change observer.
-    bool addVoiceAgentsChangeObserver(shared_ptr<vshl::common::interfaces::IVoiceAgentsChangeObserver> observer);
+    bool addVoiceAgentsChangeObserver(shared_ptr<vshlcore::common::interfaces::IVoiceAgentsChangeObserver> observer);
 
     // Removes the  voiceagent change observer from the list.
-    bool removeVoiceAgentsChangeObserver(shared_ptr<vshl::common::interfaces::IVoiceAgentsChangeObserver> observer);
+    bool removeVoiceAgentsChangeObserver(shared_ptr<vshlcore::common::interfaces::IVoiceAgentsChangeObserver> observer);
 
     // Destructor
     ~VoiceAgentsDataManager();
@@ -107,14 +106,17 @@ public:
 private:
     // Constructor
     VoiceAgentsDataManager(
-        shared_ptr<vshl::common::interfaces::ILogger> logger,
-        shared_ptr<vshl::common::interfaces::IAFBApi> afbApi);
+        shared_ptr<vshlcore::common::interfaces::ILogger> logger,
+        shared_ptr<vshlcore::common::interfaces::IAFBApi> afbApi);
+
+    // Sets the voiceagent ID
+    bool sendVoiceAgentIdToVA(const shared_ptr<VoiceAgent>& voiceAgent);
 
     // Binding API reference
-    shared_ptr<vshl::common::interfaces::IAFBApi> mAfbApi;
+    shared_ptr<vshlcore::common::interfaces::IAFBApi> mAfbApi;
 
     // A list of all the voiceagent change observers
-    unordered_set<shared_ptr<vshl::common::interfaces::IVoiceAgentsChangeObserver>> mVoiceAgentChangeObservers;
+    unordered_set<shared_ptr<vshlcore::common::interfaces::IVoiceAgentsChangeObserver>> mVoiceAgentChangeObservers;
 
     // A map of voiceagents grouped by ID
     unordered_map<string, shared_ptr<VoiceAgent>> mVoiceAgents;
@@ -126,7 +128,9 @@ private:
     string mDefaultVoiceAgentId;
 
     // Logger
-    shared_ptr<vshl::common::interfaces::ILogger> mLogger;
+    shared_ptr<vshlcore::common::interfaces::ILogger> mLogger;
+
+    bool mAlreadyPeformedSubscriptions;
 };
 
 }  // namespace voiceagents