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

small fix for voice debugging

Browse source
This commit is contained in:
Hardy 2017-06-15 07:02:53 +02:00 committed by GitHub
parent 10eaa761e1
commit 82f8d56165
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -204,7 +204,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
builder.show(); builder.show();
} }
ttsVoiceStatus = newLocale.getDisplayName() + ": LANG_MISSING_DATA"; ttsVoiceStatus = newLocale.getDisplayName() + ": LANG_MISSING_DATA";
ttsVoiceUsed = getTtsVoiceUsed(); ttsVoiceUsed = getVoiceUsed();
break; break;
case TextToSpeech.LANG_AVAILABLE: case TextToSpeech.LANG_AVAILABLE:
ttsVoiceStatus = newLocale.getDisplayName() + ": LANG_AVAILABLE"; ttsVoiceStatus = newLocale.getDisplayName() + ": LANG_AVAILABLE";
@ -221,7 +221,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
mTts.setSpeechRate(speechRate); mTts.setSpeechRate(speechRate);
} }
ttsVoiceStatus = "".equals(ttsVoiceStatus) ? newLocale.getDisplayName() + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceStatus; ttsVoiceStatus = "".equals(ttsVoiceStatus) ? newLocale.getDisplayName() + ": LANG_COUNTRY_VAR_AVAILABLE" : ttsVoiceStatus;
ttsVoiceUsed = getTtsVoiceUsed(); ttsVoiceUsed = getVoiceUsed();
break; break;
case TextToSpeech.LANG_NOT_SUPPORTED: case TextToSpeech.LANG_NOT_SUPPORTED:
//maybe weird, but I didn't want to introduce parameter in around 5 methods just to do this if condition //maybe weird, but I didn't want to introduce parameter in around 5 methods just to do this if condition
@ -237,7 +237,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
builder.show(); builder.show();
} }
ttsVoiceStatus = newLocale.getDisplayName() + ": LANG_NOT_SUPPORTED"; ttsVoiceStatus = newLocale.getDisplayName() + ": LANG_NOT_SUPPORTED";
ttsVoiceUsed = getTtsVoiceUsed(); ttsVoiceUsed = getVoiceUsed();
break; break;
} }
} }
@ -251,15 +251,15 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
try { try {
if (android.os.Build.VERSION.SDK_INT >= 21) { if (android.os.Build.VERSION.SDK_INT >= 21) {
if (mTts.getVoice() != null) { if (mTts.getVoice() != null) {
return mTts.getVoice().toString(); return mTts.getVoice().toString() + " (API " + android.os.Build.VERSION.SDK_INT.toString() + ")";
} }
} else { } else {
return mTts.getLanguage() + " (Voice details not reported in API<21)"; return mTts.getLanguage() + " (API " + android.os.Build.VERSION.SDK_INT.toString() + " only reports language)";
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
// mTts.getVoice() might throw NPE // mTts.getVoice() might throw NPE
} }
return ""; return "-";
} }
}); });
mTts.setOnUtteranceCompletedListener(new OnUtteranceCompletedListener() { mTts.setOnUtteranceCompletedListener(new OnUtteranceCompletedListener() {