Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Side by Side Diff: chrome/browser/speech/tts_android.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/speech/tts_android.h" 5 #include "chrome/browser/speech/tts_android.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/android/context_utils.h" 9 #include "base/android/context_utils.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 15 matching lines...) Expand all
26 : utterance_id_(0) { 26 : utterance_id_(0) {
27 JNIEnv* env = AttachCurrentThread(); 27 JNIEnv* env = AttachCurrentThread();
28 java_ref_.Reset( 28 java_ref_.Reset(
29 Java_TtsPlatformImpl_create(env, 29 Java_TtsPlatformImpl_create(env,
30 reinterpret_cast<intptr_t>(this), 30 reinterpret_cast<intptr_t>(this),
31 base::android::GetApplicationContext())); 31 base::android::GetApplicationContext()));
32 } 32 }
33 33
34 TtsPlatformImplAndroid::~TtsPlatformImplAndroid() { 34 TtsPlatformImplAndroid::~TtsPlatformImplAndroid() {
35 JNIEnv* env = AttachCurrentThread(); 35 JNIEnv* env = AttachCurrentThread();
36 Java_TtsPlatformImpl_destroy(env, java_ref_.obj()); 36 Java_TtsPlatformImpl_destroy(env, java_ref_);
37 } 37 }
38 38
39 bool TtsPlatformImplAndroid::PlatformImplAvailable() { 39 bool TtsPlatformImplAndroid::PlatformImplAvailable() {
40 return true; 40 return true;
41 } 41 }
42 42
43 bool TtsPlatformImplAndroid::Speak( 43 bool TtsPlatformImplAndroid::Speak(
44 int utterance_id, 44 int utterance_id,
45 const std::string& utterance, 45 const std::string& utterance,
46 const std::string& lang, 46 const std::string& lang,
47 const VoiceData& voice, 47 const VoiceData& voice,
48 const UtteranceContinuousParameters& params) { 48 const UtteranceContinuousParameters& params) {
49 JNIEnv* env = AttachCurrentThread(); 49 JNIEnv* env = AttachCurrentThread();
50 jboolean success = Java_TtsPlatformImpl_speak( 50 jboolean success = Java_TtsPlatformImpl_speak(
51 env, java_ref_.obj(), utterance_id, 51 env, java_ref_, utterance_id,
52 base::android::ConvertUTF8ToJavaString(env, utterance).obj(), 52 base::android::ConvertUTF8ToJavaString(env, utterance),
53 base::android::ConvertUTF8ToJavaString(env, lang).obj(), params.rate, 53 base::android::ConvertUTF8ToJavaString(env, lang), params.rate,
54 params.pitch, params.volume); 54 params.pitch, params.volume);
55 if (!success) 55 if (!success)
56 return false; 56 return false;
57 57
58 utterance_ = utterance; 58 utterance_ = utterance;
59 utterance_id_ = utterance_id; 59 utterance_id_ = utterance_id;
60 return true; 60 return true;
61 } 61 }
62 62
63 bool TtsPlatformImplAndroid::StopSpeaking() { 63 bool TtsPlatformImplAndroid::StopSpeaking() {
64 JNIEnv* env = AttachCurrentThread(); 64 JNIEnv* env = AttachCurrentThread();
65 Java_TtsPlatformImpl_stop(env, java_ref_.obj()); 65 Java_TtsPlatformImpl_stop(env, java_ref_);
66 utterance_id_ = 0; 66 utterance_id_ = 0;
67 utterance_.clear(); 67 utterance_.clear();
68 return true; 68 return true;
69 } 69 }
70 70
71 void TtsPlatformImplAndroid::Pause() { 71 void TtsPlatformImplAndroid::Pause() {
72 StopSpeaking(); 72 StopSpeaking();
73 } 73 }
74 74
75 void TtsPlatformImplAndroid::Resume() { 75 void TtsPlatformImplAndroid::Resume() {
76 } 76 }
77 77
78 bool TtsPlatformImplAndroid::IsSpeaking() { 78 bool TtsPlatformImplAndroid::IsSpeaking() {
79 return (utterance_id_ != 0); 79 return (utterance_id_ != 0);
80 } 80 }
81 81
82 void TtsPlatformImplAndroid::GetVoices( 82 void TtsPlatformImplAndroid::GetVoices(
83 std::vector<VoiceData>* out_voices) { 83 std::vector<VoiceData>* out_voices) {
84 JNIEnv* env = AttachCurrentThread(); 84 JNIEnv* env = AttachCurrentThread();
85 if (!Java_TtsPlatformImpl_isInitialized(env, java_ref_.obj())) 85 if (!Java_TtsPlatformImpl_isInitialized(env, java_ref_))
86 return; 86 return;
87 87
88 int count = Java_TtsPlatformImpl_getVoiceCount(env, java_ref_.obj()); 88 int count = Java_TtsPlatformImpl_getVoiceCount(env, java_ref_);
89 for (int i = 0; i < count; ++i) { 89 for (int i = 0; i < count; ++i) {
90 out_voices->push_back(VoiceData()); 90 out_voices->push_back(VoiceData());
91 VoiceData& data = out_voices->back(); 91 VoiceData& data = out_voices->back();
92 data.native = true; 92 data.native = true;
93 data.name = base::android::ConvertJavaStringToUTF8( 93 data.name = base::android::ConvertJavaStringToUTF8(
94 Java_TtsPlatformImpl_getVoiceName(env, java_ref_.obj(), i)); 94 Java_TtsPlatformImpl_getVoiceName(env, java_ref_, i));
95 data.lang = base::android::ConvertJavaStringToUTF8( 95 data.lang = base::android::ConvertJavaStringToUTF8(
96 Java_TtsPlatformImpl_getVoiceLanguage(env, java_ref_.obj(), i)); 96 Java_TtsPlatformImpl_getVoiceLanguage(env, java_ref_, i));
97 data.gender = TTS_GENDER_NONE; 97 data.gender = TTS_GENDER_NONE;
98 data.events.insert(TTS_EVENT_START); 98 data.events.insert(TTS_EVENT_START);
99 data.events.insert(TTS_EVENT_END); 99 data.events.insert(TTS_EVENT_END);
100 data.events.insert(TTS_EVENT_ERROR); 100 data.events.insert(TTS_EVENT_ERROR);
101 } 101 }
102 } 102 }
103 103
104 void TtsPlatformImplAndroid::VoicesChanged(JNIEnv* env, 104 void TtsPlatformImplAndroid::VoicesChanged(JNIEnv* env,
105 const JavaParamRef<jobject>& obj) { 105 const JavaParamRef<jobject>& obj) {
106 TtsController::GetInstance()->VoicesChanged(); 106 TtsController::GetInstance()->VoicesChanged();
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() { 144 TtsPlatformImplAndroid* TtsPlatformImplAndroid::GetInstance() {
145 return base::Singleton< 145 return base::Singleton<
146 TtsPlatformImplAndroid, 146 TtsPlatformImplAndroid,
147 base::LeakySingletonTraits<TtsPlatformImplAndroid>>::get(); 147 base::LeakySingletonTraits<TtsPlatformImplAndroid>>::get();
148 } 148 }
149 149
150 // static 150 // static
151 bool TtsPlatformImplAndroid::Register(JNIEnv* env) { 151 bool TtsPlatformImplAndroid::Register(JNIEnv* env) {
152 return RegisterNativesImpl(env); 152 return RegisterNativesImpl(env);
153 } 153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698