X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosDisplayThread.java;h=3726f51526c92f4ad0a34a2ad8a7d49f12f8c894;hp=1edac8a9bf38242fba8dc26b5c6d2cd1cda6c6ed;hb=c411c7ec71be0263a958c0803772cd6068e6bdad;hpb=2e82051a6aaaccf1e8a242f9c8141e4167e652d2

diff --git a/altosuilib/AltosDisplayThread.java b/altosuilib/AltosDisplayThread.java
index 1edac8a9..3726f515 100644
--- a/altosuilib/AltosDisplayThread.java
+++ b/altosuilib/AltosDisplayThread.java
@@ -16,13 +16,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_11;
+package org.altusmetrum.altosuilib_13;
 
 import java.awt.*;
 import javax.swing.*;
 import java.io.*;
 import java.text.*;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_13.*;
 
 public class AltosDisplayThread extends Thread {
 
@@ -95,13 +95,13 @@ public class AltosDisplayThread extends Thread {
 			    state.from_pad != null &&
 			    state.range >= 0)
 			{
-				voice.speak("Height %s, bearing %s %d, elevation %d, range %s.\n",
+				voice.speak("Height %s, bearing %s %d, elevation %d, distance %s.\n",
 					    AltosConvert.height.say(state.height()),
 					    state.from_pad.bearing_words(
 						    AltosGreatCircle.BEARING_VOICE),
 					    (int) (state.from_pad.bearing + 0.5),
 					    (int) (state.elevation + 0.5),
-					    AltosConvert.distance.say(state.range));
+					    AltosConvert.distance.say(state.distance));
 			} else if (state.state() > AltosLib.ao_flight_pad && state.height() != AltosLib.MISSING) {
 				voice.speak(AltosConvert.height.say_units(state.height()));
 			} else {
@@ -123,7 +123,7 @@ public class AltosDisplayThread extends Thread {
 				else
 					voice.speak("rocket may have crashed");
 				if (state.from_pad != null)
-					voice.speak("Bearing %d degrees, range %s.",
+					voice.speak("Bearing %d degrees, distance %s.",
 						    (int) (state.from_pad.bearing + 0.5),
 						    AltosConvert.distance.say_units(state.from_pad.distance));
 				++reported_landing;
@@ -159,9 +159,6 @@ public class AltosDisplayThread extends Thread {
 					report(false);
 				}
 			} catch (InterruptedException ie) {
-				try {
-					voice.drain();
-				} catch (InterruptedException iie) { }
 			}
 		}