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

Move more initialization logic to espeak_ng_Initialize.

Browse Source
This commit is contained in:
Reece H. Dunn
2016-01-01 16:06:31 +00:00
parent 75f7558801
commit e341068d57
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/speak_lib.c
+13 -16
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;
}