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

espeakedit: inline SpectSeq::Load2 into SpectSeq::Load

Browse Source
This commit is contained in:
Reece H. Dunn
2015-12-13 11:25:26 +00:00
parent c5407fe147
commit d35da4b8b8
2 changed files with 40 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spect.cpp
+40 -50
View File
@@ -307,16 +307,47 @@ float SpectSeq::GetFrameLength(int frame, int plus, int *original)
}
void SpectSeq::Load2(wxInputStream& stream, int n)
{//===========================================================
// continuation of load/import
int ix;
wxString string;
float time_offset;
float time_acc=0;
int set_max_y=0;
if(n==0) return;
int SpectSeq::Load(wxInputStream & stream)
{//=======================================
int n;
int ix;
unsigned int id1, id2;
int set_max_y=0;
float time_offset;
wxDataInputStream s(stream);
id1 = s.Read32();
id2 = s.Read32();
if((id1 == FILEID1_SPECTSEQ) && (id2 == FILEID2_SPECTSEQ))
{
file_format = 0; // eSpeak formants
}
else
if((id1 == FILEID1_SPECTSEQ) && (id2 == FILEID2_SPECTSEK))
{
file_format = 1; // formants for Klatt synthesizer
}
else
if((id1 == FILEID1_SPECTSEQ) && (id2 == FILEID2_SPECTSQ2))
{
file_format = 2; // formants for Klatt synthesizer
}
else
{
fprintf(stderr, "Unsupported spectral file format.\n");
return(1);
}
name = s.ReadString();
n = s.Read16();
amplitude = s.Read16();
max_y = s.Read16();
s.Read16();
if(n==0) return(0);
if(frames != NULL) delete frames;
frames = new SpectFrame* [n];
@@ -363,47 +394,6 @@ if(max_y < 400)
max_y = 200;
else
max_y = 29000; // disable auto height scaling
} // end of SpectSeq::Load2
int SpectSeq::Load(wxInputStream & stream)
{//=======================================
int n;
int ix;
unsigned int id1, id2;
wxDataInputStream s(stream);
id1 = s.Read32();
id2 = s.Read32();
if((id1 == FILEID1_SPECTSEQ) && (id2 == FILEID2_SPECTSEQ))
{
file_format = 0; // eSpeak formants
}
else
if((id1 == FILEID1_SPECTSEQ) && (id2 == FILEID2_SPECTSEK))
{
file_format = 1; // formants for Klatt synthesizer
}
else
if((id1 == FILEID1_SPECTSEQ) && (id2 == FILEID2_SPECTSQ2))
{
file_format = 2; // formants for Klatt synthesizer
}
else
{
fprintf(stderr, "Unsupported spectral file format.\n");
return(1);
}
name = s.ReadString();
n = s.Read16();
amplitude = s.Read16();
max_y = s.Read16();
s.Read16();
Load2(stream,n);
for(ix=0; ix<numframes; ix++)
{
src/spect.h
-4
View File
@@ -138,8 +138,4 @@ public:
int max_x;
int max_y;
int file_format;
private:
void Load2(wxInputStream& stream, int n);
};