mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

SpeechSynthesis.java: further simplify the setVoice method.

Browse Source 
This renames `setVoiceByProperties` to the more consise `setVoice`
and removes the name parameter as this is not used -- the voice is
set by the language and gender parameters only.
This commit is contained in:
Reece H. Dunn
2013-05-02 16:45:46 +01:00
parent 027217d5f7
commit 88eab88d8a
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/jni/jni/eSpeakService.cpp
+6 -10
View File
@@ -241,24 +241,20 @@ JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeGetAvailableVoices(
}
JNIEXPORT jboolean
JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeSetVoiceByProperties(
JNIEnv *env, jobject object, jstring name, jstring languages, jint gender) {
const char *c_name = name ? env->GetStringUTFChars(name, NULL) : NULL;
const char *c_languages = languages ? env->GetStringUTFChars(languages, NULL) : NULL;
JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeSetVoice(
JNIEnv *env, jobject object, jstring language, jint gender) {
const char *c_language = language ? env->GetStringUTFChars(language, NULL) : NULL;
if (DEBUG) LOGV("%s(name=%s, languages=%s)", __FUNCTION__, c_name, c_languages);
if (DEBUG) LOGV("%s(language=%s, gender=%d)", __FUNCTION__, c_language, gender);
espeak_VOICE voice_select;
memset(&voice_select, 0, sizeof(espeak_VOICE));
voice_select.name = c_name;
voice_select.languages = c_languages;
voice_select.languages = c_language;
voice_select.gender = (int) gender;
const espeak_ERROR result = espeak_SetVoiceByProperties(&voice_select);
if (c_name) env->ReleaseStringUTFChars(name, c_name);
if (c_languages) env->ReleaseStringUTFChars(languages, c_languages);
if (c_language) env->ReleaseStringUTFChars(language, c_language);
switch (result) {
case EE_OK: return JNI_TRUE;
android/src/com/reecedunn/espeak/SpeechSynthesis.java
+3 -3
View File
@@ -169,8 +169,8 @@ public class SpeechSynthesis {
return voices;
}
public void setVoiceByProperties(String name, String languages, int gender) {
nativeSetVoiceByProperties(name, languages, gender);
public void setVoice(String language, int gender) {
nativeSetVoice(language, gender);
}
public void setRate(int rate) {
@@ -300,7 +300,7 @@ public class SpeechSynthesis {
private native final String[] nativeGetAvailableVoices();
private native final boolean nativeSetVoiceByProperties(String name, String languages, int gender);
private native final boolean nativeSetVoice(String language, int gender);
private native final boolean nativeSetRate(int rate);
android/src/com/reecedunn/espeak/TtsService.java
+1 -1
View File
@@ -221,7 +221,7 @@ public class TtsService extends TextToSpeechService {
mCallback.start(mEngine.getSampleRate(), mEngine.getAudioFormat(),
mEngine.getChannelCount());
mEngine.setVoiceByProperties(null, mMatchingVoice.name, gender);
mEngine.setVoice(mMatchingVoice.name, gender);
mEngine.setRate(rate);
mEngine.setPitch(pitch);
mEngine.synthesize(text, text.startsWith("<speak"));