Commit Graph
124 Commits
Author SHA1 Message Date
Reece H. Dunn a601d8afb1 SeekBarPreference: set the content description to the value of the parameter. 2013-05-03 18:39:31 +01:00
Reece H. Dunn 4b06b1b024 Support configuring the pitch range parameter. 2013-05-03 16:51:02 +01:00
Reece H. Dunn c62f08c66b The default_rate_values string-array is no longer needed, so remove it. 2013-05-03 16:11:27 +01:00
Reece H. Dunn d0f5dc2ff4 Migrate the speech rate parameter to use the new SeekBar/Parameter UI. 2013-05-03 16:08:30 +01:00
Reece H. Dunn 16164c1c52 SeekBarPreference: fix handling of the minimum value option. 2013-05-03 16:03:27 +01:00
Reece H. Dunn b2785ce823 Remove the 'Default' gender option as this does not make sense. 2013-05-03 15:32:28 +01:00
Reece H. Dunn 1b9df87976 Remove all references to the default_pitch_entries string-array. 2013-05-03 14:56:37 +01:00
Reece H. Dunn c5a62fe076 Reformat the strings.xml files to be consistently formatted. 2013-05-03 14:54:36 +01:00
Reece H. Dunn a91dedf205 remove_string.sh: helper for removing a string resource in all strings.xml files. 2013-05-03 14:54:10 +01:00
Reece H. Dunn 09c79bb013 Make the rate setting use the new SeekBar/Parameter UI. 2013-05-03 13:07:54 +01:00
Reece H. Dunn d0ba13ae1d SeekBarPreference: support resetting to the default value. 2013-05-03 12:43:20 +01:00
Reece H. Dunn 20010daac3 SeekBarPreference: show the formatted current value in the preference dialog. 2013-05-03 12:21:30 +01:00
Reece H. Dunn 8e4b6044dc SeekBarPreference: make formatter an explicit property instead of using the extras bundle. 2013-05-03 11:54:25 +01:00
Reece H. Dunn b60ed6c9ae Display the formatted units on the volume setting. 2013-05-03 11:46:04 +01:00
Reece H. Dunn 5370341abf SeekBarPreference: only commit the preference if requested to. 2013-05-03 11:24:59 +01:00
Reece H. Dunn ac6099ebf1 Hook up the volume parameter to a slider preference dialog. 2013-05-03 11:11:59 +01:00
Reece H. Dunn 233da111db TtsService.java: rework the logic to use the new Parameter API. 2013-05-02 20:33:43 +01:00
Reece H. Dunn de78778210 SpeechSynthesis.java: further refine the Parameter API. 2013-05-02 20:13:00 +01:00
Reece H. Dunn 85836eae92 SpeechSynthesis.java: rename the parameter APIs. 2013-05-02 19:57:52 +01:00
Reece H. Dunn cc72825682 SpeechSynthesis.java: expose the different voice options from eSpeak
This makes the following changes:

1.  setVoice takes a Voice object instead of a language string.

    This is to make the API cleaner and allows SpeechSynthesis
    to pass the correct parameter (identifier for SetVoiceByName,
    or name for SetVoiceByProperties) to espeak.

2.  The espeak_SetVoiceByName API is also exposed to support passing
    the voice variant to use.

3.  The age parameter has been re-added with the constants:
    *  SpeechSynthesis.AGE_ANY
    *  SpeechSynthesis.AGE_YOUNG
    *  SpeechSynthesis.AGE_OLD
    based on the behaviour of the eSpeak voice selection algorithm.

NOTE: Due to the way that voice selection is implemented in eSpeak,
if variant is specified, the age and gender cannot be specified and
vice versa.
2013-05-02 18:06:41 +01:00
Reece H. Dunn 88eab88d8a SpeechSynthesis.java: further simplify the setVoice method.
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.
2013-05-02 16:45:46 +01:00
Reece H. Dunn 027217d5f7 SpeechSynthesis.java: Simplify the SetVoiceByProperties parameters.
The `age` parameter is not useful as eSpeak does not use this when
selecting voices. This is always set to `0` by TtsService.java.

The `variant` parameter is not used to select the actual voice
variant (from the `!v` directory) but to select the n^th matching
voice from the list of matching voices. This is always set to
select the first matching voice by TtsService.java.
2013-05-02 16:32:46 +01:00
Reece H. Dunn 23d34d702a SpeechSynthesis.java: provide a binding of the eSpeak Get/SetParameter API. 2013-05-02 16:23:59 +01:00
Reece H. Dunn e50f9e0055 DEFAULT_SAMPLE_RATE is not needed, so remove it.
The sampleRate variable gets overwritten with the actual sample
rate during creation from the espeak_Initialize method, so the
value it is set to in the constructor does not matter.
2013-05-02 10:44:39 +01:00
Reece H. Dunn 3a92ee34f2 Support the new voices. 2013-04-29 10:53:54 +01:00
Reece H. Dunn f57de435ac eSpeak for Android 1.47.04 (rev: 13) 2013-04-03 11:44:37 +01:00
Reece H. Dunn cd1bd5fcef Include the test voices (these were excluded by espeak_ListVoices in a recent upstream change) 2013-04-03 10:30:21 +01:00
Reece H. Dunn 153d5dabc3 Update the eclipse settings files. 2013-04-03 09:46:35 +01:00
Reece H. Dunn 42bd45c383 eSpeakTests: en-uk is now reported as en-gb by espeak, so update the tests 2013-04-03 09:45:29 +01:00
Reece H. Dunn 44bd818bc3 Update the tests to cover the voice changes in eSpeak. 2013-03-26 11:39:17 +00:00
Reece H. Dunn b066367ee0 eSpeak for Android 1.46.53 (rev: 12) 2013-03-17 12:36:10 +00:00
Reece H. Dunn 956b5179fd VoiceData.java: test/an has moved to europe/an 2013-03-17 12:25:33 +00:00
Reece H. Dunn 4a3a50e658 eSpeak for Android 1.46.49 (rev: 11) 2013-03-14 18:27:23 +00:00
Reece H. Dunn e96f2e3a92 eSpeakTests: update the VoiceData to reflect the directory layout changes 2013-03-14 17:53:18 +00:00
Reece H. Dunn 31b2bf0c56 CheckVoiceData.java: don't check for any voices as they can change directory layout 2013-03-14 17:14:14 +00:00
Reece H. Dunn 4d44e88dd2 TtsService: support detecting SSML documents 2013-03-14 16:53:22 +00:00
Reece H. Dunn 1ac6d04c48 eSpeakActivity.java: support speaking specified text in the activity. 2013-03-14 16:30:34 +00:00
Reece H. Dunn 36b86799b3 eSpeakActivity.java: fix the 'X has leaked a ServiceConnection' error.
The TTS engine should be destroyed in the onStop method, not the
onDestroy method to prevent it being used in the stopped state.
2013-03-13 22:45:21 +00:00
Reece H. Dunn c6cca792ee Correctly handle the new vi-hue language. 2013-03-13 22:05:41 +00:00
Reece H. Dunn ef40dee48c Don't use espeakSSML when synthesizing text as this causes problems for some text. 2013-03-13 12:34:42 +00:00
Reece H. Dunn 932907ddc6 Don't check in espeakdata.zip to version control every time it changes.
The espeakdata.zip file is a generated file that can be recreated
by running the `make android` command. It takes up ~ 900 Kb of space
and changes significantly every time it is built.
2013-03-03 12:25:23 +00:00
Reece H. Dunn 6594f081e6 eSpeak for Android 1.46.32 (rev: 10) 2013-02-12 13:25:12 +00:00
Reece H. Dunn 2c1c3c53bd espeakdata: add a default group to the fa_rules file so it compiles correctly 2013-02-12 13:11:23 +00:00
Reece H. Dunn 48fa803bc4 TtsService.java: ensure that the voice data is installed/upgraded correctly.
When using assistive technology like TalkBack and not accessing
either the eSpeak application or the Android TTS settings
directly, the voice data would previously not be installed/upgraded
correctly.

The approach here is to move the logic to onIsLanguageAvailable so
that if the espeak voice data is not installed or is upgradable
then trigger an install of the voice data and return
TextToSpeech.LANG_MISSING_DATA.
2013-02-12 12:21:34 +00:00
Reece H. Dunn 199029e97e TtsService.java: use the context from the TtsService object itself 2013-02-11 19:03:53 +00:00
Reece H. Dunn 9d0a23bb1c TtsService.java: also report TextToSpeech.LANG_MISSING_DATA if the base resources are not found or the data can be upgraded. 2013-02-11 01:00:06 +00:00
Reece H. Dunn 1e52512637 TtsService.java: report TextToSpeech.LANG_MISSING_DATA if the engine has not been initialized. 2013-02-11 00:49:10 +00:00
Reece H. Dunn a7bb3eb790 Make eSpeak-specific setting changes apply immediately.
This reverts commit 433a0a0455.

The issue here appears to be that the process the eSpeak commands are
processed from to generate the speech differs from the one used to
modify the settings. This appears to be enough to cause it to not
get the updated settings until the process is restarted.

Thanks to Peter Vagner for locating the cause.
2013-02-11 00:08:18 +00:00
Reece H. Dunn a7a810a009 CheckVoiceData.java: remove unused import statement. 2013-02-01 11:38:03 +00:00
Reece H. Dunn 7f6bfd929b TtsSettingsActivity.java: use PreferenceFragment on Honeycomb and later. 2013-02-01 11:35:48 +00:00