X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosVoice.java;h=ce3b57afa03ad5bfc92ac87107b3f19ed4cb88b6;hp=325b89d2f553a0186a053b84cfc3c6108339fd12;hb=431c713389dc819d2433d893c898ff82c7941722;hpb=c1dec3bec0789e8934a6e13fd117931ba468b318

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index 325b89d2..ce3b57af 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -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();
@@ -312,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;