mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-04 22:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.45.45]

Browse Source 
Fixed bug where SSML voice change didn't remember an initially specified Klatt variant.

Removed some unused variables and redundant initializations.

Patch to fix a spike from Klatt function setzeroabc()


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@275 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2011-10-07 12:47:46 +00:00
parent 9e73010621
commit d18532991a
33 changed files with 436 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spectseq.cpp
+2 -9
View File
@@ -462,14 +462,13 @@ int SpectSeq::ImportSPC2(wxInputStream & stream)
int n_cycles = 0;
int x;
CYCLE cy;
int pos;
/* count number of cycles */
while(!stream.Eof())
{
pos = stream.TellI();
stream.TellI();
stream.Read(&cy,44);
pos = stream.TellI();
stream.TellI();
if(stream.Eof()) break;
n_cycles++;
@@ -993,7 +992,6 @@ void SpectSeq::MakeWave(int start, int end, PitchEnvelope &pitch)
float sum_length=0;
float prev_length=0;
int first;
int pbase;
char *fname_speech;
SpectFrame *sp1 = NULL;
SpectFrame *sp2;
@@ -1033,7 +1031,6 @@ void SpectSeq::MakeWave(int start, int end, PitchEnvelope &pitch)
}
total_length = int(sum_length);
pbase = voice->pitch_base >> 12;
if((start==end) || (total_length == 0))
{
@@ -1117,8 +1114,6 @@ void SpectFrame::MakeWaveF(int control, PitchEnvelope &pitche, int amplitude, in
int y;
peak_t peaks0[N_PEAKS];
peak_t peaks1[N_PEAKS];
int ipitch;
int pbase;
char *fname_speech;
int synthesizer_type = 0;
@@ -1131,12 +1126,10 @@ void SpectFrame::MakeWaveF(int control, PitchEnvelope &pitche, int amplitude, in
SpeakNextClause(NULL,NULL,2); // stop speaking file
length = duration;
ipitch = int(pitch) << 16;
if(length==0)
length = 200; // default length, mS
len_samples = (length * samplerate) / 1000;
pbase = voice->pitch_base >> 12;
SetPitch(len_samples + 50,pitche.env,9,44);
fname_speech = WavFileName();