mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup: refactor and remove duplication by unifying SetSpeed()

Browse Source 
implemantations.

It is unclear why the two implementations differ.
This commit is contained in:
Juho Hiltunen
2022-10-25 19:24:55 +03:00
parent 0c82988b44
commit 8170775113
1 changed files with 9 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/setlengths.c
+9 -37
View File
@@ -142,25 +142,26 @@ static int speed1 = 130;
static int speed2 = 121;
static int speed3 = 118;
#if HAVE_SONIC_H
void SetSpeed(int control)
{
int x;
int wpm;
int wpm2;
int wpm_value;
double sonic;
speed.min_sample_len = espeakRATE_MAXIMUM;
speed.lenmod_factor = 110; // controls the effect of FRFLAG_LEN_MOD reduce length change
speed.lenmod2_factor = 100;
speed.min_pause = 5;
wpm = embedded_value[EMBED_S];
if (control == 2)
wpm = embedded_value[EMBED_S2];
#if HAVE_SONIC_H
int wpm2;
int wpm_value;
double sonic;
speed.min_pause = 5;
wpm_value = wpm;
if (voice->speed_percent > 0)
@@ -194,36 +195,10 @@ void SetSpeed(int control)
return;
}
SetSpeedMultiplier(&x, &wpm);
if (control & 1) {
SetSpeedFactors(voice, x, &speed1, &speed2, &speed3);
}
if (control & 2) {
SetSpeedMods(&speed, voice->speedf1, wpm, x);
}
}
#else
void SetSpeed(int control)
{
// This is the earlier version of SetSpeed() before sonic speed-up was added
int x;
int wpm;
int wpm2;
speed.min_sample_len = espeakRATE_MAXIMUM;
speed.lenmod_factor = 110; // controls the effect of FRFLAG_LEN_MOD reduce length change
speed.lenmod2_factor = 100;
wpm = embedded_value[EMBED_S];
if (control == 2)
wpm = embedded_value[EMBED_S2];
#else
if (voice->speed_percent > 0)
wpm = (wpm * voice->speed_percent)/100;
#endif
SetSpeedMultiplier(&x, &wpm);
@@ -233,12 +208,9 @@ void SetSpeed(int control)
if (control & 2) {
SetSpeedMods(&speed, voice->speedf1, wpm, x);
}
}
#endif
static void SetSpeedMultiplier(int *x, int *wpm) {
int wpm2;