From 9eb3a90df3681586b58146b47eea7f3848c348a0 Mon Sep 17 00:00:00 2001 From: Naveen Bobbili Date: Mon, 25 Feb 2019 17:24:29 -0800 Subject: 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 --- src/plugins/core/include/VRAgentsObserver.h | 17 ++++++++-------- src/plugins/core/include/VRRequest.h | 21 ++++++++++---------- .../core/include/VRRequestProcessorDelegate.h | 23 +++++++++++----------- 3 files changed, 29 insertions(+), 32 deletions(-) (limited to 'src/plugins/core/include') diff --git a/src/plugins/core/include/VRAgentsObserver.h b/src/plugins/core/include/VRAgentsObserver.h index d4c0c7b..ce1bd43 100644 --- a/src/plugins/core/include/VRAgentsObserver.h +++ b/src/plugins/core/include/VRAgentsObserver.h @@ -22,15 +22,14 @@ #include "utilities/logging/Logger.h" using namespace std; - -namespace vshl { +namespace vshlcore { namespace core { /* * This class will observe the changes to the voiceagents data and transfers * the actual handling responsibility to its delegate. */ class VRAgentsObserver - : public vshl::common::interfaces::IVoiceAgentsChangeObserver { + : public vshlcore::common::interfaces::IVoiceAgentsChangeObserver { public: // Create a VRAgentsObserver. static shared_ptr @@ -40,18 +39,18 @@ public: protected: void OnDefaultVoiceAgentChanged( - shared_ptr defaultVoiceAgent) + shared_ptr defaultVoiceAgent) override; void OnVoiceAgentAdded( - shared_ptr voiceAgent) override; + shared_ptr voiceAgent) override; void OnVoiceAgentRemoved( - shared_ptr voiceAgent) override; + shared_ptr voiceAgent) override; void OnVoiceAgentActiveWakeWordChanged( - shared_ptr voiceAgent) override; + shared_ptr voiceAgent) override; void OnVoiceAgentActivated( - shared_ptr voiceAgent) override; + shared_ptr voiceAgent) override; void OnVoiceAgentDeactivated( - shared_ptr voiceAgent) override; + shared_ptr voiceAgent) override; private: // Constructor diff --git a/src/plugins/core/include/VRRequest.h b/src/plugins/core/include/VRRequest.h index 522ec78..8b9e842 100644 --- a/src/plugins/core/include/VRRequest.h +++ b/src/plugins/core/include/VRRequest.h @@ -22,8 +22,7 @@ #include "interfaces/voiceagents/IVoiceAgent.h" using namespace std; - -namespace vshl { +namespace vshlcore { namespace core { /* * This class implements the notion of a Voice Recognition Request. @@ -37,10 +36,10 @@ public: // Create a VRRequest. static unique_ptr create( - shared_ptr logger, - shared_ptr afbApi, + shared_ptr logger, + shared_ptr afbApi, string requestId, - shared_ptr voiceAgent); + shared_ptr voiceAgent); // Destructor ~VRRequest(); @@ -56,22 +55,22 @@ public: private: // Constructor VRRequest( - shared_ptr logger, - shared_ptr afbApi, + shared_ptr logger, + shared_ptr afbApi, const string requestId, - shared_ptr voiceAgent); + shared_ptr voiceAgent); // Binding API reference. - shared_ptr mApi; + shared_ptr mApi; // Voice agent associated with this request - shared_ptr mVoiceAgent; + shared_ptr mVoiceAgent; // Request ID string mRequestId; // Logger - shared_ptr mLogger; + shared_ptr mLogger; }; } // namespace core diff --git a/src/plugins/core/include/VRRequestProcessorDelegate.h b/src/plugins/core/include/VRRequestProcessorDelegate.h index 94b7304..2c36d38 100644 --- a/src/plugins/core/include/VRRequestProcessorDelegate.h +++ b/src/plugins/core/include/VRRequestProcessorDelegate.h @@ -25,8 +25,7 @@ #include "utilities/uuid/UUIDGeneration.h" using namespace std; - -namespace vshl { +namespace vshlcore { namespace core { /* * This is a delegate for VRRequestProcessor actions. @@ -39,22 +38,22 @@ class VRRequestProcessorDelegate { public: // create method static shared_ptr create( - shared_ptr logger, - shared_ptr afbApi); + shared_ptr logger, + shared_ptr afbApi); // Destructor ~VRRequestProcessorDelegate(); // Set default voiceagent - void setDefaultVoiceAgent(shared_ptr voiceAgent); + void setDefaultVoiceAgent(shared_ptr voiceAgent); // Get the default voiceagent - shared_ptr getDefaultVoiceAgent() const; + shared_ptr getDefaultVoiceAgent() const; // Add new request to the list and start processing it. // New request is created and startListening on the // voiceagent is called. - string startRequestForVoiceAgent(shared_ptr voiceAgent); + string startRequestForVoiceAgent(shared_ptr voiceAgent); // Cancel all requests void cancelAllRequests(); @@ -66,20 +65,20 @@ public: private: // Constructor VRRequestProcessorDelegate( - shared_ptr logger, - shared_ptr afbApi); + shared_ptr logger, + shared_ptr afbApi); // Binding API reference - shared_ptr mApi; + shared_ptr mApi; // Default voiceagent - shared_ptr mDefaultVoiceAgent; + shared_ptr mDefaultVoiceAgent; // A map of voiceagent IDs and their respective VR Request objects. unordered_map> mVRRequests; // Logger - shared_ptr mLogger; + shared_ptr mLogger; }; } // namespace core -- cgit 1.2.3-korg