mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-01 21:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

onDataChecked may be called *after* onInitialized is called, in which case mVoices will be null; set the voice count in onDataChecked to avoid problems

Browse Source
This commit is contained in:
Reece H. Dunn
2012-12-13 23:58:34 +00:00
parent e346c86cb7
commit e27a218592
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java
+17 -4
View File
@@ -27,6 +27,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.speech.tts.TextToSpeech;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -47,6 +48,8 @@ public class eSpeakActivity extends Activity {
private static final int DIALOG_DOWNLOAD_FAILED = 2;
private static final int DIALOG_ERROR = 3;
private static final String TAG = "eSpeakActivity";
private enum State {
LOADING,
FAILURE,
@@ -137,6 +140,7 @@ public class eSpeakActivity extends Activity {
private void onDataChecked(int resultCode, Intent data) {
if (resultCode != TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) {
if (mDownloadedVoiceData) {
Log.e(TAG, "Voice data check failed (error code: " + resultCode + ").");
setState(State.FAILURE);
showDialog(DIALOG_ERROR);
} else {
@@ -147,7 +151,17 @@ public class eSpeakActivity extends Activity {
mVoices = data.getStringArrayListExtra(TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
if (mVoices == null) {
Log.e(TAG, "Data check failed -- voices is null.");
setState(State.FAILURE);
showDialog(DIALOG_ERROR);
return;
}
initializeEngine();
final TextView availableVoices = (TextView) findViewById(R.id.availableVoices);
availableVoices.setText(Integer.toString(mVoices.size()));
}
/**
@@ -158,6 +172,7 @@ public class eSpeakActivity extends Activity {
*/
private void onDataDownloaded(int resultCode) {
if (resultCode != RESULT_OK) {
Log.e(TAG, "Voice data download failed.");
setState(State.FAILURE);
showDialog(DIALOG_DOWNLOAD_FAILED);
return;
@@ -180,7 +195,8 @@ public class eSpeakActivity extends Activity {
return;
}
if (status == TextToSpeech.ERROR || mVoices == null) {
if (status == TextToSpeech.ERROR) {
Log.e(TAG, "Initialization failed (status: " + status + ").");
setState(State.FAILURE);
showDialog(DIALOG_ERROR);
return;
@@ -189,9 +205,6 @@ public class eSpeakActivity extends Activity {
final TextView currentLocale = (TextView) findViewById(R.id.currentLocale);
currentLocale.setText(mTts.getLanguage().getDisplayName());
final TextView availableVoices = (TextView) findViewById(R.id.availableVoices);
availableVoices.setText(Integer.toString(mVoices.size()));
findViewById(R.id.updateVoices).setOnClickListener(mOnClickListener);
findViewById(R.id.ttsSettings).setOnClickListener(mOnClickListener);
findViewById(R.id.engineSettings).setOnClickListener(mOnClickListener);