mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: move stressRule to LoadLanguageOptions()

Browse Source
This commit is contained in:
Juho Hiltunen
2022-10-09 16:38:53 +03:00
parent 9caada3b31
commit 8e3399bb98
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/langopts.c
+9 -1
View File
@@ -139,7 +139,6 @@ void LoadLanguageOptions(Translator *translator, int key, char *keyValue ) {
}
break;
}
case V_STRESSOPT: {
if (CheckTranslator(translator, langopts_tab, key) != 0)
break;
@@ -147,7 +146,16 @@ void LoadLanguageOptions(Translator *translator, int key, char *keyValue ) {
ReadNumbers(keyValue, &translator->langopts.stress_flags, 32, langopts_tab, key);
break;
}
case V_STRESSRULE: {
if (CheckTranslator(translator, langopts_tab, key) != 0)
break;
sscanf(keyValue, "%d %d %d", &translator->langopts.stress_rule,
&translator->langopts.unstressed_wd1,
&translator->langopts.unstressed_wd2);
break;
}
case V_MAINTAINER:
case V_STATUS:
src/libespeak-ng/voices.c
+1 -10
View File
@@ -126,6 +126,7 @@ const MNEM_TAB langopts_tab[] = {
{ "stressAmp", V_STRESSAMP },
{ "stressLength", V_STRESSLENGTH },
{ "stressOpt", V_STRESSOPT },
{ "stressRule", V_STRESSRULE },
{ "maintainer", V_MAINTAINER },
{ "status", V_STATUS },
@@ -146,7 +147,6 @@ static const MNEM_TAB keyword_tab[] = {
{ "intonation", V_INTONATION },
{ "tunes", V_TUNES },
{ "dictrules", V_DICTRULES },
{ "stressRule", V_STRESSRULE },
{ "replace", V_REPLACE },
{ "words", V_WORDGAP },
{ "echo", V_ECHO },
@@ -784,15 +784,6 @@ voice_t *LoadVoice(const char *vname, int control)
break;
sscanf(p, "%d %d", &translator->langopts.word_gap, &translator->langopts.vowel_pause);
break;
case V_STRESSRULE:
if (CheckTranslator(translator, keyword_tab, key) != 0)
break;
sscanf(p, "%d %d %d", &translator->langopts.stress_rule,
&translator->langopts.unstressed_wd1,
&translator->langopts.unstressed_wd2);
break;
case V_ECHO:
// echo. suggest: 135mS 11%