Browse Source

nativeSetLanguage is not used, so remove the associated code

master
Reece H. Dunn 12 years ago
parent
commit
e2d15f6456

+ 0
- 28
jni/jni/com_googlecode_eyesfree_espeak_eSpeakService.cpp View File

return JNI_FALSE; return JNI_FALSE;
} }


JNIEXPORT jboolean
JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSetLanguage(
JNIEnv *env, jobject object, jstring language, jint variant) {
const char *c_language = language ? env->GetStringUTFChars(language, NULL) : NULL;

if (DEBUG) LOGV("%s(language=%s)", __FUNCTION__, c_language);

const int len = strlen(c_language);
char *lang_copy = (char *) calloc(len, sizeof(char));
strcpy(lang_copy, c_language);
if (c_language) env->ReleaseStringUTFChars(language, c_language);

espeak_VOICE voice;
memset(&voice, 0, sizeof(espeak_VOICE)); // Zero out the voice first
voice.languages = lang_copy;
voice.variant = (int) variant;
const espeak_ERROR result = espeak_SetVoiceByProperties(&voice);

switch (result) {
case EE_OK: return JNI_TRUE;
case EE_INTERNAL_ERROR: LOGE("espeak_SetVoiceByProperties: internal error."); break;
case EE_BUFFER_FULL: LOGE("espeak_SetVoiceByProperties: buffer full."); break;
case EE_NOT_FOUND: LOGE("espeak_SetVoiceByProperties: not found."); break;
}

return JNI_FALSE;
}

JNIEXPORT jboolean JNIEXPORT jboolean
JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSetRate( JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSetRate(
JNIEnv *env, jobject object, jint rate) { JNIEnv *env, jobject object, jint rate) {

+ 0
- 8
src/com/googlecode/eyesfree/espeak/SpeechSynthesis.java View File

nativeSetVoiceByProperties(name, languages, gender, age, variant); nativeSetVoiceByProperties(name, languages, gender, age, variant);
} }


public void setLanguage(String language, int variant) {
attemptInit();

nativeSetLanguage(language, variant);
}

public void setRate(int rate) { public void setRate(int rate) {
nativeSetRate(rate); nativeSetRate(rate);
} }
private native final boolean nativeSetVoiceByProperties( private native final boolean nativeSetVoiceByProperties(
String name, String languages, int gender, int age, int variant); String name, String languages, int gender, int age, int variant);


private native final boolean nativeSetLanguage(String language, int variant);

private native final boolean nativeSetRate(int rate); private native final boolean nativeSetRate(int rate);


private native final boolean nativeSetPitch(int pitch); private native final boolean nativeSetPitch(int pitch);

Loading…
Cancel
Save