Browse Source

cleanup: move stressOpt to LoadLanguageOptions()

master
Juho Hiltunen 2 years ago
parent
commit
9caada3b31
3 changed files with 12 additions and 8 deletions
  1. 9
    0
      src/libespeak-ng/langopts.c
  2. 1
    0
      src/libespeak-ng/voice.h
  3. 2
    8
      src/libespeak-ng/voices.c

+ 9
- 0
src/libespeak-ng/langopts.c View File

break; break;
} }


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

ReadNumbers(keyValue, &translator->langopts.stress_flags, 32, langopts_tab, key);
break;
}


case V_MAINTAINER: case V_MAINTAINER:
case V_STATUS: case V_STATUS:
break; break;

+ 1
- 0
src/libespeak-ng/voice.h View File

voice_t *LoadVoiceVariant(const char *voice_name, int variant); voice_t *LoadVoiceVariant(const char *voice_name, int variant);
espeak_ng_STATUS DoVoiceChange(voice_t *v); espeak_ng_STATUS DoVoiceChange(voice_t *v);
void WavegenSetVoice(voice_t *v); void WavegenSetVoice(voice_t *v);
void ReadNumbers(char *p, int *flags, int maxValue, const MNEM_TAB *keyword_tab, int key);
int Read8Numbers(char *data_in, int data[8]); int Read8Numbers(char *data_in, int data[8]);
void ReadTonePoints(char *string, int *tone_pts); void ReadTonePoints(char *string, int *tone_pts);
void VoiceReset(int control); void VoiceReset(int control);

+ 2
- 8
src/libespeak-ng/voices.c View File

{ "stressAdd", V_STRESSADD }, { "stressAdd", V_STRESSADD },
{ "stressAmp", V_STRESSAMP }, { "stressAmp", V_STRESSAMP },
{ "stressLength", V_STRESSLENGTH }, { "stressLength", V_STRESSLENGTH },
{ "stressOpt", V_STRESSOPT },


{ "maintainer", V_MAINTAINER }, { "maintainer", V_MAINTAINER },
{ "status", V_STATUS }, { "status", V_STATUS },
{ "tunes", V_TUNES }, { "tunes", V_TUNES },
{ "dictrules", V_DICTRULES }, { "dictrules", V_DICTRULES },
{ "stressRule", V_STRESSRULE }, { "stressRule", V_STRESSRULE },
{ "stressOpt", V_STRESSOPT },
{ "replace", V_REPLACE }, { "replace", V_REPLACE },
{ "words", V_WORDGAP }, { "words", V_WORDGAP },
{ "echo", V_ECHO }, { "echo", V_ECHO },
&data[0], &data[1], &data[2], &data[3], &data[4], &data[5], &data[6], &data[7]); &data[0], &data[1], &data[2], &data[3], &data[4], &data[5], &data[6], &data[7]);
} }


static void ReadNumbers(char *p, int *flags, int maxValue, const MNEM_TAB *keyword_tab, int key) {
void ReadNumbers(char *p, int *flags, int maxValue, const MNEM_TAB *keyword_tab, int key) {
// read a list of numbers from string p // read a list of numbers from string p
// store them as flags in *flags // store them as flags in *flags
// the meaning of the numbers is bit ordinals, not integer values // the meaning of the numbers is bit ordinals, not integer values


ReadNumbers(p, &translator->dict_condition, 32, keyword_tab, key); ReadNumbers(p, &translator->dict_condition, 32, keyword_tab, key);
break; break;
case V_STRESSOPT:
if (CheckTranslator(translator, keyword_tab, key) != 0)
break;

ReadNumbers(p, &translator->langopts.stress_flags, 32, keyword_tab, key);
break;


case V_NUMBERS: case V_NUMBERS:
if (CheckTranslator(translator, keyword_tab, key) != 0) if (CheckTranslator(translator, keyword_tab, key) != 0)

Loading…
Cancel
Save