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

cleanup: moved intonation to LoadLanguageOptions()

Browse Source
This commit is contained in:
Juho Hiltunen
2022-10-09 16:38:53 +03:00
parent 8e3399bb98
commit e38142acd1
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/langopts.c
+10 -1
View File
@@ -87,6 +87,16 @@ void LoadLanguageOptions(Translator *translator, int key, char *keyValue ) {
int ix;
switch (key) {
case V_INTONATION: {
sscanf(keyValue, "%d", &option_tone_flags);
if ((option_tone_flags & 0xff) != 0) {
if (CheckTranslator(translator, langopts_tab, key) != 0)
break;
translator->langopts.intonation_group = option_tone_flags & 0xff;
}
break;
}
case V_LOWERCASE_SENTENCE: {
if (CheckTranslator(translator, langopts_tab, key) != 0)
break;
@@ -94,7 +104,6 @@ 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;
src/libespeak-ng/voices.c
+1 -10
View File
@@ -121,6 +121,7 @@ enum {
};
const MNEM_TAB langopts_tab[] = {
{ "intonation", V_INTONATION },
{ "lowercaseSentence", V_LOWERCASE_SENTENCE },
{ "stressAdd", V_STRESSADD },
{ "stressAmp", V_STRESSAMP },
@@ -144,7 +145,6 @@ static const MNEM_TAB keyword_tab[] = {
{ "pitch", V_PITCH },
{ "phonemes", V_PHONEMES },
{ "dictionary", V_DICTIONARY },
{ "intonation", V_INTONATION },
{ "tunes", V_TUNES },
{ "dictrules", V_DICTRULES },
{ "replace", V_REPLACE },
@@ -715,15 +715,6 @@ voice_t *LoadVoice(const char *vname, int control)
break;
case V_INTONATION: // intonation
sscanf(p, "%d", &option_tone_flags);
if ((option_tone_flags & 0xff) != 0) {
if (CheckTranslator(translator, keyword_tab, key) != 0)
break;
translator->langopts.intonation_group = option_tone_flags & 0xff;
}
break;
case V_TUNES:
if (CheckTranslator(translator, keyword_tab, key) != 0)
break;