From e341068d57dfec122cbb732b1a75c685d3fec059 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Fri, 1 Jan 2016 14:57:03 +0000 Subject: [PATCH] Move more initialization logic to espeak_ng_Initialize. --- src/libespeak-ng/speak_lib.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/libespeak-ng/speak_lib.c b/src/libespeak-ng/speak_lib.c index 3c09a119..b5a9d395 100644 --- a/src/libespeak-ng/speak_lib.c +++ b/src/libespeak-ng/speak_lib.c @@ -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; }