Lang=fr change to phonemes [o] [O] [A~] [O~] [R]

Added new phonemes [s.] and [z.] (as common phonemes), use in Lang=ru, Lang=sv, Lang=hi
Remake WAV files for [s;] and [z;] phonemes.
espeak_Terminate(), set pointers to NULL after free().
espeak_Initialize(), returns EE_INTERNAL_ERROR (-1) if fails to allocate memory.
Change to the default tone setting (array: tone_points in voices.cpp).


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@5 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-05-08 08:02:15 +00:00
parent 9099061844
commit 2a5c9b6748
29 changed files with 1413 additions and 132 deletions
+10 -6
View File
@@ -47,6 +47,9 @@ MNEM_TAB genders [] = {
{"female", 2},
{NULL, 0 }};
//int tone_points[10] = {250,140, 1200,110, -1,0, -1,0, -1,0};
int tone_points[10] = {600,180, 1200,140, 2000,110, 3000,110, -1,0};
// limit the rate of change for each formant number
//static int formant_rate_22050[9] = {50, 104, 165, 230, 220, 220, 220, 220, 220}; // values for 22kHz sample rate
static int formant_rate_22050[9] = {50, 100, 165, 200, 200, 200, 200, 200, 200}; // values for 22kHz sample rate
@@ -155,7 +158,6 @@ const char variants_female[N_VOICE_VARIANTS] = {11,12,13,14,0};
const char *variant_lists[3] = {variants_either, variants_male, variants_female};
int tone_points[10] = {250,140, 1200,110, -1,0, -1,0, -1,0};
void SetToneAdjust(voice_t *voice, int *tone_pts)
{//==============================================
@@ -544,11 +546,6 @@ voice_t *LoadVoice(char *vname, int control)
}
f_voice = fopen(buf,"r");
if(first_voice == NULL)
{
first_voice = ReadVoiceFile(f_voice,buf+len_path_voices,voicename);
rewind(f_voice);
}
language_type = "en"; // default
if(f_voice == NULL)
@@ -560,6 +557,13 @@ voice_t *LoadVoice(char *vname, int control)
language_type = voicename;
}
if(first_voice == NULL)
{
first_voice = ReadVoiceFile(f_voice,buf+strlen(path_voices),voicename);
rewind(f_voice);
}
if(!tone_only && (translator != NULL))
{
delete translator;