Commit Graph
986 Commits
Author SHA1 Message Date
Reece H. Dunn aebd02fa68 Remove the Android 2.x/3.x support code.
The Android 4.x+ code has changed a lot since the initial import
of the eyes-free codebase. A lot of bug fixes and improvements
have been made to it.

The eyes-free codebase had two different code paths:
  *  one for ICS (4.0) or later, using the Java-based TTS APIs
     provided by the Android platform;
  *  one for pre-ICS using an internal C++-based TTS API.

Thus, any bug fixes or improvements would have to be done to both
code bases if Android 2.x/3.x support is required. This is not
maintainable.

If pre-ICS support is to be re-added in the future, the plan will
be to:
  *  forward the C++-based APIs to the Java-based APIs via a
     compatibility layer;
  *  use a compatibility layer (Android Support Library?) for using
     the ICS settings API on pre-ICS.
2013-09-08 12:01:20 +01:00
Reece H. Dunn 602a14d76f TtsService.java: Use the locale from the SynthesisRequest, not the last onLoadLanguage call. 2013-09-07 14:45:27 +01:00
Reece H. Dunn 61f9875689 Updated the Slovak translations (translator: Peter Vágner) 2013-09-07 13:35:19 +01:00
Reece H. Dunn 5ebbace3a5 Merge branch 'master' into android 2013-09-07 12:46:02 +01:00
Reece H. Dunn c1196192e5 speak_lib.cpp: Do not crash if espeak_SetPunctuationList is called with a NULL punctuation list. 2013-09-07 12:45:22 +01:00
Reece H. Dunn edbeb09f21 Add support for the NVDA voice variants. 2013-09-06 17:01:19 +01:00
Reece H. Dunn c7a1556101 Rework the Voice variant preference to show a dialog with Category and Variant lists.
The original variant list UI resulted in a long, complex list that
was difficult to navigate. This change splits up that list into
more manageable groups.
2013-09-06 13:10:35 +01:00
Reece H. Dunn 596aa025cd InformationListAdapter: Use ArrayAdapter.getItem. 2013-09-06 11:32:32 +01:00
Reece H. Dunn 94ace09b40 configure.ac: Improve the checks to ensure that portaudio.h and -lportaudio refer to the same version of PortAudio. 2013-09-06 09:22:30 +01:00
Reece H. Dunn 40f490b600 Merge branch 'master' into android 2013-09-05 17:18:19 +01:00
Reece H. Dunn f6db58e6b0 Fix bad attribute warnings with the different NVDA voice variants. 2013-09-05 17:16:53 +01:00
Reece H. Dunn 06be1bc0bb Add the voice variants from NVDA. 2013-09-05 16:54:57 +01:00
Reece H. Dunn fb64d30c3d TtsSettingsActivity: Rename createPreference to createSeekBarPreference. 2013-09-05 16:28:01 +01:00
Reece H. Dunn d3ff1abbe9 configure.ac: Update the configure script to detect portaudio version (18 or 19). 2013-09-05 15:49:12 +01:00
Reece H. Dunn 2d3e010dc6 Use the Medium TextView on the information_view layout. 2013-09-05 15:04:07 +01:00
Reece H. Dunn 7a359fdb69 Use the information_view layout for the custom preferences. 2013-09-05 15:02:10 +01:00
Reece H. Dunn 960770e80f Use the android title/summary IDs in the information_view.xml layout. 2013-09-05 15:01:29 +01:00
Reece H. Dunn 1de60cdc15 Rework the 'Punctuation level' (now 'Speak punctuation') preference to include a custom punctuation list. 2013-09-05 14:06:57 +01:00
Reece H. Dunn bc346db22e VoiceSettings.java: Support setting an espeak_punctuation_characters preference. 2013-09-04 21:41:35 +01:00
Reece H. Dunn 622e6043ef Expose the Punctuation Level setting. 2013-09-04 20:23:25 +01:00
Reece H. Dunn 3cde1f7e6a TtsService.java: Make onSynthesizeText use VoiceSettings to get the voice parameters. 2013-09-04 17:59:56 +01:00
Reece H. Dunn 3259a08ca5 VoiceSettingsTest.java: Add missing test case to cover default_pitch and espeak_pitch preferences set. 2013-09-04 17:53:27 +01:00
Reece H. Dunn 0086ec61c3 VoiceSettings.java: Support reading the espeak_volume preference. 2013-09-04 17:48:49 +01:00
Reece H. Dunn f1588b3770 VoiceSettings.java: Support reading the espeak_pitch_range preference. 2013-09-04 17:39:08 +01:00
Reece H. Dunn f47729453f VoiceSettings.java: Support reading the default_pitch and espeak_pitch preferences. 2013-09-04 17:17:11 +01:00
Reece H. Dunn 54ccfc39b4 VoiceSettings.java: Support reading the default_rate and espeak_rate preferences. 2013-09-04 16:22:56 +01:00
Reece H. Dunn 6c5631d810 VoiceSettings.java: Support reading the default_gender and espeak_variant preferences. 2013-09-04 13:43:53 +01:00
Reece H. Dunn 00bc5f2c6c VoiceVariant.java: Use MALE and FEMALE string constants. 2013-09-04 13:42:52 +01:00
Reece H. Dunn 26d1141ad2 Merge branch 'master' into android
Conflicts:
	README.md
2013-09-03 10:12:02 +01:00
Reece H. Dunn 2eda3a1369 README.md: change the version of gradle to 1.7. 2013-09-01 12:48:03 +01:00
Reece H. Dunn 5f8762ae91 src/wave.cpp: fix building when portaudio.h is missing 2013-08-31 10:06:38 +01:00
Reece H. Dunn 2c8198febb README.md: Improve the build instructions and add a section on building/adding voices. 2013-08-28 12:17:14 +01:00
Reece H. Dunn e7921e80bf VoiceVariant.java: Replace String.split with a regex.Pattern object. 2013-08-27 16:57:17 +01:00
Reece H. Dunn 1c01e36b05 eSpeakTests: Add VoiceVariantTest to test the VoiceVariant class. 2013-08-27 16:29:03 +01:00
Reece H. Dunn c098e8b891 ph_english: use /i/ as the IPA transcription of i
The i phoneme is used for the reduced i sound in e.g. happy
(/h'api/). Thus, the following words contrast:

    word   eSpeak   IPA
    happy  /h'api/  /hˈapi/
    been   /b'i:n/  /bˈiːn/
    bin    /b'In/   /bˈɪn/

Before this change, /h'api/ would be transcribed in IPA as /hˈapɪ/
which is wrong. After this change, it is transcribed correctly.
2013-08-24 16:43:13 +01:00
Reece H. Dunn 304d265f46 Fix a SEGFAULT in GetTranslatedPhonemeString.
When running any of the following:

    espeak -x "[[]]"
    espeak --ipa "[[]]"

eSpeak would SEGFAULT. This is because phon_out_buf is NULL as no
phonemes have been written and as this is the first call to
GetTranslatedPhonemeString, the phoneme buffer has not been
allocated yet. However, GetTranslatedPhonemeString attempts to add
a NULL character to the end of the phoneme buffer, and thus crashes.
2013-08-23 13:35:32 +01:00
Reece H. Dunn ef36b406d9 eSpeak for Android 1.47.11d (rev: 15) 2013-07-29 10:26:06 +01:00
Reece H. Dunn d6308605de Use en-JM instead of en-029 and es-MX instead of es-419.
Android does not support UN M.49 territory codes. Instead:
  *  4.2 and earlier return an empty string;
  *  4.3 throws a MissingResourceException.
2013-07-28 18:33:24 +01:00
Reece H. Dunn 90c4af631c TextToSpeechTestCase.java: wait for the voices to be installed and available before running the tests. 2013-07-28 17:01:32 +01:00
Reece H. Dunn 4a1743b174 Factor out the TextToSpeech engine initialization to a TextToSpeechTestCase helper class. 2013-07-28 16:31:48 +01:00
Reece H. Dunn 23005243da Fix a crash running the tests when running 'gradle connectedCheck' when the espeak application is not installed. 2013-07-28 16:20:43 +01:00
Reece H. Dunn 8406cd5e7a autotools: support running the Android tests from 'make check' 2013-07-28 16:17:45 +01:00
Reece H. Dunn bb0a8a3c7a Ensure the tests pass on Android 4.0 - 4.2. 2013-07-28 15:34:30 +01:00
Reece H. Dunn 3d2d277a10 Avoid MissingResourceException on calls to getISO3CountryCode. 2013-07-27 18:30:34 +01:00
Reece H. Dunn db49a68f70 build.gradle: get the instrument tests building 2013-07-27 15:38:55 +01:00
Reece H. Dunn 9d7ee61aad build.gradle: convert tabs to spaces 2013-07-27 13:29:40 +01:00
Reece H. Dunn fb31c11735 build.gradle: add a defaultConfig section 2013-07-27 13:28:16 +01:00
Reece H. Dunn b1c06da202 Merge branch 'master' into android 2013-07-27 11:16:46 +01:00
Reece H. Dunn 3815c54cbb CheckVoiceData.java: remove a comment about not returning data that is deprecated in API 18. 2013-07-27 11:15:33 +01:00
Reece H. Dunn 6bbef4e496 GetSampleText.java: API 18 provides a constant for the 'sampleText' return value, so use it 2013-07-27 11:13:28 +01:00