X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosVoice.java;h=811b03675d63640bb62d258ce46a6a249fa43d9d;hp=8eb08b99dbb62dc08f1d8cebd025b5900bad67d7;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=b1b41e0823a60769e7d2d806f4d97ae043d7dae3

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index 8eb08b99..811b0367 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -4,7 +4,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,7 +23,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 {
 
@@ -183,9 +184,12 @@ public class AltosVoice {
 		if (state == null)
 			return false;
 
-		if (state.state != last_state && AltosLib.ao_flight_boost <= state.state && state.state <= AltosLib.ao_flight_landed) {
+		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) {
 			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()));
@@ -208,7 +212,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();
@@ -298,10 +302,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)
@@ -313,7 +313,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;