altosdroid: start restoring from log data on startup

[fw/altos] / altoslib / AltosReplayReader.java

diff --git a/altoslib/AltosReplayReader.java b/altoslib/AltosReplayReader.java
index f65caaa0445b9ee54d0c6b4026d3d15df99ec41a..2864e02a272bb0ba60f27407b0fdf03d27803c0d 100644 (file)
--- a/altoslib/AltosReplayReader.java
+++ b/altoslib/AltosReplayReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.*;
@@ -27,6 +27,7 @@ import java.util.*;
 public class AltosReplayReader extends AltosFlightReader {
        Iterator<AltosState>    iterator;
        File    file;
+       boolean real_time;
 
        public AltosState read() {
                if (iterator.hasNext())
@@ -39,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<AltosState> 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);
+       }
 }