From bb2d73a8757989408458e5dd33adeed2d0864cb3 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sun, 13 Dec 2015 11:30:52 +0000
Subject: [PATCH] espeakedit: move the definition of GetFrameLength into
 spect.cpp

---
 src/spect.cpp | 19 +++++++------------
 src/spect.h   |  2 --
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/spect.cpp b/src/spect.cpp
index 0ebbb588..0353521b 100644
--- a/src/spect.cpp
+++ b/src/spect.cpp
@@ -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
diff --git a/src/spect.h b/src/spect.h
index 64fb72b6..ff95a0a5 100644
--- a/src/spect.h
+++ b/src/spect.h
@@ -121,8 +121,6 @@ public:
 	~SpectSeq();
 	int Load(wxInputStream& stream);
 
-	float GetFrameLength(int frame, int plus, int *original_mS);
-
 	int  numframes;
 	int  amplitude;
 	int  spare;