From 660f18f3a3d9bc25978f7865c8a267433c110ba2 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Fri, 1 Jan 2016 14:05:33 +0000 Subject: [PATCH] Make use of the new espeak_ng_InitializePath API. --- src/espeak-ng.c | 6 +++--- src/include/espeak-ng/espeak_ng.h | 2 -- src/libespeak-ng/speak_lib.c | 3 --- src/speak-ng.c | 6 +++--- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/espeak-ng.c b/src/espeak-ng.c index 93f1f46a..535266ce 100644 --- a/src/espeak-ng.c +++ b/src/espeak-ng.c @@ -566,13 +566,13 @@ int main(int argc, char **argv) phonemes_separator = 0x200d; // ZWJ break; case 0x10e: // --compile-mbrola - samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, 0); + espeak_ng_InitializePath(data_path); return (espeak_ng_CompileMbrolaVoice(optarg2, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE; case 0x10f: // --compile-intonations - samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, espeakINITIALIZE_PATH_ONLY); + espeak_ng_InitializePath(data_path); return (espeak_ng_CompileIntonation(stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE; case 0x110: // --compile-phonemes - samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, espeakINITIALIZE_PATH_ONLY); + espeak_ng_InitializePath(data_path); return (espeak_ng_CompilePhonemeData(22050, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE; default: exit(0); diff --git a/src/include/espeak-ng/espeak_ng.h b/src/include/espeak-ng/espeak_ng.h index 252689d4..63570670 100644 --- a/src/include/espeak-ng/espeak_ng.h +++ b/src/include/espeak-ng/espeak_ng.h @@ -44,8 +44,6 @@ typedef enum { ENE_VERSION_MISMATCH = -5, } espeak_ng_STATUS; -#define espeakINITIALIZE_PATH_ONLY 0x4000 - ESPEAK_NG_API void espeak_ng_InitializePath(const char *path); diff --git a/src/libespeak-ng/speak_lib.c b/src/libespeak-ng/speak_lib.c index 3e0d80d6..a399fde0 100644 --- a/src/libespeak-ng/speak_lib.c +++ b/src/libespeak-ng/speak_lib.c @@ -613,9 +613,6 @@ ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output_type, int buf_length } espeak_ng_InitializePath(path); - if (options & espeakINITIALIZE_PATH_ONLY) - return 0; - initialise(options); select_output(output_type); diff --git a/src/speak-ng.c b/src/speak-ng.c index 1787ec26..df78ec3f 100644 --- a/src/speak-ng.c +++ b/src/speak-ng.c @@ -593,13 +593,13 @@ int main(int argc, char **argv) phonemes_separator = 0x200d; // ZWJ break; case 0x10e: // --compile-mbrola - samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, 0); + espeak_ng_InitializePath(data_path); return (espeak_ng_CompileMbrolaVoice(optarg2, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE; case 0x10f: // --compile-intonations - samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, espeakINITIALIZE_PATH_ONLY); + espeak_ng_InitializePath(data_path); return (espeak_ng_CompileIntonation(stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE; case 0x110: // --compile-phonemes - samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, espeakINITIALIZE_PATH_ONLY); + espeak_ng_InitializePath(data_path); return (espeak_ng_CompilePhonemeData(22050, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE; default: exit(0);