Browse Source
code cleanup: pass voice_t wvoice as a parameter to Wavegen() instead of using a
globalmaster
Juho Hiltunen
5 years ago
1 changed files with 2 additions and 2 deletions
+ 2
- 2
src/libespeak-ng/wavegen.c
View File
| return value; | return value; | ||||
| } | } | ||||
| static int Wavegen(int length, int modulation, bool resume, frame_t *fr1, frame_t *fr2) | |||||
| static int Wavegen(int length, int modulation, bool resume, frame_t *fr1, frame_t *fr2, voice_t *wvoice) | |||||
| { | { | ||||
| if (resume == false) | if (resume == false) | ||||
| SetSynth(length, modulation, fr1, fr2, wvoice); | SetSynth(length, modulation, fr1, fr2, wvoice); | ||||
| 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_SPECT: | case WCMD_SPECT: | ||||
| echo_complete = echo_length; | echo_complete = echo_length; | ||||
| result = Wavegen(length & 0xffff, q[1] >> 16, resume, (frame_t *)q[2], (frame_t *)q[3]); | |||||
| result = Wavegen(length & 0xffff, q[1] >> 16, resume, (frame_t *)q[2], (frame_t *)q[3], wvoice); | |||||
| break; | break; | ||||
| #ifdef INCLUDE_KLATT | #ifdef INCLUDE_KLATT | ||||
| case WCMD_KLATT2: // as WCMD_SPECT but stop any concurrent wave file | case WCMD_KLATT2: // as WCMD_SPECT but stop any concurrent wave file |
Loading…