From 079712ab793b69cd3be4f28b238dd63d1ed39a90 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sat, 2 Jan 2016 18:10:35 +0000
Subject: [PATCH] Create an espeak-ng version of espeak_Cancel.

---
 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 85ccdc1e..5d7e6bc6 100644
--- a/src/include/espeak-ng/espeak_ng.h
+++ b/src/include/espeak-ng/espeak_ng.h
@@ -97,6 +97,9 @@ espeak_ng_SpeakKeyName(const char *key_name);
 ESPEAK_NG_API espeak_ng_STATUS
 espeak_ng_SpeakCharacter(wchar_t character);
 
+ESPEAK_NG_API espeak_ng_STATUS
+espeak_ng_Cancel(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 1f643a34..f0ac7d8b 100644
--- a/src/libespeak-ng/espeak_api.c
+++ b/src/libespeak-ng/espeak_api.c
@@ -141,6 +141,11 @@ ESPEAK_API espeak_ERROR espeak_SetPunctuationList(const wchar_t *punctlist)
 	return status_to_espeak_error(espeak_ng_SetPunctuationList(punctlist));
 }
 
+ESPEAK_API espeak_ERROR espeak_Cancel(void)
+{
+	return status_to_espeak_error(espeak_ng_Cancel());
+}
+
 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 8648bd49..f1368597 100644
--- a/src/libespeak-ng/speech.c
+++ b/src/libespeak-ng/speech.c
@@ -808,7 +808,7 @@ ESPEAK_API const char *espeak_TextToPhonemes(const void **textptr, int textmode,
 	return GetTranslatedPhonemeString(phonememode);
 }
 
-ESPEAK_API espeak_ERROR espeak_Cancel(void)
+ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Cancel(void)
 {
 #ifdef USE_ASYNC
 	fifo_stop();
@@ -822,7 +822,7 @@ ESPEAK_API espeak_ERROR espeak_Cancel(void)
 	for (int i = 0; i < N_SPEECH_PARAM; i++)
 		SetParameter(i, saved_parameters[i], 0);
 
-	return EE_OK;
+	return ENS_OK;
 }
 
 ESPEAK_API int espeak_IsPlaying(void)