From 7ee0d7905cff0932d69f9c621175d62678e649b4 Mon Sep 17 00:00:00 2001 From: Juho Hiltunen Date: Sat, 24 Mar 2018 13:34:36 +0200 Subject: [PATCH] remove unused int option_tone2 It is set in voices.c but never used. docs/voices.md indicates that the keyword intonation only takes one parameter, confirming that option_tone2 is unused. --- src/libespeak-ng/translate.c | 1 - src/libespeak-ng/translate.h | 1 - src/libespeak-ng/voices.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libespeak-ng/translate.c b/src/libespeak-ng/translate.c index 54712dca..ec3a2b2c 100644 --- a/src/libespeak-ng/translate.c +++ b/src/libespeak-ng/translate.c @@ -49,7 +49,6 @@ Translator *translator2 = NULL; // secondary translator for certain words static char translator2_language[20] = { 0 }; FILE *f_trans = NULL; // phoneme output text -int option_tone2 = 0; int option_tone_flags = 0; // bit 8=emphasize allcaps, bit 9=emphasize penultimate stress int option_phonemes = 0; int option_phoneme_events = 0; diff --git a/src/libespeak-ng/translate.h b/src/libespeak-ng/translate.h index c71c8d4a..0f471537 100644 --- a/src/libespeak-ng/translate.h +++ b/src/libespeak-ng/translate.h @@ -639,7 +639,6 @@ typedef struct { int clause_terminator; } Translator; -extern int option_tone2; #define OPTION_EMPHASIZE_ALLCAPS 0x100 #define OPTION_EMPHASIZE_PENULTIMATE 0x200 extern int option_tone_flags; diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c index 3d4b27a6..bb107699 100644 --- a/src/libespeak-ng/voices.c +++ b/src/libespeak-ng/voices.c @@ -703,7 +703,7 @@ voice_t *LoadVoice(const char *vname, int control) stress_add_set = Read8Numbers(p, stress_add); break; case V_INTONATION: // intonation - sscanf(p, "%d %d", &option_tone_flags, &option_tone2); + sscanf(p, "%d", &option_tone_flags); if ((option_tone_flags & 0xff) != 0) { if (langopts) langopts->intonation_group = option_tone_flags & 0xff;