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-25 19:24:30 +02:00
commit d4d8edc630
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,11 +61,7 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
if (mediaPlayer != null){ if (mediaPlayer != null){
mediaPlayer.stop(); mediaPlayer.stop();
} }
// TODO: Issue #2810: Audio focus issues when ongoing prompt is interrupted by stop(), i.e. when off-route is detected. Temp workaround is to nullify and always re-init player. // TODO: Issue #2810: Audio focus issues when "off route" is detected during an ongoing prompt (then stop() is called here)
//if (ctx != null && ctx.getSettings().AUDIO_STREAM_GUIDANCE.get() == 0) {
mediaPlayer.release();
mediaPlayer = null;
//}
if (ctx != null) { if (ctx != null) {
abandonAudioFocus(); abandonAudioFocus();
} }

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

@ -134,10 +134,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
if (mTts != null){ if (mTts != null){
mTts.stop(); mTts.stop();
} }
// TODO: Issue #2810: Audio focus issues when ongoing prompt is interrupted by stop(), i.e. when off-route is detected. Temp workaround is to nullify and always re-init player. // TODO: Issue #2810: Audio focus issues when "off route" is detected during an ongoing prompt (then stop() is called here)
//if (ctx != null && ctx.getSettings().AUDIO_STREAM_GUIDANCE.get() == 0) {
mTts = null;
//}
if (ctx != null) { if (ctx != null) {
abandonAudioFocus(); abandonAudioFocus();
} }