From: Alexander Kutsan Date: Thu, 3 Apr 2014 08:53:59 +0000 (+0300) Subject: APPLINK-6567 Move TTS PerformInteraction to VR PerformInteraction X-Git-Tag: 3.5~128 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0df23b83ed85d607493880fcc4aed8f269250efe;p=profile%2Fivi%2Fsmartdevicelink.git APPLINK-6567 Move TTS PerformInteraction to VR PerformInteraction --- diff --git a/src/components/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt index 05223d1..d40f73e 100644 --- a/src/components/application_manager/CMakeLists.txt +++ b/src/components/application_manager/CMakeLists.txt @@ -236,8 +236,8 @@ set (HMI_COMMANDS_SOURCES ./src/commands/hmi/tts_set_global_properties_response.cc ./src/commands/hmi/tts_get_capabilities_request.cc ./src/commands/hmi/tts_get_capabilities_response.cc -./src/commands/hmi/tts_perform_interaction_request.cc -./src/commands/hmi/tts_perform_interaction_response.cc +./src/commands/hmi/vr_perform_interaction_request.cc +./src/commands/hmi/vr_perform_interaction_response.cc ./src/commands/hmi/ui_add_command_request.cc ./src/commands/hmi/ui_add_command_response.cc ./src/commands/hmi/ui_delete_command_request.cc diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h similarity index 78% rename from src/components/application_manager/include/application_manager/commands/hmi/tts_perform_interaction_request.h rename to src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h index 04057a3..b71b31b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_perform_interaction_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_PERFORM_INTERACTION_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_PERFORM_INTERACTION_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_REQUEST_H_ #include "application_manager/commands/hmi/request_to_hmi.h" @@ -40,21 +40,21 @@ namespace application_manager { namespace commands { /** - * @brief TTSPerformInteractionRequest command class + * @brief VRPerformInteractionRequest command class **/ -class TTSPerformInteractionRequest : public RequestToHMI { +class VRPerformInteractionRequest : public RequestToHMI { public: /** - * @brief TTSPerformInteractionRequest class constructor + * @brief VRPerformInteractionRequest class constructor * * @param message Incoming SmartObject message **/ - explicit TTSPerformInteractionRequest(const MessageSharedPtr& message); + explicit VRPerformInteractionRequest(const MessageSharedPtr& message); /** - * @brief TTSPerformInteractionRequest class destructor + * @brief VRPerformInteractionRequest class destructor **/ - virtual ~TTSPerformInteractionRequest(); + virtual ~VRPerformInteractionRequest(); /** * @brief Execute command @@ -62,11 +62,11 @@ class TTSPerformInteractionRequest : public RequestToHMI { virtual void Run(); private: - DISALLOW_COPY_AND_ASSIGN(TTSPerformInteractionRequest); + DISALLOW_COPY_AND_ASSIGN(VRPerformInteractionRequest); }; } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_PERFORM_INTERACTION_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_REQUEST_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_perform_interaction_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h similarity index 84% rename from src/components/application_manager/include/application_manager/commands/hmi/tts_perform_interaction_response.h rename to src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h index 08ec53b..fbf5b87 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_perform_interaction_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_PERFORM_INTERACTION_RESPONSE_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_PERFORM_INTERACTION_RESPONSE_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_RESPONSE_H_ #include "application_manager/commands/hmi/response_from_hmi.h" @@ -42,19 +42,19 @@ namespace commands { /** * @brief TTSPerformInteractionResponse command class **/ -class TTSPerformInteractionResponse : public ResponseFromHMI { +class VRPerformInteractionResponse : public ResponseFromHMI { public: /** * @brief TTSPerformInteractionResponse class constructor * * @param message Incoming SmartObject message **/ - explicit TTSPerformInteractionResponse(const MessageSharedPtr& message); + explicit VRPerformInteractionResponse(const MessageSharedPtr& message); /** * @brief TTSPerformInteractionResponse class destructor **/ - virtual ~TTSPerformInteractionResponse(); + virtual ~VRPerformInteractionResponse(); /** * @brief Execute command @@ -62,11 +62,11 @@ class TTSPerformInteractionResponse : public ResponseFromHMI { virtual void Run(); private: - DISALLOW_COPY_AND_ASSIGN(TTSPerformInteractionResponse); + DISALLOW_COPY_AND_ASSIGN(VRPerformInteractionResponse); }; } // namespace commands } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_TTS_PERFORM_INTERACTION_RESPONSE_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VR_PERFORM_INTERACTION_RESPONSE_H_ diff --git a/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h index 175e551..912433c 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h @@ -145,7 +145,7 @@ class PerformInteractionRequest : public CommandRequestImpl { * @param app_id Application ID * */ - void SendTTSPerformInteractionRequest( + void SendVRPerformInteractionRequest( application_manager::ApplicationSharedPtr const app); /* diff --git a/src/components/application_manager/src/commands/hmi/tts_perform_interaction_request.cc b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc similarity index 85% rename from src/components/application_manager/src/commands/hmi/tts_perform_interaction_request.cc rename to src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc index a619021..6de32dc 100644 --- a/src/components/application_manager/src/commands/hmi/tts_perform_interaction_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc @@ -30,22 +30,22 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_perform_interaction_request.h" +#include "application_manager/commands/hmi/vr_perform_interaction_request.h" namespace application_manager { namespace commands { -TTSPerformInteractionRequest::TTSPerformInteractionRequest( +VRPerformInteractionRequest::VRPerformInteractionRequest( const MessageSharedPtr& message) : RequestToHMI(message) { } -TTSPerformInteractionRequest::~TTSPerformInteractionRequest() { +VRPerformInteractionRequest::~VRPerformInteractionRequest() { } -void TTSPerformInteractionRequest::Run() { - LOG4CXX_INFO(logger_, "TTSPerformInteractionRequest::Run"); +void VRPerformInteractionRequest::Run() { + LOG4CXX_INFO(logger_, "VRPerformInteractionRequest::Run"); SendRequest(); } diff --git a/src/components/application_manager/src/commands/hmi/tts_perform_interaction_response.cc b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc similarity index 84% rename from src/components/application_manager/src/commands/hmi/tts_perform_interaction_response.cc rename to src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc index 2ddacca..1d443bf 100644 --- a/src/components/application_manager/src/commands/hmi/tts_perform_interaction_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc @@ -29,22 +29,22 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_perform_interaction_response.h" +#include "application_manager/commands/hmi/vr_perform_interaction_response.h" namespace application_manager { namespace commands { -TTSPerformInteractionResponse::TTSPerformInteractionResponse( +VRPerformInteractionResponse::VRPerformInteractionResponse( const MessageSharedPtr& message) : ResponseFromHMI(message) { } -TTSPerformInteractionResponse::~TTSPerformInteractionResponse() { +VRPerformInteractionResponse::~VRPerformInteractionResponse() { } -void TTSPerformInteractionResponse::Run() { - LOG4CXX_INFO(logger_, "TTSPerformInteractionResponse::Run"); +void VRPerformInteractionResponse::Run() { + LOG4CXX_INFO(logger_, "VRPerformInteractionResponse::Run"); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc index ca2fd4b..9d1dae8 100644 --- a/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc +++ b/src/components/application_manager/src/commands/mobile/perform_interaction_request.cc @@ -155,7 +155,7 @@ void PerformInteractionRequest::Run() { } app->set_perform_interaction_active(correlation_id); - SendTTSPerformInteractionRequest(app); + SendVRPerformInteractionRequest(app); SendUIPerformInteractionRequest(app); break; } @@ -166,7 +166,7 @@ void PerformInteractionRequest::Run() { } app->set_perform_interaction_active(correlation_id); - SendTTSPerformInteractionRequest(app); + SendVRPerformInteractionRequest(app); SendUIPerformInteractionRequest(app); break; } @@ -182,7 +182,7 @@ void PerformInteractionRequest::Run() { // TODO(DK): need to implement timeout app->set_perform_interaction_active(correlation_id); - SendTTSPerformInteractionRequest(app); + SendVRPerformInteractionRequest(app); SendUIPerformInteractionRequest(app); break; } @@ -221,7 +221,7 @@ void PerformInteractionRequest::on_event(const event_engine::Event& event) { ProcessAppUnregisteredNotification(event.smart_object()); break; } - case hmi_apis::FunctionID::TTS_PerformInteraction: { + case hmi_apis::FunctionID::VR_PerformInteraction: { LOG4CXX_INFO(logger_, "Received TTS_PerformInteraction"); tts_perform_interaction_code_ = static_cast( event.smart_object()[strings::params][hmi_response::code].asInt()); @@ -473,7 +473,7 @@ void PerformInteractionRequest::CreateUIPerformInteraction( &msg_params, true); } -void PerformInteractionRequest::SendTTSPerformInteractionRequest( +void PerformInteractionRequest::SendVRPerformInteractionRequest( application_manager::ApplicationSharedPtr const app) { smart_objects::SmartObject msg_params = smart_objects::SmartObject(smart_objects::SmartType_Map); @@ -554,7 +554,7 @@ void PerformInteractionRequest::SendTTSPerformInteractionRequest( msg_params[strings::timeout] = default_timeout_; } - SendHMIRequest(hmi_apis::FunctionID::TTS_PerformInteraction, &msg_params, + SendHMIRequest(hmi_apis::FunctionID::VR_PerformInteraction, &msg_params, true); } diff --git a/src/components/application_manager/src/hmi_command_factory.cc b/src/components/application_manager/src/hmi_command_factory.cc index 4fbf087..0552790 100644 --- a/src/components/application_manager/src/hmi_command_factory.cc +++ b/src/components/application_manager/src/hmi_command_factory.cc @@ -136,8 +136,8 @@ #include "application_manager/commands/hmi/tts_set_global_properties_response.h" #include "application_manager/commands/hmi/tts_get_capabilities_request.h" #include "application_manager/commands/hmi/tts_get_capabilities_response.h" -#include "application_manager/commands/hmi/tts_perform_interaction_request.h" -#include "application_manager/commands/hmi/tts_perform_interaction_response.h" +#include "application_manager/commands/hmi/vr_perform_interaction_request.h" +#include "application_manager/commands/hmi/vr_perform_interaction_response.h" #include "application_manager/commands/hmi/vi_is_ready_request.h" #include "application_manager/commands/hmi/vi_is_ready_response.h" #include "application_manager/commands/hmi/vi_read_did_request.h" @@ -1904,11 +1904,11 @@ CommandSharedPtr HMICommandFactory::CreateCommand( } break; } - case hmi_apis::FunctionID::TTS_PerformInteraction: { + case hmi_apis::FunctionID::VR_PerformInteraction: { if (is_response) { - command.reset(new commands::TTSPerformInteractionResponse(message)); + command.reset(new commands::VRPerformInteractionResponse(message)); } else { - command.reset(new commands::TTSPerformInteractionRequest(message)); + command.reset(new commands::VRPerformInteractionRequest(message)); } break; }