diff --git a/src/libespeak-ng/espeak_api.c b/src/libespeak-ng/espeak_api.c index 23c288dd..6d2f1ad3 100644 --- a/src/libespeak-ng/espeak_api.c +++ b/src/libespeak-ng/espeak_api.c @@ -84,24 +84,6 @@ ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output_type, int buf_length return espeak_ng_GetSampleRate(); } -ESPEAK_API void espeak_SetSynthCallback(t_espeak_callback *SynthCallback) -{ - synth_callback = SynthCallback; -#ifdef USE_ASYNC - event_set_callback(synth_callback); -#endif -} - -ESPEAK_API void espeak_SetUriCallback(int (*UriCallback)(int, const char *, const char *)) -{ - uri_callback = UriCallback; -} - -ESPEAK_API void espeak_SetPhonemeCallback(int (*PhonemeCallback)(const char *)) -{ - phoneme_callback = PhonemeCallback; -} - ESPEAK_API espeak_ERROR espeak_Synth(const void *text, size_t size, unsigned int position, espeak_POSITION_TYPE position_type, diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c index b7f545be..88aaa4fd 100644 --- a/src/libespeak-ng/speech.c +++ b/src/libespeak-ng/speech.c @@ -597,6 +597,24 @@ void sync_espeak_SetPunctuationList(const wchar_t *punctlist) #pragma GCC visibility push(default) +ESPEAK_API void espeak_SetSynthCallback(t_espeak_callback *SynthCallback) +{ + synth_callback = SynthCallback; +#ifdef USE_ASYNC + event_set_callback(synth_callback); +#endif +} + +ESPEAK_API void espeak_SetUriCallback(int (*UriCallback)(int, const char *, const char *)) +{ + uri_callback = UriCallback; +} + +ESPEAK_API void espeak_SetPhonemeCallback(int (*PhonemeCallback)(const char *)) +{ + phoneme_callback = PhonemeCallback; +} + ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Synthesize(const void *text, size_t size, unsigned int position,