mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 13:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

espeakedit: convert SpectSeq to a struct

Browse Source
This commit is contained in:
Reece H. Dunn
2015-12-13 12:21:39 +00:00
parent 6ad68e2082
commit d1b06c6591
3 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiledata.cpp
+5 -5
View File
@@ -1535,7 +1535,7 @@ int LoadSpect(const char *path, int control)
SPECT_SEQK seqk_out;
// create SpectSeq and import data
spectseq = new SpectSeq;
spectseq = SpectSeqCreate();
if(spectseq == NULL)
{
Error("Failed to create SpectSeq");
@@ -1548,15 +1548,15 @@ int LoadSpect(const char *path, int control)
if(stream.Ok() == FALSE)
{
error("Failed to open: '%s'",path);
delete spectseq;
SpectSeqDestroy(spectseq);
return(0);
}
spectseq->Load(stream);
LoadSpectSeq(spectseq, stream);
if(spectseq->frames == NULL)
{
error("Bad vowel file, no frames: '%s'",path);
delete spectseq;
SpectSeqDestroy(spectseq);
return(0);
}
@@ -1718,7 +1718,7 @@ int LoadSpect(const char *path, int control)
fwrite(&seq_out,ix,1,f_phdata);
}
delete spectseq;
SpectSeqDestroy(spectseq);
return(displ);
} // end of LoadSpect