X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosReplayReader.java;h=2864e02a272bb0ba60f27407b0fdf03d27803c0d;hb=6dafd7bf947d892e430cd565eb92a3366abb3604;hp=1585f9eb4f3c4a61509f34df1c7b08c5641f13a1;hpb=69e6df07976a56b49e07c242cd6e5b2cbd2a578d;p=fw%2Faltos

diff --git a/altoslib/AltosReplayReader.java b/altoslib/AltosReplayReader.java
index 1585f9eb..2864e02a 100644
--- a/altoslib/AltosReplayReader.java
+++ b/altoslib/AltosReplayReader.java
@@ -15,23 +15,21 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
 
 /*
  * Open an existing telemetry file and replay it in realtime
  */
 
 public class AltosReplayReader extends AltosFlightReader {
-	Iterator<AltosRecord>	iterator;
+	Iterator<AltosState>	iterator;
 	File	file;
+	boolean real_time;
 
-	public AltosRecord read() {
+	public AltosState read() {
 		if (iterator.hasNext())
 			return iterator.next();
 		return null;
@@ -42,15 +40,22 @@ public class AltosReplayReader extends AltosFlightReader {
 
 	public void update(AltosState state) throws InterruptedException {
 		/* Make it run in realtime after the rocket leaves the pad */
-		if (state.state > AltosLib.ao_flight_pad)
+		if (real_time && 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<AltosRecord> in_iterator, File in_file) {
+	public AltosReplayReader(Iterator<AltosState> in_iterator, File in_file,
+				 boolean in_real_time) {
 		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);
+	}
 }