Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-07-07 16:15:36 +02:00
commit ce574e1287
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
View file

@ -94,6 +94,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
*/
private static int ttsRequests;
private float cSpeechRate = 1;
private boolean speechAllowed = false;
// Called from the calculating route thread.
@Override
@ -104,7 +105,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
bld.append(s).append(' ');
}
sendAlertToPebble(bld.toString());
if (mTts != null && !vrt.isMute()) {
if (mTts != null && !vrt.isMute() && speechAllowed) {
if (ttsRequests++ == 0) {
requestAudioFocus();
// Delay first prompt of each batch to allow BT SCO connection being established
@ -166,6 +167,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
if (status != TextToSpeech.SUCCESS) {
internalClear();
} else if (mTts != null) {
speechAllowed = true;
switch (mTts.isLanguageAvailable(new Locale(language))) {
case TextToSpeech.LANG_MISSING_DATA:
if (isSettingsActivity(act)) {
@ -240,6 +242,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
}
mTtsContext = null;
ttsRequests = 0;
speechAllowed = false;
}
@Override