From 8b32702627550aa68d2f9bf7877d85c5d0c5410e Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 2 Jan 2016 13:57:00 +0000 Subject: [PATCH] Move the espeak_CompileDictionary implementation to espeak_api.c. --- src/libespeak-ng/espeak_api.c | 13 ++++++++++++- src/libespeak-ng/speech.c | 5 ----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/libespeak-ng/espeak_api.c b/src/libespeak-ng/espeak_api.c index db7f48e7..d3933a76 100644 --- a/src/libespeak-ng/espeak_api.c +++ b/src/libespeak-ng/espeak_api.c @@ -22,8 +22,14 @@ #include "espeak_ng.h" #include +#if HAVE_STDINT_H +#include +#endif -extern int option_phoneme_events; // from translate.h +#include "speech.h" +#include "phoneme.h" +#include "synthesize.h" +#include "translate.h" #pragma GCC visibility push(default) @@ -62,4 +68,9 @@ ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output_type, int buf_length return espeak_ng_GetSampleRate(); } +ESPEAK_API void espeak_CompileDictionary(const char *path, FILE *log, int flags) +{ + espeak_ng_CompileDictionary(path, dictionary_name, log, flags); +} + #pragma GCC visibility pop diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c index ac22c468..7ad25c44 100644 --- a/src/libespeak-ng/speech.c +++ b/src/libespeak-ng/speech.c @@ -871,11 +871,6 @@ ESPEAK_API const char *espeak_TextToPhonemes(const void **textptr, int textmode, return GetTranslatedPhonemeString(phonememode); } -ESPEAK_API void espeak_CompileDictionary(const char *path, FILE *log, int flags) -{ - espeak_ng_CompileDictionary(path, dictionary_name, log, flags); -} - ESPEAK_API espeak_ERROR espeak_Cancel(void) { #ifdef USE_ASYNC