X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosReplayReader.java;h=59ade8719c8e33f4d133ddf04f4aaabc19aa95b6;hb=c17b78e60c340c8a3e3d6f9b875667c66216647a;hp=2864e02a272bb0ba60f27407b0fdf03d27803c0d;hpb=810f9a4f79b0480973d84595140d3f8948ce26d9;p=fw%2Faltos

diff --git a/altoslib/AltosReplayReader.java b/altoslib/AltosReplayReader.java
index 2864e02a..59ade871 100644
--- a/altoslib/AltosReplayReader.java
+++ b/altoslib/AltosReplayReader.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -27,7 +28,6 @@ import java.util.*;
 public class AltosReplayReader extends AltosFlightReader {
 	Iterator<AltosState>	iterator;
 	File	file;
-	boolean real_time;
 
 	public AltosState read() {
 		if (iterator.hasNext())
@@ -40,22 +40,16 @@ public class AltosReplayReader extends AltosFlightReader {
 
 	public void update(AltosState state) throws InterruptedException {
 		/* Make it run in realtime after the rocket leaves the pad */
-		if (real_time && state.state > AltosLib.ao_flight_pad && state.time_change > 0)
+		if (state.state() > AltosLib.ao_flight_pad && state.time_change > 0)
 			Thread.sleep((int) (Math.min(state.time_change,10) * 1000));
 		state.set_received_time(System.currentTimeMillis());
 	}
 
 	public File backing_file() { return file; }
 
-	public AltosReplayReader(Iterator<AltosState> in_iterator, File in_file,
-				 boolean in_real_time) {
+	public AltosReplayReader(Iterator<AltosState> in_iterator, File in_file) {
 		iterator = in_iterator;
 		file = in_file;
-		real_time = in_real_time;
 		name = file.getName();
 	}
-
-	public AltosReplayReader(Iterator<AltosState> in_iterator, File in_file) {
-		this(in_iterator, in_file, false);
-	}
 }