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

Fixes for Klatt synthesizer

Browse Source 
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@234 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2009-12-16 00:03:31 +00:00
parent b2cbee1f9e
commit dd1623232f
10 changed files with 144 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spect.cpp
+10 -11
View File
@@ -288,7 +288,6 @@ int SpectFrame::Load(wxInputStream& stream, int file_format_type)
int x;
unsigned short *spect_data;
file_format = file_format_type;
wxDataInputStream s(stream);
time = s.ReadDouble();
@@ -299,10 +298,10 @@ int SpectFrame::Load(wxInputStream& stream, int file_format_type)
markers = s.Read16();
amp_adjust = s.Read16();
if(file_format == 2)
if(file_format_type == 2)
{
s.Read16(); // spare
s.Read16(); // spare
ix = s.Read16(); // spare
ix = s.Read16(); // spare
}
for(ix=0; ix<N_PEAKS; ix++)
@@ -315,7 +314,7 @@ int SpectFrame::Load(wxInputStream& stream, int file_format_type)
peaks[ix].pkwidth = s.Read16();
peaks[ix].pkright = s.Read16();
if(file_format == 2)
if(file_format_type == 2)
{
peaks[ix].klt_bw = s.Read16();
peaks[ix].klt_ap = s.Read16();
@@ -323,7 +322,7 @@ int SpectFrame::Load(wxInputStream& stream, int file_format_type)
}
}
if(file_format > 0)
if(file_format_type > 0)
{
for(ix=0; ix<N_KLATTP2; ix++)
{
@@ -351,8 +350,8 @@ int SpectFrame::Load(wxInputStream& stream, int file_format_type)
} // End of SpectFrame::Load
int SpectFrame::Save(wxOutputStream& stream)
{//=========================================
int SpectFrame::Save(wxOutputStream& stream, int file_format_type)
{//===============================================================
int ix;
wxDataOutputStream s(stream);
@@ -365,7 +364,7 @@ int SpectFrame::Save(wxOutputStream& stream)
s.Write16(markers);
s.Write16(amp_adjust);
if(file_format == 2)
if(file_format_type == 2)
{
s.Write16(0); // spare
s.Write16(0); // spare
@@ -381,7 +380,7 @@ int SpectFrame::Save(wxOutputStream& stream)
s.Write16(peaks[ix].pkwidth);
s.Write16(peaks[ix].pkright);
if(file_format == 2)
if(file_format_type == 2)
{
s.Write16(peaks[ix].klt_bw);
s.Write16(peaks[ix].klt_ap);
@@ -389,7 +388,7 @@ int SpectFrame::Save(wxOutputStream& stream)
}
}
if(file_format > 0)
if(file_format_type > 0)
{
for(ix=0; ix<N_KLATTP2; ix++)
{