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: move the definition of GetFrameLength into spect.cpp

Browse Source
This commit is contained in:
Reece H. Dunn
2015-12-13 11:30:52 +00:00
parent d35da4b8b8
commit bb2d73a875
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spect.cpp
+7 -12
View File
@@ -286,24 +286,19 @@ SpectSeq::~SpectSeq()
}
float SpectSeq::GetFrameLength(int frame, int plus, int *original)
static float GetFrameLength(SpectSeq &spect, int frame)
{//===============================================================
int ix;
float adjust=0;
if(frame >= numframes-1) return(0);
if(frame >= spect.numframes-1) return(0);
// include the adjustment for this frame ?
if(plus) adjust = frames[frame]->length_adjust;
for(ix=frame+1; ix<numframes-1; ix++)
for(ix=frame+1; ix<spect.numframes-1; ix++)
{
if(frames[ix]->keyframe) break; // reached next keyframe
adjust += frames[ix]->length_adjust;
if(spect.frames[ix]->keyframe) break; // reached next keyframe
adjust += spect.frames[ix]->length_adjust;
}
if(original != NULL)
*original = int((frames[ix]->time - frames[frame]->time) * 1000.0 + 0.5);
return ((frames[ix]->time - frames[frame]->time) * 1000.0 + adjust);
return ((spect.frames[ix]->time - spect.frames[frame]->time) * 1000.0 + adjust);
}
@@ -398,7 +393,7 @@ else
for(ix=0; ix<numframes; ix++)
{
if(frames[ix]->keyframe)
frames[ix]->length_adjust = frames[ix]->length - GetFrameLength(ix,0,NULL);
frames[ix]->length_adjust = frames[ix]->length - GetFrameLength(*this,ix);
}
return(0);
} // end of SpectSeq::Load