mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-15 01:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup: combine Wavegen_Klatt() and Wavegen_Klatt2().

Browse Source 
Wavegen_Klatt2() only had one if-statement and then called
Wavegen_Klatt(). Wavegen_Klatt() was never called directly.
This commit is contained in:
Juho Hiltunen
2020-07-21 12:38:54 +03:00
parent 04caefe54e
commit 516144d63a
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/klatt.c
+5 -9
View File
@@ -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()
{
src/libespeak-ng/klatt.h
+1 -2
View File
@@ -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
}
src/libespeak-ng/wavegen.c
+1 -1
View File
@@ -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: