Replace the remaining espeak_ERROR code usage with espeak_ng_STATUS.

This commit is contained in:
Reece H. Dunn
2016-01-02 19:24:39 +00:00
parent 3343bb45b6
commit 6aeb5a26f0
4 changed files with 5 additions and 4 deletions
+1
View File
@@ -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 {
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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)
+1 -1
View File
@@ -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;