Browse Source

Move more initialization logic to espeak_ng_Initialize.

master
Reece H. Dunn 9 years ago
parent
commit
e341068d57
1 changed files with 13 additions and 16 deletions
  1. 13
    16
      src/libespeak-ng/speak_lib.c

+ 13
- 16
src/libespeak-ng/speak_lib.c View File

@@ -331,10 +331,22 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Initialize(void)
SynthesizeInit();
InitNamedata();

VoiceReset(0);

for (param = 0; param < N_SPEECH_PARAM; param++)
param_stack[0].parameter[param] = param_defaults[param];

return 0;
SetParameter(espeakRATE, 175, 0);
SetParameter(espeakVOLUME, 100, 0);
SetParameter(espeakCAPITALS, option_capitals, 0);
SetParameter(espeakPUNCTUATION, option_punctuation, 0);
SetParameter(espeakWORDGAP, 0, 0);

#ifdef USE_ASYNC
fifo_init();
#endif

return ENS_OK;
}
#pragma GCC visibility pop

@@ -639,21 +651,6 @@ ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output_type, int buf_length
option_phonemes = 0;
option_phoneme_events = (options & (espeakINITIALIZE_PHONEME_EVENTS | espeakINITIALIZE_PHONEME_IPA));

VoiceReset(0);

for (param = 0; param < N_SPEECH_PARAM; param++)
param_stack[0].parameter[param] = saved_parameters[param] = param_defaults[param];

SetParameter(espeakRATE, 175, 0);
SetParameter(espeakVOLUME, 100, 0);
SetParameter(espeakCAPITALS, option_capitals, 0);
SetParameter(espeakPUNCTUATION, option_punctuation, 0);
SetParameter(espeakWORDGAP, 0, 0);

#ifdef USE_ASYNC
fifo_init();
#endif

return samplerate;
}


Loading…
Cancel
Save