From 4ba60623e8126dc110925b95e50b7b6ecfd14783 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 2 Jan 2016 18:20:22 +0000 Subject: [PATCH] Create an espeak-ng version of espeak_Synchronize. --- src/include/espeak-ng/espeak_ng.h | 3 +++ src/libespeak-ng/espeak_api.c | 5 +++++ src/libespeak-ng/speech.c | 10 +++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/include/espeak-ng/espeak_ng.h b/src/include/espeak-ng/espeak_ng.h index 5d7e6bc6..b284f1f6 100644 --- a/src/include/espeak-ng/espeak_ng.h +++ b/src/include/espeak-ng/espeak_ng.h @@ -100,6 +100,9 @@ espeak_ng_SpeakCharacter(wchar_t character); ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Cancel(void); +ESPEAK_NG_API espeak_ng_STATUS +espeak_ng_Synchronize(void); + ESPEAK_NG_API espeak_ng_STATUS espeak_ng_CompileDictionary(const char *dsource, const char *dict_name, diff --git a/src/libespeak-ng/espeak_api.c b/src/libespeak-ng/espeak_api.c index f0ac7d8b..791bab01 100644 --- a/src/libespeak-ng/espeak_api.c +++ b/src/libespeak-ng/espeak_api.c @@ -146,6 +146,11 @@ ESPEAK_API espeak_ERROR espeak_Cancel(void) return status_to_espeak_error(espeak_ng_Cancel()); } +ESPEAK_API espeak_ERROR espeak_Synchronize(void) +{ + return status_to_espeak_error(espeak_ng_Synchronize()); +} + ESPEAK_API void espeak_CompileDictionary(const char *path, FILE *log, int flags) { espeak_ng_CompileDictionary(path, dictionary_name, log, flags); diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c index f1368597..2a7050d5 100644 --- a/src/libespeak-ng/speech.c +++ b/src/libespeak-ng/speech.c @@ -71,7 +71,7 @@ static void *my_user_data = NULL; static espeak_ng_OUTPUT_MODE my_mode = ENOUTPUT_MODE_SYNCHRONOUS; static int out_samplerate = 0; static int voice_samplerate = 22050; -static espeak_ERROR err = EE_OK; +static espeak_ng_STATUS err = ENS_OK; t_espeak_callback *synth_callback = NULL; int (*uri_callback)(int, const char *, const char *) = NULL; @@ -112,7 +112,7 @@ static int dispatch_audio(short *outbuf, int length, espeak_EVENT *event) out_samplerate = voice_samplerate; my_audio = wave_open(voice_samplerate, option_device); if (!my_audio) { - err = EE_INTERNAL_ERROR; + err = ENS_AUDIO_ERROR; return -1; } wave_set_callback_is_output_enabled(fifo_is_command_enabled); @@ -837,14 +837,14 @@ ESPEAK_API int espeak_IsPlaying(void) #endif } -ESPEAK_API espeak_ERROR espeak_Synchronize(void) +ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Synchronize(void) { - espeak_ERROR berr = err; + espeak_ng_STATUS berr = err; #ifdef USE_ASYNC while (espeak_IsPlaying()) usleep(20000); #endif - err = EE_OK; + err = ENS_OK; return berr; }