Bump java lib versions in preparation for 1.9.2

[fw/altos] / altoslib / AltosReplayReader.java

diff --git a/altoslib/AltosReplayReader.java b/altoslib/AltosReplayReader.java
index fab28cac3cddeec78dde18ef1a6020ae39d10365..07f62427a3861ac92de1f433b9755e859d3e4f42 100644 (file)
--- a/altoslib/AltosReplayReader.java
+++ b/altoslib/AltosReplayReader.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.util.*;
@@ -35,13 +35,15 @@ class AltosReplay extends AltosDataListener implements Runnable {
        boolean         done = false;
 
        public void set_time(double time) {
-               if (last_time != AltosLib.MISSING) {
-                       semaphore.release();
-                       double  delay = Math.min(time - last_time,10);
-                       if (delay > 0) {
-                               try {
-                                       Thread.sleep((int) (delay * 1000));
-                               } catch (InterruptedException ie) {
+               if (time > -2) {
+                       if (last_time != AltosLib.MISSING) {
+                               semaphore.release();
+                               double  delay = Math.min(time - last_time,10);
+                               if (delay > 0) {
+                                       try {
+                                               Thread.sleep((int) (delay * 1000));
+                                       } catch (InterruptedException ie) {
+                                       }
                                }
                        }
                }
@@ -70,7 +72,10 @@ class AltosReplay extends AltosDataListener implements Runnable {
        public void set_apogee_voltage(double volts) { state.set_apogee_voltage(volts); }
        public void set_main_voltage(double volts) { state.set_main_voltage(volts); }
 
-       public void set_gps(AltosGPS gps) { super.set_gps(gps); state.set_gps(gps); }
+       public void set_gps(AltosGPS gps, boolean set_location, boolean set_sats) {
+               super.set_gps(gps, set_location, set_sats);
+               state.set_gps(gps, set_location, set_sats);
+       }
 
        public void set_orient(double orient) { state.set_orient(orient); }
        public void set_gyro(double roll, double pitch, double yaw) { state.set_gyro(roll, pitch, yaw); }
@@ -105,31 +110,17 @@ public class AltosReplayReader extends AltosFlightReader {
        File            file;
        AltosReplay     replay;
        Thread          t;
-       int             reads;
 
        public AltosCalData cal_data() {
                return replay.state.cal_data();
        }
 
        public AltosState read() {
-               switch (reads) {
-               case 0:
-                       /* Tell the display that we're in pad mode */
-                       replay.state.set_state(AltosLib.ao_flight_pad);
-                       break;
-               case 1:
-                       t = new Thread(replay);
-                       t.start();
-                       /* fall through */
-               default:
-                       /* Wait for something to change */
-                       try {
-                               replay.semaphore.acquire();
-                       } catch (InterruptedException ie) {
-                       }
-                       break;
+               /* Wait for something to change */
+               try {
+                       replay.semaphore.acquire();
+               } catch (InterruptedException ie) {
                }
-               reads++;
 
                /* When done, let the display know */
                if (replay.done)
@@ -146,9 +137,10 @@ public class AltosReplayReader extends AltosFlightReader {
        public File backing_file() { return file; }
 
        public AltosReplayReader(AltosRecordSet record_set, File in_file) {
-               reads = 0;
                file = in_file;
                name = file.getName();
                replay = new AltosReplay(record_set);
+               t = new Thread(replay);
+               t.start();
        }
 }