X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosVoice.java;h=d7c0f6237c4843a551e0451c4ecca3110117e9e7;hp=e876956d2f8f5a232943c81f58db23fff71ddc26;hb=97adfff4cfb67c17a96f3ff46606b4e439422b01;hpb=aed8d3ee2561bbec59b9684fb2042186191302ca

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index e876956d..d7c0f623 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -22,7 +22,7 @@ import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
 import android.location.Location;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_11.*;
 
 public class AltosVoice {
 
@@ -186,9 +186,9 @@ public class AltosVoice {
 		if (last_tell_mode != TELL_MODE_FLIGHT)
 			last_flight_tell = TELL_FLIGHT_NONE;
 
-		if (state.state != last_state && AltosLib.ao_flight_boost <= state.state && state.state <= AltosLib.ao_flight_landed) {
+		if (state.state() != last_state && AltosLib.ao_flight_boost <= state.state() && state.state() <= AltosLib.ao_flight_landed) {
 			speak(state.state_name());
-			if (descending(state.state) && !descending(last_state)) {
+			if (descending(state.state()) && !descending(last_state)) {
 				if (state.max_height() != AltosLib.MISSING) {
 					speak("max height: %s.",
 					      AltosConvert.height.say_units(state.max_height()));
@@ -211,7 +211,7 @@ public class AltosVoice {
 		if (last_flight_tell == TELL_FLIGHT_NONE || last_flight_tell == TELL_FLIGHT_STATE || last_flight_tell == TELL_FLIGHT_TRACK) {
 			last_flight_tell = TELL_FLIGHT_SPEED;
 
-			if (state.state <= AltosLib.ao_flight_coast) {
+			if (state.state() <= AltosLib.ao_flight_coast) {
 				speed = state.speed();
 			} else {
 				speed = state.gps_speed();
@@ -301,10 +301,6 @@ public class AltosVoice {
 		else
 			tell_mode = TELL_MODE_RECOVER;
 
-		AltosDebug.debug("last_serial %d serial %d last_mode %d mode %d\n",
-				 last_tell_serial, tell_serial,
-				 last_tell_mode, tell_mode);
-
 		if (tell_mode == TELL_MODE_PAD)
 			spoken = tell_pad(telem_state, state, from_receiver, receiver);
 		else if (tell_mode == TELL_MODE_FLIGHT)
@@ -316,7 +312,7 @@ public class AltosVoice {
 			last_tell_mode = tell_mode;
 			last_tell_serial = tell_serial;
 			if (state != null) {
-				last_state = state.state;
+				last_state = state.state();
 				last_height = state.height();
 				if (state.gps != null)
 					last_gps = state.gps;