mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-02 22:07:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use espeak_ng_PrintStatusCodeMessage for espeak_ng_Initialize error formatting.

Browse Source
This commit is contained in:
Reece H. Dunn
2016-01-03 14:21:13 +00:00
parent f8b3764bef
commit 77eb4262f2
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/espeak-ng.c
+1 -4
View File
@@ -590,10 +590,7 @@ int main(int argc, char **argv)
espeak_ng_InitializePath(data_path);
espeak_ng_STATUS result = espeak_ng_Initialize();
if (result != ENS_OK) {
if (result == ENS_VERSION_MISMATCH)
fprintf(stderr, "Wrong version of espeak-data\n");
else
fprintf(stderr, "Failed to load espeak-data\n");
espeak_ng_PrintStatusCodeMessage(result, stderr);
exit(1);
}
src/libespeak-ng/espeak_api.c
+3 -7
View File
@@ -55,13 +55,9 @@ ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output_type, int buf_length
espeak_ng_InitializePath(path);
espeak_ng_STATUS result = espeak_ng_Initialize();
if (result != ENS_OK) {
if (result == ENS_VERSION_MISMATCH)
fprintf(stderr, "Wrong version of espeak-data\n");
else {
fprintf(stderr, "Failed to load espeak-data\n");
if ((options & espeakINITIALIZE_DONT_EXIT) == 0)
exit(1);
}
espeak_ng_PrintStatusCodeMessage(result, stderr);
if ((options & espeakINITIALIZE_DONT_EXIT) == 0)
exit(1);
}
switch (output_type)
src/speak-ng.c
+1 -4
View File
@@ -577,10 +577,7 @@ int main(int argc, char **argv)
espeak_ng_InitializePath(data_path);
espeak_ng_STATUS result = espeak_ng_Initialize();
if (result != ENS_OK) {
if (result == ENS_VERSION_MISMATCH)
fprintf(stderr, "Wrong version of espeak-data (expected 0x%x) at %s\n", version_phdata, path_home);
else
fprintf(stderr, "Failed to load espeak-data\n");
espeak_ng_PrintStatusCodeMessage(result, stderr);
exit(1);
}