SpeechSynthesis: factor out the VoiceVariant class into its own file.

This commit is contained in:
Reece H. Dunn
2013-05-09 13:51:12 +01:00
parent 8e1872c4e9
commit 774c909a9c
3 changed files with 74 additions and 57 deletions
@@ -217,16 +217,16 @@ public class TtsService extends TextToSpeechService {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
final String variantString = prefs.getString("espeak_variant", null);
final SpeechSynthesis.VoiceVariant variant;
final VoiceVariant variant;
if (variantString == null) {
final int gender = getPreferenceValue(prefs, "default_gender", SpeechSynthesis.GENDER_MALE);
if (gender == SpeechSynthesis.GENDER_FEMALE) {
variant = SpeechSynthesis.parseVoiceVariant("default-female");
variant = VoiceVariant.parseVoiceVariant("default-female");
} else {
variant = SpeechSynthesis.parseVoiceVariant("default-male");
variant = VoiceVariant.parseVoiceVariant("default-male");
}
} else {
variant = SpeechSynthesis.parseVoiceVariant(variantString);
variant = VoiceVariant.parseVoiceVariant(variantString);
}
int rate = getPreferenceValue(prefs, "espeak_rate", Integer.MIN_VALUE);