X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosVoice.java;h=2049c79654b958c645846d298423912605ddabed;hb=HEAD;hp=8631023c3a76f9bab278297a5697c443d8c95657;hpb=d84a777f07c9a876acdcda44ebc9186ef226d896;p=fw%2Faltos diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosVoice.java index 8631023c..f86f60cb 100644 --- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosVoice.java +++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosVoice.java @@ -19,11 +19,12 @@ package org.altusmetrum.AltosDroid; +import java.util.*; import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.OnInitListener; import android.location.Location; -import org.altusmetrum.altoslib_13.*; +import org.altusmetrum.altoslib_14.*; public class AltosVoice { @@ -82,7 +83,7 @@ public class AltosVoice { if (!tts_enabled) return; last_speak_time = now(); if (!quiet) - tts.speak(s, TextToSpeech.QUEUE_ADD, null); + tts.speak(s, TextToSpeech.QUEUE_ADD, null, null); } public synchronized long time_since_speak() { @@ -90,7 +91,7 @@ public class AltosVoice { } public synchronized void speak(String format, Object ... arguments) { - speak(String.format(format, arguments)); + speak(String.format(Locale.getDefault(), format, arguments)); } public synchronized boolean is_speaking() { @@ -269,7 +270,7 @@ public class AltosVoice { String direction = AltosDroid.direction(from_receiver, receiver); if (direction == null) - direction = String.format("Bearing %d", (int) (from_receiver.bearing + 0.5)); + direction = String.format(Locale.getDefault(), "Bearing %d", (int) (from_receiver.bearing + 0.5)); speak("%s, distance %s.", direction, AltosConvert.distance.say_units(from_receiver.distance));