diff options
| -rw-r--r-- | chrome/browser/speech/extension_api/tts_extension_api.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/speech/tts_controller.h | 8 | ||||
| -rw-r--r-- | chrome/browser/speech/tts_message_filter.cc | 9 |
3 files changed, 10 insertions, 14 deletions
diff --git a/chrome/browser/speech/extension_api/tts_extension_api.cc b/chrome/browser/speech/extension_api/tts_extension_api.cc index e7b65e1..adf8e7c 100644 --- a/chrome/browser/speech/extension_api/tts_extension_api.cc +++ b/chrome/browser/speech/extension_api/tts_extension_api.cc @@ -269,11 +269,6 @@ bool TtsSpeakFunction::RunAsync() { // the behavior more predictable and easier to write unit tests for too. SendResponse(true); - UtteranceContinuousParameters continuous_params; - continuous_params.rate = rate; - continuous_params.pitch = pitch; - continuous_params.volume = volume; - Utterance* utterance = new Utterance(GetProfile()); utterance->set_text(text); utterance->set_voice_name(voice_name); @@ -281,7 +276,7 @@ bool TtsSpeakFunction::RunAsync() { utterance->set_src_url(source_url()); utterance->set_lang(lang); utterance->set_gender(gender); - utterance->set_continuous_parameters(continuous_params); + utterance->set_continuous_parameters(rate, pitch, volume); utterance->set_can_enqueue(can_enqueue); utterance->set_required_event_types(required_event_types); utterance->set_desired_event_types(desired_event_types); diff --git a/chrome/browser/speech/tts_controller.h b/chrome/browser/speech/tts_controller.h index 8f32cd9..6b005c4 100644 --- a/chrome/browser/speech/tts_controller.h +++ b/chrome/browser/speech/tts_controller.h @@ -172,8 +172,12 @@ class Utterance { } TtsGenderType gender() const { return gender_; } - void set_continuous_parameters(const UtteranceContinuousParameters& params) { - continuous_parameters_ = params; + void set_continuous_parameters(const double rate, + const double pitch, + const double volume) { + continuous_parameters_.rate = rate; + continuous_parameters_.pitch = pitch; + continuous_parameters_.volume = volume; } const UtteranceContinuousParameters& continuous_parameters() { return continuous_parameters_; diff --git a/chrome/browser/speech/tts_message_filter.cc b/chrome/browser/speech/tts_message_filter.cc index 7550829..8174e60 100644 --- a/chrome/browser/speech/tts_message_filter.cc +++ b/chrome/browser/speech/tts_message_filter.cc @@ -120,12 +120,9 @@ void TtsMessageFilter::OnSpeak(const TtsUtteranceRequest& request) { utterance->set_lang(request.lang); utterance->set_voice_name(request.voice); utterance->set_can_enqueue(true); - - UtteranceContinuousParameters params; - params.rate = request.rate; - params.pitch = request.pitch; - params.volume = request.volume; - utterance->set_continuous_parameters(params); + utterance->set_continuous_parameters(request.rate, + request.pitch, + request.volume); utterance->set_event_delegate(this); |