From 372f96d11da401d01a41b59dea9297ed1ecfc5c3 Mon Sep 17 00:00:00 2001 From: sonora Date: Mon, 25 Jul 2016 19:23:57 +0200 Subject: [PATCH] remove test code again --- .../src/net/osmand/plus/voice/MediaCommandPlayerImpl.java | 6 +----- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java index 0ec76cf37c..0f021b546d 100644 --- a/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java @@ -61,11 +61,7 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen if (mediaPlayer != null){ 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. - //if (ctx != null && ctx.getSettings().AUDIO_STREAM_GUIDANCE.get() == 0) { - mediaPlayer.release(); - mediaPlayer = null; - //} + // TODO: Issue #2810: Audio focus issues when "off route" is detected during an ongoing prompt (then stop() is called here) if (ctx != null) { abandonAudioFocus(); } diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index a72e7dc179..74a2d80570 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -134,10 +134,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { if (mTts != null){ 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. - //if (ctx != null && ctx.getSettings().AUDIO_STREAM_GUIDANCE.get() == 0) { - mTts = null; - //} + // TODO: Issue #2810: Audio focus issues when "off route" is detected during an ongoing prompt (then stop() is called here) if (ctx != null) { abandonAudioFocus(); }