From 4503152997dff409892cf97b550f7f3621611375 Mon Sep 17 00:00:00 2001
From: "sgunderson@bigfoot.com" <>
Date: Thu, 28 Dec 2006 20:08:03 +0100
Subject: [PATCH] Move the speed variable out.

---
 estimate-skew.cpp | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/estimate-skew.cpp b/estimate-skew.cpp
index 2e6aff2..cc4835e 100644
--- a/estimate-skew.cpp
+++ b/estimate-skew.cpp
@@ -66,20 +66,14 @@ class InterpolatingReader
 {
 private:
 	FILE *f;
-	double speed;
 	double p;
 	int in_pos;
 	short prev_sample;
 
 public:
-	InterpolatingReader(FILE *f) : f(f), speed(1.0), p(0.0), in_pos(-1) {}
+	InterpolatingReader(FILE *f) : f(f), p(0.0), in_pos(-1) {}
 
-	void update_speed(double speed)
-	{
-		this->speed = speed;
-	}
-
-	double read_sample()
+	double read_sample(double speed)
 	{
 		short sample;
 
@@ -171,10 +165,8 @@ int main(int argc, char **argv)
 		f2.update(s);
 	} while (!f2.check_flag() || !f2.get_status());
 
-	double speed = 1.000;
-
 	InterpolatingReader intp(in2);
-	intp.update_speed(speed);  // test to see if we can resync OK
+	double speed = 1.000;
 
 	while (!feof(in1) && !feof(in2)) {
 		short refs;
@@ -192,7 +184,7 @@ int main(int argc, char **argv)
 		// same here
 		unsigned num_inp = 0;
 		while (!feof(in2) && !f2.check_flag()) {
-			double s = intp.read_sample();
+			double s = intp.read_sample(speed);
 			f2.update((short)s);
 			++num_inp;
 		}
@@ -201,6 +193,5 @@ int main(int argc, char **argv)
 		printf("%u vs. %u -- ratio %.3f, speed %.3f, filtered speed %.3f\n", num_inp, num_ref,
 			double(num_inp) / double(num_ref), speed * double(num_inp) / double(num_ref), ns);
 		speed = ns;
-		intp.update_speed(ns);
 	}
 }
-- 
2.39.2