From 516144d63aa66d989395633c5302c72e3ef753d8 Mon Sep 17 00:00:00 2001 From: Juho Hiltunen Date: Mon, 20 Jul 2020 11:30:48 +0300 Subject: [PATCH] code cleanup: combine Wavegen_Klatt() and Wavegen_Klatt2(). Wavegen_Klatt2() only had one if-statement and then called Wavegen_Klatt(). Wavegen_Klatt() was never called directly. --- src/libespeak-ng/klatt.c | 14 +++++--------- src/libespeak-ng/klatt.h | 3 +-- src/libespeak-ng/wavegen.c | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/libespeak-ng/klatt.c b/src/libespeak-ng/klatt.c index 15341912..66f86762 100644 --- a/src/libespeak-ng/klatt.c +++ b/src/libespeak-ng/klatt.c @@ -63,6 +63,7 @@ static double gen_noise(double); static double DBtoLIN(long); static void frame_init(klatt_frame_ptr); static void setabc(long, long, resonator_ptr); +static void SetSynth_Klatt(int length, frame_t *fr1, frame_t *fr2, voice_t *v, int control); static void setzeroabc(long, long, resonator_ptr); static klatt_frame_t kt_frame; @@ -845,8 +846,11 @@ static int klattp[N_KLATTP]; static double klattp1[N_KLATTP]; static double klattp_inc[N_KLATTP]; -static int Wavegen_Klatt(int resume) +int Wavegen_Klatt(int length, int resume, frame_t *fr1, frame_t *fr2) { + if (resume == 0) + SetSynth_Klatt(length, fr1, fr2, wvoice, 1); + int pk; int x; int ix; @@ -1050,14 +1054,6 @@ static void SetSynth_Klatt(int length, frame_t *fr1, frame_t *fr2, voice_t *v, i } } -int Wavegen_Klatt2(int length, int resume, frame_t *fr1, frame_t *fr2) -{ - if (resume == 0) - SetSynth_Klatt(length, fr1, fr2, wvoice, 1); - - return Wavegen_Klatt(resume); -} - void KlattInit() { diff --git a/src/libespeak-ng/klatt.h b/src/libespeak-ng/klatt.h index f8acdb84..42fcc8d9 100644 --- a/src/libespeak-ng/klatt.h +++ b/src/libespeak-ng/klatt.h @@ -179,8 +179,7 @@ typedef struct { void KlattInit(void); void KlattReset(int control); -int Wavegen_Klatt2(int length, int resume, frame_t *fr1, frame_t *fr2); - +int Wavegen_Klatt(int length, int resume, frame_t *fr1, frame_t *fr2); #ifdef __cplusplus } diff --git a/src/libespeak-ng/wavegen.c b/src/libespeak-ng/wavegen.c index e48868cb..38987b70 100644 --- a/src/libespeak-ng/wavegen.c +++ b/src/libespeak-ng/wavegen.c @@ -1346,7 +1346,7 @@ static int WavegenFill2() wdata.n_mix_wavefile = 0; // ... and drop through to WCMD_SPECT case case WCMD_KLATT: echo_complete = echo_length; - result = Wavegen_Klatt2(length & 0xffff, resume, (frame_t *)q[2], (frame_t *)q[3]); + result = Wavegen_Klatt(length & 0xffff, resume, (frame_t *)q[2], (frame_t *)q[3]); break; #endif case WCMD_MARKER: