diff --git a/src/libespeak-ng/setlengths.c b/src/libespeak-ng/setlengths.c index 6f68ce96..fed3a0b3 100644 --- a/src/libespeak-ng/setlengths.c +++ b/src/libespeak-ng/setlengths.c @@ -165,7 +165,7 @@ void SetSpeed(int control) if (control & 2) DoSonicSpeed(1 * 1024); - if ((wpm_value >= espeakRATE_MAXIMUM) || ((wpm_value > speed.fast_settings[0]) && (wpm > 350))) { + if ((wpm_value >= espeakRATE_MAXIMUM) || ((wpm_value > speed.fast_settings) && (wpm > 350))) { wpm2 = wpm; wpm = espeakRATE_NORMAL; diff --git a/src/libespeak-ng/synthesize.h b/src/libespeak-ng/synthesize.h index 8edc96ac..01a6ef6d 100644 --- a/src/libespeak-ng/synthesize.h +++ b/src/libespeak-ng/synthesize.h @@ -350,7 +350,7 @@ typedef struct { int lenmod_factor; int lenmod2_factor; int min_sample_len; - int fast_settings[8]; + int fast_settings; // TODO: rename this variable to better explain the purpose, or delete if there is none } SPEED_FACTORS; typedef struct { diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c index 095240a4..3617a545 100644 --- a/src/libespeak-ng/voices.c +++ b/src/libespeak-ng/voices.c @@ -380,9 +380,7 @@ void VoiceReset(int tone_only) voice->samplerate = samplerate_native; memset(voice->klattv, 0, sizeof(voice->klattv)); - speed.fast_settings[0] = espeakRATE_MAXIMUM; - speed.fast_settings[1] = 800; - speed.fast_settings[2] = espeakRATE_NORMAL; + speed.fast_settings = espeakRATE_MAXIMUM; voice->roughness = 2; @@ -820,7 +818,7 @@ voice_t *LoadVoice(const char *vname, int control) voice->klattv[KLATT_Kopen] -= 40; break; case V_FAST: - Read8Numbers(p, speed.fast_settings); + sscanf(p, "%d", &speed.fast_settings); SetSpeed(3); break; case V_DICTMIN: