Merge branch 'branch-1.6' into debian

Conflicts:
	ChangeLog
	altoslib/AltosTelemetryReader.java
	configure.ac

1 files changed, 4 insertions, 11 deletions

diff --git a/altoslib/AltosReplayReader.java b/altoslib/AltosReplayReader.java
index 2864e02a..98f0e7d5 100644
--- 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_5;
+package org.altusmetrum.altoslib_6;
 
 import java.io.*;
 import java.util.*;
@@ -27,7 +27,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 +39,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)
-			Thread.sleep((int) (Math.min(state.time_change,10) * 1000));
+		if (state.state > AltosLib.ao_flight_pad && state.time_change > 0)
+			Thread.sleep((int) (Math.min(state.time_change,10) * 100));
 		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);
-	}
 }