From 6aeb5a26f0a2e3bc6ac5fbfd9550d0077a1ba0cf Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sat, 2 Jan 2016 19:24:39 +0000
Subject: [PATCH] Replace the remaining espeak_ERROR code usage with
 espeak_ng_STATUS.

---
 src/include/espeak-ng/espeak_ng.h | 1 +
 src/libespeak-ng/speech.c         | 2 +-
 src/libespeak-ng/synth_mbrola.c   | 4 ++--
 src/libespeak-ng/voices.c         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/include/espeak-ng/espeak_ng.h b/src/include/espeak-ng/espeak_ng.h
index 52d95538..40a4af74 100644
--- a/src/include/espeak-ng/espeak_ng.h
+++ b/src/include/espeak-ng/espeak_ng.h
@@ -47,6 +47,7 @@ typedef enum {
 	ENS_MBROLA_NOT_FOUND         = 0x100007FF,
 	ENS_MBROLA_VOICE_NOT_FOUND   = 0x100008FF,
 	ENS_EVENT_BUFFER_FULL        = 0x100009FF,
+	ENS_NOT_SUPPORTED            = 0x10000AFF,
 } espeak_ng_STATUS;
 
 typedef enum {
diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c
index 02d42249..28734de3 100644
--- a/src/libespeak-ng/speech.c
+++ b/src/libespeak-ng/speech.c
@@ -763,7 +763,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SetParameter(espeak_PARAMETER parameter
 	t_espeak_command *c = create_espeak_parameter(parameter, value, relative);
 
 	espeak_ng_STATUS status = fifo_add_command(c);
-	if (status != EE_OK)
+	if (status != ENS_OK)
 		delete_espeak_command(c);
 	return status;
 #else
diff --git a/src/libespeak-ng/synth_mbrola.c b/src/libespeak-ng/synth_mbrola.c
index cc767e15..6716757d 100644
--- a/src/libespeak-ng/synth_mbrola.c
+++ b/src/libespeak-ng/synth_mbrola.c
@@ -625,9 +625,9 @@ void MbrolaReset(void)
 
 // mbrola interface is not compiled, provide dummy functions.
 
-espeak_ERROR LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, int *srate)
+espeak_ng_STATUS LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, int *srate)
 {
-	return EE_INTERNAL_ERROR;
+	return ENS_NOT_SUPPORTED;
 }
 
 int MbrolaGenerate(PHONEME_LIST *phoneme_list, int *n_ph, int resume)
diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c
index 9b0ff8f0..e49351ec 100644
--- a/src/libespeak-ng/voices.c
+++ b/src/libespeak-ng/voices.c
@@ -1554,7 +1554,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SetVoiceByName(const char *name)
 			DoVoiceChange(voice);
 			voice_selector.languages = voice->language_name;
 			SetVoiceStack(&voice_selector, variant_name);
-			return EE_OK;
+			return ENS_OK;
 		}
 	}
 	return ENS_VOICE_NOT_FOUND;