From bdf18eafb144e26a2e76d4821a86237ade7ee8fb Mon Sep 17 00:00:00 2001 From: Juho Hiltunen Date: Tue, 4 Oct 2022 18:45:22 +0300 Subject: [PATCH] cleanup: moved dictmin to LoadLanguageOptions() Note: This feature has no tests. It doesn't look very useful and I think could be removed. --- src/libespeak-ng/langopts.c | 10 ++++++++++ src/libespeak-ng/voices.c | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/libespeak-ng/langopts.c b/src/libespeak-ng/langopts.c index 3705005d..f005c98e 100644 --- a/src/libespeak-ng/langopts.c +++ b/src/libespeak-ng/langopts.c @@ -92,6 +92,16 @@ void LoadLanguageOptions(Translator *translator, int key, char *keyValue ) { int n; switch (key) { + case V_DICTMIN: { + if (CheckTranslator(translator, langopts_tab, key) != 0) + break; + + if (sscanf(keyValue, "%d", &n) == 1) + translator->dict_min_size = n; + + break; + } + case V_DICTRULES: { // conditional dictionary rules and list entries if (CheckTranslator(translator, langopts_tab, key) != 0) break; diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c index d4bf4d53..7669bdbf 100644 --- a/src/libespeak-ng/voices.c +++ b/src/libespeak-ng/voices.c @@ -818,16 +818,7 @@ voice_t *LoadVoice(const char *vname, int control) sscanf(p, "%d", &speed.fast_settings); SetSpeed(3); break; - case V_DICTMIN: { - if (CheckTranslator(translator, keyword_tab, key) != 0) - break; - if (sscanf(p, "%d", &value) == 1) - translator->dict_min_size = value; - break; - } - - break; case V_MAINTAINER: case V_STATUS: break;