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

cleanup: move stressAdd to LoadLanguageOptions()

Browse Source
This commit is contained in:
Juho Hiltunen
2022-10-09 16:38:52 +03:00
parent db57230320
commit 2a462e4afe
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/langopts.c
+18
View File
@@ -94,6 +94,24 @@ void LoadLanguageOptions(Translator *translator, int key, char *keyValue ) {
translator->langopts.lowercase_sentence = true;
break;
}
case V_STRESSADD: { // stressAdd
if (CheckTranslator(translator, langopts_tab, key) != 0)
break;
int stress_add_set = 0;
int stress_add[8];
stress_add_set = Read8Numbers(keyValue, stress_add);
for (ix = 0; ix < stress_add_set; ix++) {
translator->stress_lengths[ix] += stress_add[ix];
}
break;
}
case V_STRESSLENGTH: {
if (CheckTranslator(translator, langopts_tab, key) != 0)
break;
src/libespeak-ng/voices.c
+1 -14
View File
@@ -122,6 +122,7 @@ enum {
const MNEM_TAB langopts_tab[] = {
{ "lowercaseSentence", V_LOWERCASE_SENTENCE },
{ "stressAdd", V_STRESSADD },
{ "stressLength", V_STRESSLENGTH },
{ "maintainer", V_MAINTAINER },
@@ -141,7 +142,6 @@ static const MNEM_TAB keyword_tab[] = {
{ "phonemes", V_PHONEMES },
{ "dictionary", V_DICTIONARY },
{ "stressAmp", V_STRESSAMP },
{ "stressAdd", V_STRESSADD },
{ "intonation", V_INTONATION },
{ "tunes", V_TUNES },
{ "dictrules", V_DICTRULES },
@@ -551,7 +551,6 @@ voice_t *LoadVoice(const char *vname, int control)
char buf[sizeof(path_home)+30];
char path_voices[sizeof(path_home)+12];
int stress_add[8];
char names[8][40];
char name1[40];
char name2[80];
@@ -730,19 +729,7 @@ voice_t *LoadVoice(const char *vname, int control)
break;
}
case V_STRESSADD: { // stressAdd
if (CheckTranslator(translator, keyword_tab, key) != 0)
break;
int stress_add_set = 0;
stress_add_set = Read8Numbers(p, stress_add);
for (ix = 0; ix < stress_add_set; ix++) {
translator->stress_lengths[ix] += stress_add[ix];
}
break;
}
case V_INTONATION: // intonation
sscanf(p, "%d", &option_tone_flags);
if ((option_tone_flags & 0xff) != 0) {