Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4251 into donut

Browse Source 
* changes:
  Updating TTS engine interface for setting the language based on language, country and variant codes coming from a java.util.Locale instance.
This commit is contained in:
Android (Google) Code Review
2009-06-16 14:05:39 -07:00
parent 5633034f79 35a8e80bf8
commit f1170fb538
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/tts/TtsEngine.h
View File

@@ -99,14 +99,18 @@ public:
// @param size length of the language value // @param size length of the language value
// @return TTS_SUCCESS, or TTS_FAILURE // @return TTS_SUCCESS, or TTS_FAILURE
virtual tts_result loadLanguage(const char *value, const size_t size); virtual tts_result loadLanguage(const char *value, const size_t size);
// Signal the engine to use the specified language. This will force the // Load the resources associated with the specified language, country and Locale variant.
// language to be loaded if it wasn't loaded previously with loadLanguage(). // The loaded language will only be used once a call to setLanguageFromLocale() with the same
// See loadLanguage for the specification of the language. // language value is issued. Language and country values are coded according to the ISO three
// @param value pointer to the language value // letter codes for languages and countries, as can be retrieved from a java.util.Locale
// @param size length of the language value // instance. The variant value is encoded as the variant string retrieved from a
// java.util.Locale instance built with that variant data.
// @param lang pointer to the ISO three letter code for the language
// @param country pointer to the ISO three letter code for the country
// @param variant pointer to the variant code
// @return TTS_SUCCESS, or TTS_FAILURE // @return TTS_SUCCESS, or TTS_FAILURE
virtual tts_result setLanguage(const char *value, const size_t size); virtual tts_result setLanguage(const char *lang, const char *country, const char *variant);
// Retrieve the currently set language, or an empty "value" if no language // Retrieve the currently set language, or an empty "value" if no language
// has been set. // has been set.

8
packages/TtsService/jni/android_tts_SynthProxy.cpp
View File

@@ -269,7 +269,7 @@ android_tts_SynthProxy_native_finalize(JNIEnv *env, jobject thiz, jint jniData)
} }
} }
// TODO update to use language, country, variant
static void static void
android_tts_SynthProxy_setLanguage(JNIEnv *env, jobject thiz, jint jniData, android_tts_SynthProxy_setLanguage(JNIEnv *env, jobject thiz, jint jniData,
jstring language) jstring language)
@@ -283,8 +283,10 @@ android_tts_SynthProxy_setLanguage(JNIEnv *env, jobject thiz, jint jniData,
const char *langNativeString = env->GetStringUTFChars(language, 0); const char *langNativeString = env->GetStringUTFChars(language, 0);
// TODO check return codes // TODO check return codes
if (pSynthData->mNativeSynthInterface) { if (pSynthData->mNativeSynthInterface) {
pSynthData->mNativeSynthInterface->setLanguage(langNativeString, // TODO update to use language, country, variant
strlen(langNativeString)); // commented out to not break the build
//pSynthData->mNativeSynthInterface->setLanguage(langNativeString,
// strlen(langNativeString));
} }
env->ReleaseStringUTFChars(language, langNativeString); env->ReleaseStringUTFChars(language, langNativeString);
} }