Browse Source

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.
master
Juho Hiltunen 5 years ago
parent
commit
516144d63a
3 changed files with 7 additions and 12 deletions
  1. 5
    9
      src/libespeak-ng/klatt.c
  2. 1
    2
      src/libespeak-ng/klatt.h
  3. 1
    1
      src/libespeak-ng/wavegen.c

+ 5
- 9
src/libespeak-ng/klatt.c View File

static double DBtoLIN(long); static double DBtoLIN(long);
static void frame_init(klatt_frame_ptr); static void frame_init(klatt_frame_ptr);
static void setabc(long, long, resonator_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 void setzeroabc(long, long, resonator_ptr);


static klatt_frame_t kt_frame; static klatt_frame_t kt_frame;
static double klattp1[N_KLATTP]; static double klattp1[N_KLATTP];
static double klattp_inc[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 pk;
int x; int x;
int ix; int ix;
} }
} }


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() void KlattInit()
{ {



+ 1
- 2
src/libespeak-ng/klatt.h View File



void KlattInit(void); void KlattInit(void);
void KlattReset(int control); 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 #ifdef __cplusplus
} }

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

wdata.n_mix_wavefile = 0; // ... and drop through to WCMD_SPECT case wdata.n_mix_wavefile = 0; // ... and drop through to WCMD_SPECT case
case WCMD_KLATT: case WCMD_KLATT:
echo_complete = echo_length; 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; break;
#endif #endif
case WCMD_MARKER: case WCMD_MARKER:

Loading…
Cancel
Save