From d5fdd0eb924988319903044b0d8b79d665eb7750 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 2 Jan 2016 18:24:53 +0000 Subject: [PATCH] Create an espeak-ng version of espeak_Terminate. --- src/include/espeak-ng/espeak_ng.h | 3 +++ src/libespeak-ng/espeak_api.c | 5 +++++ src/libespeak-ng/speech.c | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/include/espeak-ng/espeak_ng.h b/src/include/espeak-ng/espeak_ng.h index b284f1f6..a4ca67c5 100644 --- a/src/include/espeak-ng/espeak_ng.h +++ b/src/include/espeak-ng/espeak_ng.h @@ -103,6 +103,9 @@ espeak_ng_Cancel(void); ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Synchronize(void); +ESPEAK_NG_API espeak_ng_STATUS +espeak_ng_Terminate(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 791bab01..23c288dd 100644 --- a/src/libespeak-ng/espeak_api.c +++ b/src/libespeak-ng/espeak_api.c @@ -151,6 +151,11 @@ ESPEAK_API espeak_ERROR espeak_Synchronize(void) return status_to_espeak_error(espeak_ng_Synchronize()); } +ESPEAK_API espeak_ERROR espeak_Terminate(void) +{ + return status_to_espeak_error(espeak_ng_Terminate()); +} + 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 2a7050d5..b7f545be 100644 --- a/src/libespeak-ng/speech.c +++ b/src/libespeak-ng/speech.c @@ -851,7 +851,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Synchronize(void) extern void FreePhData(void); extern void FreeVoiceList(void); -ESPEAK_API espeak_ERROR espeak_Terminate(void) +ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Terminate(void) { #ifdef USE_ASYNC fifo_stop(); @@ -871,7 +871,7 @@ ESPEAK_API espeak_ERROR espeak_Terminate(void) FreePhData(); FreeVoiceList(); - return EE_OK; + return ENS_OK; } ESPEAK_API const char *espeak_Info(const char **ptr)