cleanup: move n_tunes and tunes to where they are used

This commit is contained in:
Juho Hiltunen
2022-10-09 16:38:53 +03:00
parent ec897eff32
commit c92180f918
4 changed files with 7 additions and 5 deletions
-3
View File
@@ -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
+3
View File
@@ -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
+3
View File
@@ -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
+1 -2
View File
@@ -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];