diff --git a/src/libespeak-ng/intonation.c b/src/libespeak-ng/intonation.c index d5e9092d..c1664218 100644 --- a/src/libespeak-ng/intonation.c +++ b/src/libespeak-ng/intonation.c @@ -287,9 +287,6 @@ static TONE_NUCLEUS tone_nucleus_table[N_TONE_NUCLEUS_TABLE] = { { PITCHfall, 70, 18, PITCHfall, 70, 24, NULL, 32, 20, 0 }, // 12 test }; -int n_tunes = 0; -TUNE *tunes = NULL; - #define SECONDARY 3 #define PRIMARY 4 #define PRIMARY_STRESSED 6 diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c index a2d7ae10..7510cc2a 100644 --- a/src/libespeak-ng/synthdata.c +++ b/src/libespeak-ng/synthdata.c @@ -42,6 +42,9 @@ #include "translate.h" // for Translator, LANGUAGE_OPTIONS #include "voice.h" // for ReadTonePoints, tone_points, voice +int n_tunes = 0; +TUNE *tunes = NULL; + const int version_phdata = 0x014801; // copy the current phoneme table into here diff --git a/src/libespeak-ng/synthdata.h b/src/libespeak-ng/synthdata.h index 5607f056..3548e3c5 100644 --- a/src/libespeak-ng/synthdata.h +++ b/src/libespeak-ng/synthdata.h @@ -56,6 +56,9 @@ int PhonemeCode(unsigned int mnem); void SelectPhonemeTable(int number); int SelectPhonemeTableName(const char *name); +extern int n_tunes; +extern TUNE *tunes; + #ifdef __cplusplus } #endif diff --git a/src/libespeak-ng/synthesize.h b/src/libespeak-ng/synthesize.h index d78e35e1..f8b71a02 100644 --- a/src/libespeak-ng/synthesize.h +++ b/src/libespeak-ng/synthesize.h @@ -382,8 +382,7 @@ typedef struct { int spare2; // the struct length should be a multiple of 4 bytes } TUNE; -extern int n_tunes; -extern TUNE *tunes; + // phoneme table extern PHONEME_TAB *phoneme_tab[N_PHONEME_TAB];