From 08f07d0af123e1c307bc4c0c973da07fae8246b1 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 7 Feb 2015 14:40:17 -0800
Subject: altosui: Remove the dregs of AltosDroid load-old-telem code

AltosDroid used to scan the old .telem file to return to the previous
flight state on restart. Now it just loads the old state object
instead, a vast improvement in performance.

To do that, there were some changes in the altoslib code
required. This patch just removes those, fixing replay bugs in TeleGPS
along the way.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altoslib/AltosTelemetryReader.java | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

(limited to 'altoslib/AltosTelemetryReader.java')

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 20526a2c..fa136145 100644
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -28,17 +28,10 @@ public class AltosTelemetryReader extends AltosFlightReader {
 	int		telemetry;
 	int		telemetry_rate;
 	AltosState	state = null;
-	AltosFlightReader	stacked;
 
 	LinkedBlockingQueue<AltosLine> telem;
 
 	public AltosState read() throws InterruptedException, ParseException, AltosCRCException, IOException {
-		if (stacked != null) {
-			state = stacked.read();
-			if (state != null)
-				return state;
-			stacked = null;
-		}
 		AltosLine l = telem.take();
 		if (l.line == null)
 			throw new IOException("IO error");
@@ -61,11 +54,6 @@ public class AltosTelemetryReader extends AltosFlightReader {
 
 	public void close(boolean interrupted) {
 
-		if (stacked != null) {
-			stacked.close(interrupted);
-			stacked = null;
-		}
-
 		link.remove_monitor(telem);
 		log.close();
 		try {
@@ -161,10 +149,9 @@ public class AltosTelemetryReader extends AltosFlightReader {
 		return link.monitor_battery();
 	}
 
-	public AltosTelemetryReader (AltosLink in_link, AltosFlightReader in_stacked)
+	public AltosTelemetryReader (AltosLink in_link)
 		throws IOException, InterruptedException, TimeoutException {
 		link = in_link;
-		stacked = in_stacked;
 		boolean success = false;
 		try {
 			log = new AltosLog(link);
@@ -183,22 +170,4 @@ public class AltosTelemetryReader extends AltosFlightReader {
 				close(true);
 		}
 	}
-
-	private static AltosFlightReader existing_data(AltosLink link) {
-		if (link == null)
-			return null;
-
-		File	file = AltosPreferences.logfile(link.serial);
-		if (file != null) {
-			AltosStateIterable	iterable = AltosStateIterable.iterable(file);
-			if (iterable != null)
-				return new AltosReplayReader(iterable.iterator(), file, false);
-		}
-		return null;
-	}
-
-	public AltosTelemetryReader(AltosLink link)
-		throws IOException, InterruptedException, TimeoutException {
-		this(link, null);
-	}
 }
-- 
cgit v1.2.3