mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-02 06:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.29.02] lang=af: updated af_rules and af_dict

Browse Source 
Changes to voice selection code to accept  voice+variant  voice names in SSML tags.
Changes to voice change code to use function DoVoiceChange().
lang=pt: Don't reduce phoneme [&~] to the more open [&] in unstressed syllables.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@83 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-09-10 10:04:14 +00:00
parent 943e8b300e
commit 40d4adadbf
20 changed files with 362 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/synthesize.cpp
+16 -17
View File
@@ -999,8 +999,8 @@ static void DoMarker(int type, int char_posn, int length, int value)
} // end of Synthesize::DoMarker
static void DoVoice(voice_t *v)
{//============================
void DoVoiceChange(voice_t *v)
{//===========================
// allocate memory for a copy of the voice data, and free it in wavegenfill()
voice_t *v2;
@@ -1413,13 +1413,6 @@ int Generate(PHONEME_LIST *phoneme_list, int *n_ph, int resume)
*n_ph = 0;
}
if(new_voice)
{
// finished the current clause, now change the voice if there was an embedded
// change voice command at the end of it (i.e. clause was broken at the change voice command)
DoVoice(new_voice);
new_voice = NULL;
}
return(0); // finished the phoneme list
} // end of Generate
@@ -1560,14 +1553,6 @@ int SpeakNextClause(FILE *f_in, const void *text_in, int control)
translator->CalcPitches(clause_tone);
translator->CalcLengths();
if(voice_change != NULL)
{
// voice change at the end of the clause (i.e. clause was terminated by a voice change)
new_voice = LoadVoiceVariant(voice_change+1,voice_change[0]); // add a Voice instruction to wavegen at the end of the clause
if(new_voice != NULL)
voice = new_voice;
}
if(skipping_text)
{
n_phoneme_list = 0;
@@ -1586,6 +1571,20 @@ int SpeakNextClause(FILE *f_in, const void *text_in, int control)
Generate(phoneme_list,&n_phoneme_list,0);
WavegenOpenSound();
if(voice_change != NULL)
{
// voice change at the end of the clause (i.e. clause was terminated by a voice change)
new_voice = LoadVoiceVariant(voice_change,0); // add a Voice instruction to wavegen at the end of the clause
}
if(new_voice)
{
// finished the current clause, now change the voice if there was an embedded
// change voice command at the end of it (i.e. clause was broken at the change voice command)
DoVoiceChange(voice);
new_voice = NULL;
}
return(1);
} // end of SpeakNextClause