Browse Source

VoiceSettings.java: Support reading the espeak_pitch_range preference.

master
Reece H. Dunn 12 years ago
parent
commit
f1588b3770

+ 35
- 0
android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceSettingsTest.java View File

assertThat(settings.getVoiceVariant().toString(), is("male")); assertThat(settings.getVoiceVariant().toString(), is("male"));
assertThat(settings.getRate(), is(synth.Rate.getDefaultValue())); assertThat(settings.getRate(), is(synth.Rate.getDefaultValue()));
assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue())); assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue()));
assertThat(settings.getPitchRange(), is(synth.PitchRange.getDefaultValue()));
} }


// Old Settings // Old Settings
assertThat(settings.getVoiceVariant().toString(), is("male")); assertThat(settings.getVoiceVariant().toString(), is("male"));
assertThat(settings.getRate(), is(synth.Rate.getDefaultValue())); assertThat(settings.getRate(), is(synth.Rate.getDefaultValue()));
assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue())); assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue()));
assertThat(settings.getPitchRange(), is(synth.PitchRange.getDefaultValue()));
} }


public void testDefaultGenderFemale() public void testDefaultGenderFemale()
assertThat(settings.getVoiceVariant().toString(), is("female")); assertThat(settings.getVoiceVariant().toString(), is("female"));
assertThat(settings.getRate(), is(synth.Rate.getDefaultValue())); assertThat(settings.getRate(), is(synth.Rate.getDefaultValue()));
assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue())); assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue()));
assertThat(settings.getPitchRange(), is(synth.PitchRange.getDefaultValue()));
} }


public void defaultRateTest(int prefValue, int settingValue, SpeechSynthesis synth) public void defaultRateTest(int prefValue, int settingValue, SpeechSynthesis synth)
assertThat(settings.getVoiceVariant().toString(), is("male")); assertThat(settings.getVoiceVariant().toString(), is("male"));
assertThat(settings.getRate(), is(settingValue)); assertThat(settings.getRate(), is(settingValue));
assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue())); assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue()));
assertThat(settings.getPitchRange(), is(synth.PitchRange.getDefaultValue()));
} }


public void testDefaultRate() public void testDefaultRate()
assertThat(settings.getVoiceVariant().toString(), is("male")); assertThat(settings.getVoiceVariant().toString(), is("male"));
assertThat(settings.getRate(), is(synth.Rate.getDefaultValue())); assertThat(settings.getRate(), is(synth.Rate.getDefaultValue()));
assertThat(settings.getPitch(), is(settingValue)); assertThat(settings.getPitch(), is(settingValue));
assertThat(settings.getPitchRange(), is(synth.PitchRange.getDefaultValue()));
} }


public void testDefaultPitch() public void testDefaultPitch()
assertThat(settings.getVoiceVariant().toString(), is("klatt2-old")); assertThat(settings.getVoiceVariant().toString(), is("klatt2-old"));
assertThat(settings.getRate(), is(synth.Rate.getDefaultValue())); assertThat(settings.getRate(), is(synth.Rate.getDefaultValue()));
assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue())); assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue()));
assertThat(settings.getPitchRange(), is(synth.PitchRange.getDefaultValue()));
} }


public void espeakRateTest(int prefValue, int settingValue, SpeechSynthesis synth) public void espeakRateTest(int prefValue, int settingValue, SpeechSynthesis synth)
assertThat(settings.getVoiceVariant().toString(), is("male")); assertThat(settings.getVoiceVariant().toString(), is("male"));
assertThat(settings.getRate(), is(settingValue)); assertThat(settings.getRate(), is(settingValue));
assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue())); assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue()));
assertThat(settings.getPitchRange(), is(synth.PitchRange.getDefaultValue()));
} }


public void testEspeakRate() public void testEspeakRate()
assertThat(settings.getVoiceVariant().toString(), is("male")); assertThat(settings.getVoiceVariant().toString(), is("male"));
assertThat(settings.getRate(), is(synth.Rate.getDefaultValue())); assertThat(settings.getRate(), is(synth.Rate.getDefaultValue()));
assertThat(settings.getPitch(), is(settingValue)); assertThat(settings.getPitch(), is(settingValue));
assertThat(settings.getPitchRange(), is(synth.PitchRange.getDefaultValue()));
} }


public void testEspeakPitch() public void testEspeakPitch()
espeakPitchTest( -5, 0, synth); // clamped to minimum value espeakPitchTest( -5, 0, synth); // clamped to minimum value
} }


public void espeakPitchRangeTest(int prefValue, int settingValue, SpeechSynthesis synth)
{
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
SharedPreferences.Editor editor = prefs.edit();
editor.clear();
editor.putString("espeak_pitch_range", Integer.toString(prefValue));
editor.commit();

VoiceSettings settings = new VoiceSettings(prefs, synth);
assertThat(settings.getVoiceVariant().toString(), is("male"));
assertThat(settings.getRate(), is(synth.Rate.getDefaultValue()));
assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue()));
assertThat(settings.getPitchRange(), is(settingValue));
}

public void testEspeakPitchRange()
{
SpeechSynthesis synth = new SpeechSynthesis(getContext(), mCallback);
espeakPitchRangeTest(110, 100, synth); // clamped to maximum value
espeakPitchRangeTest(100, 100, synth);
espeakPitchRangeTest( 50, 50, synth); // default value
espeakPitchRangeTest( 10, 10, synth);
espeakPitchRangeTest( -5, 0, synth); // clamped to minimum value
}

// Mixed (Old and New) Settings // Mixed (Old and New) Settings


public void testEspeakVariantWithDefaultGenderFemale() public void testEspeakVariantWithDefaultGenderFemale()
assertThat(settings.getVoiceVariant().toString(), is("klatt4")); assertThat(settings.getVoiceVariant().toString(), is("klatt4"));
assertThat(settings.getRate(), is(synth.Rate.getDefaultValue())); assertThat(settings.getRate(), is(synth.Rate.getDefaultValue()));
assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue())); assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue()));
assertThat(settings.getPitchRange(), is(synth.PitchRange.getDefaultValue()));
} }


public void testEspeakRateWithDefaultRate() public void testEspeakRateWithDefaultRate()
assertThat(settings.getVoiceVariant().toString(), is("male")); assertThat(settings.getVoiceVariant().toString(), is("male"));
assertThat(settings.getRate(), is(200)); assertThat(settings.getRate(), is(200));
assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue())); assertThat(settings.getPitch(), is(synth.Pitch.getDefaultValue()));
assertThat(settings.getPitchRange(), is(synth.PitchRange.getDefaultValue()));
} }
} }

+ 11
- 0
android/src/com/reecedunn/espeak/VoiceSettings.java View File

public static final String PREF_RATE = "espeak_rate"; public static final String PREF_RATE = "espeak_rate";
public static final String PREF_DEFAULT_PITCH = "default_pitch"; public static final String PREF_DEFAULT_PITCH = "default_pitch";
public static final String PREF_PITCH = "espeak_pitch"; public static final String PREF_PITCH = "espeak_pitch";
public static final String PREF_PITCH_RANGE = "espeak_pitch_range";


public VoiceSettings(SharedPreferences preferences, SpeechSynthesis engine) { public VoiceSettings(SharedPreferences preferences, SpeechSynthesis engine) {
mPreferences = preferences; mPreferences = preferences;
return pitch; return pitch;
} }


public int getPitchRange() {
int min = mEngine.PitchRange.getMinValue();
int max = mEngine.PitchRange.getMaxValue();

int range = getPreferenceValue(PREF_PITCH_RANGE, mEngine.PitchRange.getDefaultValue());
if (range > max) range = max;
if (range < min) range = min;
return range;
}

private int getPreferenceValue(String preference, int defaultValue) { private int getPreferenceValue(String preference, int defaultValue) {
String prefString = mPreferences.getString(preference, null); String prefString = mPreferences.getString(preference, null);
if (prefString == null) { if (prefString == null) {

Loading…
Cancel
Save