diff options
| author | Veronica Veremjova <vveremjova@luxoft.com> | 2017-02-24 15:43:11 +0200 |
|---|---|---|
| committer | Veronica Veremjova <vveremjova@luxoft.com> | 2017-02-24 17:36:31 +0200 |
| commit | ef6d3c8ae9a1a84df1433062bcbf8dddc7bd64ed (patch) | |
| tree | c6c4cb449be642dfb7a1b5ab5b0388f9b22b82dd | |
| parent | 1a1a89666729cb41bf9278e2fcd6a499d391f1ab (diff) | |
| download | sdl_core-ef6d3c8ae9a1a84df1433062bcbf8dddc7bd64ed.tar.gz | |
Fix TTS Capabilities
According API it should be array
| -rw-r--r-- | src/components/application_manager/src/hmi_capabilities_impl.cc | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc index c6fa321401..b78060a7d5 100644 --- a/src/components/application_manager/src/hmi_capabilities_impl.cc +++ b/src/components/application_manager/src/hmi_capabilities_impl.cc @@ -49,6 +49,8 @@ namespace Formatters = NsSmartDeviceLink::NsJSONHandler::Formatters; namespace { std::map<std::string, hmi_apis::Common_VrCapabilities::eType> vr_enum_capabilities; +std::map<std::string, hmi_apis::Common_SpeechCapabilities::eType> + tts_enum_capabilities; std::map<std::string, hmi_apis::Common_ButtonName::eType> button_enum_name; std::map<std::string, hmi_apis::Common_TextFieldName::eType> text_fields_enum_name; @@ -71,6 +73,19 @@ void InitCapabilities() { vr_enum_capabilities.insert(std::make_pair( std::string("TEXT"), hmi_apis::Common_VrCapabilities::VR_TEXT)); + tts_enum_capabilities.insert(std::make_pair( + std::string("TEXT"), hmi_apis::Common_SpeechCapabilities::SC_TEXT)); + tts_enum_capabilities.insert(std::make_pair( + std::string("SAPI_PHONEMES"), hmi_apis::Common_SpeechCapabilities::SAPI_PHONEMES)); + tts_enum_capabilities.insert(std::make_pair( + std::string("LHPLUS_PHONEMES"), hmi_apis::Common_SpeechCapabilities::LHPLUS_PHONEMES)); + tts_enum_capabilities.insert(std::make_pair( + std::string("SAPI_PHONEMES"), hmi_apis::Common_SpeechCapabilities::SAPI_PHONEMES)); + tts_enum_capabilities.insert(std::make_pair( + std::string("PRE_RECORDED"), hmi_apis::Common_SpeechCapabilities::PRE_RECORDED)); + tts_enum_capabilities.insert(std::make_pair( + std::string("SILENCE"), hmi_apis::Common_SpeechCapabilities::SILENCE)); + button_enum_name.insert( std::make_pair(std::string("OK"), hmi_apis::Common_ButtonName::OK)); button_enum_name.insert(std::make_pair( @@ -995,8 +1010,14 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { } if (check_existing_json_member(tts, "capabilities")) { - set_speech_capabilities( - smart_objects::SmartObject(tts.get("capabilities", "").asString())); + Json::Value capabilities = tts.get("capabilities", ""); + smart_objects::SmartObject tts_capabilities_so = + smart_objects::SmartObject(smart_objects::SmartType_Array); + for (uint32_t i = 0; i < capabilities.size(); ++i) { + tts_capabilities_so[i] = + tts_enum_capabilities.find(capabilities[i].asString())->second; + } + set_speech_capabilities(tts_capabilities_so); } } // TTS end |