From f5ead44481d7499cd47c10bbdaba63604d2feb25 Mon Sep 17 00:00:00 2001 From: Yury Popov Date: Sat, 19 Nov 2022 17:02:22 +0300 Subject: [PATCH] code cleanup: static current_phoneme_table --- src/libespeak-ng/phoneme.h | 1 - src/libespeak-ng/synthdata.c | 4 +++- src/libespeak-ng/synthesize.c | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libespeak-ng/phoneme.h b/src/libespeak-ng/phoneme.h index 325a16d6..470d31dd 100644 --- a/src/libespeak-ng/phoneme.h +++ b/src/libespeak-ng/phoneme.h @@ -249,7 +249,6 @@ phoneme_add_feature(PHONEME_TAB *phoneme, // Several phoneme tables may be loaded into memory. phoneme_tab points to // one for the current voice extern int n_phoneme_tab; -extern int current_phoneme_table; extern PHONEME_TAB *phoneme_tab[N_PHONEME_TAB]; typedef struct { diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c index 5dc51fba..c4d4a188 100644 --- a/src/libespeak-ng/synthdata.c +++ b/src/libespeak-ng/synthdata.c @@ -49,7 +49,7 @@ const int version_phdata = 0x014801; // copy the current phoneme table into here int n_phoneme_tab; -int current_phoneme_table; +static int current_phoneme_table; PHONEME_TAB *phoneme_tab[N_PHONEME_TAB]; static unsigned short *phoneme_index = NULL; @@ -164,6 +164,7 @@ void FreePhData(void) phoneme_index = NULL; phondata_ptr = NULL; tunes = NULL; + current_phoneme_table = -1; } int PhonemeCode(unsigned int mnem) @@ -353,6 +354,7 @@ static void SetUpPhonemeTable(int number) void SelectPhonemeTable(int number) { + if (current_phoneme_table == number) return; n_phoneme_tab = 0; MAKE_MEM_UNDEFINED(&phoneme_tab, sizeof(phoneme_tab)); SetUpPhonemeTable(number); // recursively for included phoneme tables diff --git a/src/libespeak-ng/synthesize.c b/src/libespeak-ng/synthesize.c index ebcddb7e..23c2eb98 100644 --- a/src/libespeak-ng/synthesize.c +++ b/src/libespeak-ng/synthesize.c @@ -1549,8 +1549,7 @@ int SpeakNextClause(int control) return 0; } - if (current_phoneme_table != voice->phoneme_tab_ix) - SelectPhonemeTable(voice->phoneme_tab_ix); + SelectPhonemeTable(voice->phoneme_tab_ix); // read the next clause from the input text file, translate it, and generate // entries in the wavegen command queue