Browse Source

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.
master
Juho Hiltunen 7 years ago
parent
commit
7ee0d7905c
3 changed files with 1 additions and 3 deletions
  1. 0
    1
      src/libespeak-ng/translate.c
  2. 0
    1
      src/libespeak-ng/translate.h
  3. 1
    1
      src/libespeak-ng/voices.c

+ 0
- 1
src/libespeak-ng/translate.c View File

@@ -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;

+ 0
- 1
src/libespeak-ng/translate.h View File

@@ -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;

+ 1
- 1
src/libespeak-ng/voices.c View File

@@ -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;

Loading…
Cancel
Save