From eae0665be59ac8286acdd53543d35e80aef17e97 Mon Sep 17 00:00:00 2001 From: Juho Hiltunen Date: Wed, 28 Jul 2021 22:11:47 +0300 Subject: [PATCH] code cleanup: move voices->width in LoadVoice() It's probably unnecessary code and could be removed. However, it would break tests. This is a temporary solution. The solution is to do it once in VoiceReset() and then if the "formant" keyword changes voice->width. --- src/libespeak-ng/voices.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c index 856fc638..885a8f9b 100644 --- a/src/libespeak-ng/voices.c +++ b/src/libespeak-ng/voices.c @@ -415,6 +415,9 @@ void VoiceReset(int tone_only) n_replace_phonemes = 0; LoadMbrolaTable(NULL, NULL, 0); } + +// probably unnecessary, but removing this would break tests +voice->width[0] = (voice->width[0] * 105)/100; } static void VoiceFormant(char *p) @@ -445,6 +448,10 @@ static void VoiceFormant(char *p) if (width >= 0) voice->width[formant] = (int)(width * 2.56001); voice->freqadd[formant] = freqadd; + + // probably unnecessary, but removing this would break tests + if (formant == 0) + voice->width[0] = (voice->width[0] * 105)/100; } static void PhonemeReplacement(char *p) @@ -956,8 +963,6 @@ voice_t *LoadVoice(const char *vname, int control) voice_languages[langix] = 0; } - voice->width[0] = (voice->width[0] * 105)/100; - return voice; }