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-11 22:44:02 +02:00
commit 76c6095c7a
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java
View file

@ -263,6 +263,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
public void clear() {
if(ctx != null && ctx.getSettings() != null) {
ctx.getSettings().APPLICATION_MODE.removeListener(this);
abandonAudioFocus();
}
ctx = null;
prologSystem = null;

3
OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java
View file

@ -55,6 +55,9 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
if (mediaPlayer != null){
mediaPlayer.stop();
}
if (ctx != null) {
abandonAudioFocus();
}
}
// Called from the calculating route thread.

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

@ -123,7 +123,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID,""+System.currentTimeMillis());
mTts.speak(bld.toString(), TextToSpeech.QUEUE_ADD, params);
// Audio focus will be released when onUtteranceCompleted() completed is called by the TTS engine.
} else {
} else if (ctx != null) {
sendAlertToAndroidWear(ctx, bld.toString());
}
}
@ -134,6 +134,9 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
mTts.stop();
}
ttsRequests = 0;
if (ctx != null) {
abandonAudioFocus();
}
}
public void sendAlertToPebble(String bld) {
@ -243,6 +246,9 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
mTtsContext = null;
ttsRequests = 0;
speechAllowed = false;
if (ctx != null) {
abandonAudioFocus();
}
}
@Override