Browse Source

cleanup: move n_tunes and tunes to where they are used

master
Juho Hiltunen 2 years ago
parent
commit
c92180f918

+ 0
- 3
src/libespeak-ng/intonation.c View File

{ PITCHfall, 70, 18, PITCHfall, 70, 24, NULL, 32, 20, 0 }, // 12 test { PITCHfall, 70, 18, PITCHfall, 70, 24, NULL, 32, 20, 0 }, // 12 test
}; };


int n_tunes = 0;
TUNE *tunes = NULL;

#define SECONDARY 3 #define SECONDARY 3
#define PRIMARY 4 #define PRIMARY 4
#define PRIMARY_STRESSED 6 #define PRIMARY_STRESSED 6

+ 3
- 0
src/libespeak-ng/synthdata.c View File

#include "translate.h" // for Translator, LANGUAGE_OPTIONS #include "translate.h" // for Translator, LANGUAGE_OPTIONS
#include "voice.h" // for ReadTonePoints, tone_points, voice #include "voice.h" // for ReadTonePoints, tone_points, voice


int n_tunes = 0;
TUNE *tunes = NULL;

const int version_phdata = 0x014801; const int version_phdata = 0x014801;


// copy the current phoneme table into here // copy the current phoneme table into here

+ 3
- 0
src/libespeak-ng/synthdata.h View File

void SelectPhonemeTable(int number); void SelectPhonemeTable(int number);
int SelectPhonemeTableName(const char *name); int SelectPhonemeTableName(const char *name);


extern int n_tunes;
extern TUNE *tunes;

#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

+ 1
- 2
src/libespeak-ng/synthesize.h View File

int spare2; // the struct length should be a multiple of 4 bytes int spare2; // the struct length should be a multiple of 4 bytes
} TUNE; } TUNE;


extern int n_tunes;
extern TUNE *tunes;



// phoneme table // phoneme table
extern PHONEME_TAB *phoneme_tab[N_PHONEME_TAB]; extern PHONEME_TAB *phoneme_tab[N_PHONEME_TAB];

Loading…
Cancel
Save