diff --git a/src/libespeak-ng/intonation.c b/src/libespeak-ng/intonation.c index b1c1ca65..7290df0d 100644 --- a/src/libespeak-ng/intonation.c +++ b/src/libespeak-ng/intonation.c @@ -63,7 +63,6 @@ static int tone_pitch_env; // used to return pitch envelope #define PITCHrise 2 #define PITCHfrise 4 // and 3 must be for the variant preceded by 'r' #define PITCHfrise2 6 // and 5 must be the 'r' variant -#define PITCHrisefall 8 unsigned char env_fall[128] = { 0xff, 0xfd, 0xfa, 0xf8, 0xf6, 0xf4, 0xf2, 0xf0, 0xee, 0xec, 0xea, 0xe8, 0xe6, 0xe4, 0xe2, 0xe0, diff --git a/src/libespeak-ng/numbers.c b/src/libespeak-ng/numbers.c index 3020e301..133d8bf0 100644 --- a/src/libespeak-ng/numbers.c +++ b/src/libespeak-ng/numbers.c @@ -114,8 +114,6 @@ static ACCENTS accents_tab[] = { #define L_OPEN_E 62 // U+25B #define L_GAMMA 63 // U+3B3 #define L_IOTA 64 // U+3B9 -#define L_OE 65 // U+153 -#define L_OMEGA 66 // U+3C9 #define L_PHI 67 // U+3C6 #define L_ESH 68 // U+283 diff --git a/src/libespeak-ng/spect.c b/src/libespeak-ng/spect.c index a5ddb3ba..24497043 100644 --- a/src/libespeak-ng/spect.c +++ b/src/libespeak-ng/spect.c @@ -44,9 +44,6 @@ extern char voice_name[]; static int frame_width; int pk_select; -#define DRAWPEAKWIDTH 2000 -#define PEAKSHAPEW 256 - static int default_freq[N_PEAKS] = { 200, 500, 1200, 3000, 3500, 4000, 6900, 7800, 9000 }; static int default_width[N_PEAKS] = diff --git a/src/libespeak-ng/tr_languages.c b/src/libespeak-ng/tr_languages.c index 3c9389e4..8fe0ce37 100644 --- a/src/libespeak-ng/tr_languages.c +++ b/src/libespeak-ng/tr_languages.c @@ -37,13 +37,10 @@ #include "synthesize.h" #include "translate.h" -#define L_qa 0x716100 #define L_grc 0x677263 // grc Ancient Greek #define L_jbo 0x6a626f // jbo Lojban #define L_mni 0x6d6e69 // mni Manipuri #define L_pap 0x706170 // pap Papiamento] -#define L_qvi 0x717669 // qvi Kichwa -#define L_shs 0x736873 // shs Shuswap / Secwepemctsin #define L_zhy 0x7a6879 // zhy // start of unicode pages for character sets diff --git a/src/libespeak-ng/translate.c b/src/libespeak-ng/translate.c index b20e624b..3b902826 100644 --- a/src/libespeak-ng/translate.c +++ b/src/libespeak-ng/translate.c @@ -37,8 +37,6 @@ #include "voice.h" #include "translate.h" -#define WORD_STRESS_CHAR '*' - Translator *translator = NULL; // the main translator Translator *translator2 = NULL; // secondary translator for certain words static char translator2_language[20] = { 0 }; diff --git a/src/libespeak-ng/wave.c b/src/libespeak-ng/wave.c index 94303cd0..fd33bace 100644 --- a/src/libespeak-ng/wave.c +++ b/src/libespeak-ng/wave.c @@ -214,7 +214,6 @@ int wave_get_remaining_time(uint32_t sample, uint32_t *time) static t_wave_callback *my_callback_is_output_enabled = NULL; -#define N_WAV_BUF 10 #define MAX_SAMPLE_RATE 22050 #define FRAMES_PER_BUFFER 512 #define BUFFER_LENGTH (MAX_SAMPLE_RATE*2*sizeof(uint16_t)) diff --git a/src/libespeak-ng/wave_pulse.c b/src/libespeak-ng/wave_pulse.c index 8f2a4571..a0ecf474 100644 --- a/src/libespeak-ng/wave_pulse.c +++ b/src/libespeak-ng/wave_pulse.c @@ -68,7 +68,6 @@ static t_wave_callback *my_callback_is_output_enabled = NULL; #define TLENGTH 4410 #define PREBUF 2200 #define MINREQ 880 -#define FRAGSIZE 0 #ifdef USE_PORTAUDIO // rename functions to be wrapped diff --git a/src/libespeak-ng/wavegen.c b/src/libespeak-ng/wavegen.c index df267fe5..b541f3d3 100644 --- a/src/libespeak-ng/wavegen.c +++ b/src/libespeak-ng/wavegen.c @@ -51,7 +51,6 @@ #endif #endif -#define N_SINTAB 2048 #include "sintab.h" #define PI 3.1415927 @@ -135,7 +134,6 @@ int wcmdq_tail = 0; int embedded_default[N_EMBEDDED_VALUES] = { 0, 50, 175, 100, 50, 0, 0, 0, 175, 0, 0, 0, 0, 0, 0 }; static int embedded_max[N_EMBEDDED_VALUES] = { 0, 0x7fff, 750, 300, 99, 99, 99, 0, 750, 0, 0, 0, 0, 4, 0 }; -#define N_CALLBACK_IX N_WAV_BUF-2 // adjust this delay to match display with the currently spoken word int current_source_index = 0; extern FILE *f_wave;