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

cleanup: move words to LoadLanguageOptions()

Browse Source
This commit is contained in:
Juho Hiltunen
2022-10-09 16:38:53 +03:00
parent ac82698f99
commit b820b68182
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/langopts.c
+9
View File
@@ -230,6 +230,14 @@ void LoadLanguageOptions(Translator *translator, int key, char *keyValue ) {
}
break;
}
case V_WORDGAP: {
if (CheckTranslator(translator, langopts_tab, key) != 0)
break;
sscanf(keyValue, "%d %d", &translator->langopts.word_gap, &translator->langopts.vowel_pause);
break;
}
case V_MAINTAINER:
@@ -247,3 +255,4 @@ static int LookupTune(const char *name) {
}
return -1;
}
src/libespeak-ng/voices.c
+1 -7
View File
@@ -131,6 +131,7 @@ const MNEM_TAB langopts_tab[] = {
{ "stressOpt", V_STRESSOPT },
{ "stressRule", V_STRESSRULE },
{ "tunes", V_TUNES },
{ "words", V_WORDGAP },
{ "maintainer", V_MAINTAINER },
{ "status", V_STATUS },
@@ -149,7 +150,6 @@ static const MNEM_TAB keyword_tab[] = {
{ "phonemes", V_PHONEMES },
{ "dictionary", V_DICTIONARY },
{ "replace", V_REPLACE },
{ "words", V_WORDGAP },
{ "echo", V_ECHO },
{ "flutter", V_FLUTTER },
{ "roughness", V_ROUGHNESS },
@@ -524,7 +524,6 @@ voice_t *LoadVoice(const char *vname, int control)
char *p;
int key;
int ix;
int n;
int value;
int langix = 0;
int tone_only = control & 2;
@@ -715,12 +714,7 @@ voice_t *LoadVoice(const char *vname, int control)
}
PhonemeReplacement(p);
break;
case V_WORDGAP: // words
if (CheckTranslator(translator, keyword_tab, key) != 0)
break;
sscanf(p, "%d %d", &translator->langopts.word_gap, &translator->langopts.vowel_pause);
break;
case V_ECHO:
// echo. suggest: 135mS 11%
value = 0;