godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Fix Android TTS on-demand init.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-07-31 16:47:19 +03:00
parent 2a9ff39264
commit 4915d61362
3 changed files with 138 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java
View File

@@ -56,15 +56,21 @@ import java.util.Set;
* </ul>
*/
@Keep
public class GodotTTS extends UtteranceProgressListener {
public class GodotTTS extends UtteranceProgressListener implements TextToSpeech.OnInitListener {
// Note: These constants must be in sync with DisplayServer::TTSUtteranceEvent enum from "servers/display_server.h".
final private static int EVENT_START = 0;
final private static int EVENT_END = 1;
final private static int EVENT_CANCEL = 2;
final private static int EVENT_BOUNDARY = 3;
// Note: These constants must be in sync with TTS_Android constants from "platform/android/tts_android.h".
final private static int INIT_STATE_UNKNOWN = 0;
final private static int INIT_STATE_SUCCESS = 1;
final private static int INIT_STATE_FAIL = -1;
private final Context context;
private TextToSpeech synth;
private int state;
private LinkedList<GodotUtterance> queue;
final private Object lock = new Object();
private GodotUtterance lastUtterance;
@@ -82,6 +88,9 @@ public class GodotTTS extends UtteranceProgressListener {
GodotUtterance message = queue.pollFirst();
Set<Voice> voices = synth.getVoices();
if (voices == null) {
return;
}
for (Voice v : voices) {
if (v.getName().equals(message.voice)) {
synth.setVoice(v);
@@ -189,17 +198,35 @@ public class GodotTTS extends UtteranceProgressListener {
* Initialize synth and query.
*/
public void init() {
synth = new TextToSpeech(context, null);
state = INIT_STATE_UNKNOWN;
synth = new TextToSpeech(context, this);
queue = new LinkedList<GodotUtterance>();
synth.setOnUtteranceProgressListener(this);
}
/**
* Called by TTS engine when initialization is finished.
*/
@Override
public void onInit(int status) {
synchronized (lock) {
if (status == TextToSpeech.SUCCESS) {
state = INIT_STATE_SUCCESS;
} else {
state = INIT_STATE_FAIL;
}
}
}
/**
* Adds an utterance to the queue.
*/
public void speak(String text, String voice, int volume, float pitch, float rate, int utterance_id, boolean interrupt) {
synchronized (lock) {
if (state != INIT_STATE_SUCCESS) {
return;
}
GodotUtterance message = new GodotUtterance(text, voice, volume, pitch, rate, utterance_id);
queue.addLast(message);
@@ -216,6 +243,9 @@ public class GodotTTS extends UtteranceProgressListener {
*/
public void pauseSpeaking() {
synchronized (lock) {
if (state != INIT_STATE_SUCCESS) {
return;
}
if (!paused) {
paused = true;
synth.stop();
@@ -228,10 +258,16 @@ public class GodotTTS extends UtteranceProgressListener {
*/
public void resumeSpeaking() {
synchronized (lock) {
if (state != INIT_STATE_SUCCESS) {
return;
}
if (lastUtterance != null && paused) {
int mode = TextToSpeech.QUEUE_FLUSH;
Set<Voice> voices = synth.getVoices();
if (voices == null) {
return;
}
for (Voice v : voices) {
if (v.getName().equals(lastUtterance.voice)) {
synth.setVoice(v);
@@ -261,6 +297,9 @@ public class GodotTTS extends UtteranceProgressListener {
*/
public void stopSpeaking() {
synchronized (lock) {
if (state != INIT_STATE_SUCCESS) {
return;
}
for (GodotUtterance u : queue) {
GodotLib.ttsCallback(EVENT_CANCEL, u.id, 0);
}
@@ -282,13 +321,21 @@ public class GodotTTS extends UtteranceProgressListener {
* Returns voice information.
*/
public String[] getVoices() {
Set<Voice> voices = synth.getVoices();
String[] list = new String[voices.size()];
int i = 0;
for (Voice v : voices) {
list[i++] = v.getLocale().toString() + ";" + v.getName();
synchronized (lock) {
if (state != INIT_STATE_SUCCESS) {
return new String[0];
}
Set<Voice> voices = synth.getVoices();
if (voices == null) {
return new String[0];
}
String[] list = new String[voices.size()];
int i = 0;
for (Voice v : voices) {
list[i++] = v.getLocale().toString() + ";" + v.getName();
}
return list;
}
return list;
}
/**
@@ -304,4 +351,13 @@ public class GodotTTS extends UtteranceProgressListener {
public boolean isPaused() {
return paused;
}
/**
* Returns INIT_STATE_SUCCESS if the synthesizer initialization finished successfully, INIT_STATE_FAIL if initialization failed, and INIT_STATE_UNKNOWN otherwise.
*/
public int getState() {
synchronized (lock) {
return state;
}
}
}