From 754e3d410475978f162b7607124ff2ac27691f1e Mon Sep 17 00:00:00 2001 From: Venugopal Muruganathan Date: Wed, 25 Jul 2018 03:55:58 +0000 Subject: [PATCH] Revert "Set Default TTS voice as Female/en_US" This change is not needed. On tizen, we need to use CAPI framework for TTS. This reverts commit 6f627f5360b740e5a2c4211d743dd190af7b8202. Change-Id: I4ba520063aa0b04d8fc4a48c03a20b01de1a4ab3 Signed-off-by: Venugopal S M --- chromium_src/chrome/common/tts_utterance_request.cc | 9 --------- chromium_src/chrome/common/tts_utterance_request.h | 2 -- chromium_src/chrome/renderer/tts_dispatcher.cc | 12 ------------ 3 files changed, 23 deletions(-) diff --git a/chromium_src/chrome/common/tts_utterance_request.cc b/chromium_src/chrome/common/tts_utterance_request.cc index bb16da9..a2e3e7f 100644 --- a/chromium_src/chrome/common/tts_utterance_request.cc +++ b/chromium_src/chrome/common/tts_utterance_request.cc @@ -19,15 +19,6 @@ TtsVoice::TtsVoice() is_default(false) { } -TtsVoice::TtsVoice(std::string voice_uri, std::string name, std::string lang, - bool local_service, bool is_default) - : voice_uri(voice_uri), - name(name), - lang(lang), - local_service(local_service), - is_default(is_default) { -} - TtsVoice::~TtsVoice() { } diff --git a/chromium_src/chrome/common/tts_utterance_request.h b/chromium_src/chrome/common/tts_utterance_request.h index 1c5e829..a4b4cab 100644 --- a/chromium_src/chrome/common/tts_utterance_request.h +++ b/chromium_src/chrome/common/tts_utterance_request.h @@ -25,8 +25,6 @@ struct TtsUtteranceRequest { struct TtsVoice { TtsVoice(); - TtsVoice(std::string voice_uri, std::string name, std::string lang, - bool local_service, bool is_default); ~TtsVoice(); std::string voice_uri; diff --git a/chromium_src/chrome/renderer/tts_dispatcher.cc b/chromium_src/chrome/renderer/tts_dispatcher.cc index e574de0..0d3b97c 100644 --- a/chromium_src/chrome/renderer/tts_dispatcher.cc +++ b/chromium_src/chrome/renderer/tts_dispatcher.cc @@ -21,23 +21,11 @@ using blink::WebSpeechSynthesisVoice; using blink::WebString; using blink::WebVector; -namespace { - -static const std::vector& getDefaultVoiceList() { - static std::vector default_voices( - 1, TtsVoice("localhost:Female/en_US", "Female", "en_US", false, false)); - - return default_voices; -} - -} // namespace - int TtsDispatcher::next_utterance_id_ = 1; TtsDispatcher::TtsDispatcher(WebSpeechSynthesizerClient* client) : synthesizer_client_(client) { RenderThread::Get()->AddObserver(this); - OnSetVoiceList(getDefaultVoiceList()); } TtsDispatcher::~TtsDispatcher() { -- 2.7.4