From 25c4dc150a489a13f0769a38828d52ed6f99e947 Mon Sep 17 00:00:00 2001 From: Yury Popov Date: Sat, 19 Nov 2022 17:07:42 +0300 Subject: [PATCH] code cleanup: static phoneme_callback --- src/libespeak-ng/speech.c | 6 ------ src/libespeak-ng/synthesize.c | 9 +++++++++ src/libespeak-ng/translate.h | 2 -- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c index cdbb89ba..befbb35e 100644 --- a/src/libespeak-ng/speech.c +++ b/src/libespeak-ng/speech.c @@ -84,7 +84,6 @@ static int min_buffer_length = 60; // minimum buffer length in ms static espeak_ng_STATUS err = ENS_OK; static t_espeak_callback *synth_callback = NULL; -int (*phoneme_callback)(const char *) = NULL; char path_home[N_PATH_HOME]; // this is the espeak-ng-data directory extern int saved_parameters[N_SPEECH_PARAM]; // Parameters saved on synthesis start @@ -653,11 +652,6 @@ ESPEAK_API void espeak_SetSynthCallback(t_espeak_callback *SynthCallback) #endif } -ESPEAK_API void espeak_SetPhonemeCallback(int (*PhonemeCallback)(const char *)) -{ - phoneme_callback = PhonemeCallback; -} - ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Synthesize(const void *text, size_t size, unsigned int position, diff --git a/src/libespeak-ng/synthesize.c b/src/libespeak-ng/synthesize.c index 23c2eb98..217a05a0 100644 --- a/src/libespeak-ng/synthesize.c +++ b/src/libespeak-ng/synthesize.c @@ -68,6 +68,8 @@ static int syllable_centre; static voice_t *new_voice = NULL; +static int (*phoneme_callback)(const char *) = NULL; + #define RMS_GLOTTAL1 35 // vowel before glottal stop #define RMS_START 28 // 28 #define VOWEL_FRONT_LENGTH 50 @@ -1588,3 +1590,10 @@ int SpeakNextClause(int control) return 1; } + +#pragma GCC visibility push(default) +ESPEAK_API void espeak_SetPhonemeCallback(int (*PhonemeCallback)(const char *)) +{ + phoneme_callback = PhonemeCallback; +} +#pragma GCC visibility pop diff --git a/src/libespeak-ng/translate.h b/src/libespeak-ng/translate.h index 3fc2d4c9..99f697bd 100644 --- a/src/libespeak-ng/translate.h +++ b/src/libespeak-ng/translate.h @@ -649,8 +649,6 @@ extern char dictionary_name[40]; extern espeak_ng_TEXT_DECODER *p_decoder; extern int dictionary_skipwords; -extern int (*phoneme_callback)(const char *); - #define LEADING_2_BITS 0xC0 // 0b11000000 #define UTF8_TAIL_BITS 0x80 // 0b10000000