Browse Source

Use espeak_ng_PrintStatusCodeMessage for espeak_ng_Initialize error formatting.

master
Reece H. Dunn 9 years ago
parent
commit
77eb4262f2
3 changed files with 5 additions and 15 deletions
  1. 1
    4
      src/espeak-ng.c
  2. 3
    7
      src/libespeak-ng/espeak_api.c
  3. 1
    4
      src/speak-ng.c

+ 1
- 4
src/espeak-ng.c 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);
}


+ 3
- 7
src/libespeak-ng/espeak_api.c 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)

+ 1
- 4
src/speak-ng.c 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);
}


Loading…
Cancel
Save