@@ -293,7 +293,6 @@ static const TONE_NUCLEUS tone_nucleus_table[N_TONE_NUCLEUS_TABLE] = { | |||
#define PRIMARY_LAST 7 | |||
static int number_pre; | |||
static int number_body; | |||
static int number_tail; | |||
static int last_primary; | |||
static int tone_posn; | |||
@@ -309,7 +308,6 @@ static void count_pitch_vowels(SYLLABLE *syllable_tab, int start, int end, int c | |||
int max_stress_posn2 = 0; // penuntimate syllable of the highest stress | |||
number_pre = -1; // number of vowels before 1st primary stress | |||
number_body = 0; | |||
number_tail = 0; // number between tonic syllable and next primary | |||
last_primary = -1; | |||
@@ -424,8 +424,10 @@ voice_t *LoadVoice(const char *vname, int control) | |||
char phonemes_name[40] = ""; | |||
const char *language_type; | |||
char buf[sizeof(path_home)+30]; | |||
#if USE_MBROLA | |||
char name1[40]; | |||
char name2[80]; | |||
#endif | |||
int pitch1; | |||
int pitch2; |
@@ -196,7 +196,6 @@ class SpeechWaveGeneratorImpl: public SpeechWaveGenerator { | |||
unsigned int generate(const unsigned int sampleCount, sample* sampleBuf) { | |||
if(!frameManager) return 0; | |||
double val=0; | |||
for(unsigned int i=0;i<sampleCount;++i) { | |||
const speechPlayer_frame_t* frame=frameManager->getCurrentFrame(); | |||
if(frame) { |