Browse Source

cleanup: moved intonation to LoadLanguageOptions()

master
Juho Hiltunen 2 years ago
parent
commit
e38142acd1
2 changed files with 11 additions and 11 deletions
  1. 10
    1
      src/libespeak-ng/langopts.c
  2. 1
    10
      src/libespeak-ng/voices.c

+ 10
- 1
src/libespeak-ng/langopts.c View File

int ix; int ix;


switch (key) { 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: { case V_LOWERCASE_SENTENCE: {
if (CheckTranslator(translator, langopts_tab, key) != 0) if (CheckTranslator(translator, langopts_tab, key) != 0)
break; break;
translator->langopts.lowercase_sentence = true; translator->langopts.lowercase_sentence = true;
break; break;
} }

case V_STRESSADD: { // stressAdd case V_STRESSADD: { // stressAdd
if (CheckTranslator(translator, langopts_tab, key) != 0) if (CheckTranslator(translator, langopts_tab, key) != 0)
break; break;

+ 1
- 10
src/libespeak-ng/voices.c View File

}; };


const MNEM_TAB langopts_tab[] = { const MNEM_TAB langopts_tab[] = {
{ "intonation", V_INTONATION },
{ "lowercaseSentence", V_LOWERCASE_SENTENCE }, { "lowercaseSentence", V_LOWERCASE_SENTENCE },
{ "stressAdd", V_STRESSADD }, { "stressAdd", V_STRESSADD },
{ "stressAmp", V_STRESSAMP }, { "stressAmp", V_STRESSAMP },
{ "pitch", V_PITCH }, { "pitch", V_PITCH },
{ "phonemes", V_PHONEMES }, { "phonemes", V_PHONEMES },
{ "dictionary", V_DICTIONARY }, { "dictionary", V_DICTIONARY },
{ "intonation", V_INTONATION },
{ "tunes", V_TUNES }, { "tunes", V_TUNES },
{ "dictrules", V_DICTRULES }, { "dictrules", V_DICTRULES },
{ "replace", V_REPLACE }, { "replace", V_REPLACE },
break; 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: case V_TUNES:
if (CheckTranslator(translator, keyword_tab, key) != 0) if (CheckTranslator(translator, keyword_tab, key) != 0)
break; break;

Loading…
Cancel
Save