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

[Windows] Fix TTS events arriving out of order.

Browse Source
This commit is contained in:
bruvzg
2024-11-22 10:15:46 +02:00
committed by Pāvels Nadtočajevs
parent f952bfe998
commit 24d51f7635
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/windows/display_server_windows.cpp
View File

@@ -3244,6 +3244,10 @@ void DisplayServerWindows::process_events() {
} }
_THREAD_SAFE_UNLOCK_ _THREAD_SAFE_UNLOCK_
if (tts) {
tts->process_events();
}
if (!drop_events) { if (!drop_events) {
_process_key_events(); _process_key_events();
Input::get_singleton()->flush_buffered_events(); Input::get_singleton()->flush_buffered_events();

10
platform/windows/tts_windows.cpp
View File

@@ -43,7 +43,7 @@ void __stdcall TTS_Windows::speech_event_callback(WPARAM wParam, LPARAM lParam)
} else if (event.eEventId == SPEI_END_INPUT_STREAM) { } else if (event.eEventId == SPEI_END_INPUT_STREAM) {
DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_ENDED, tts->ids[stream_num].id); DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_ENDED, tts->ids[stream_num].id);
tts->ids.erase(stream_num); tts->ids.erase(stream_num);
tts->_update_tts(); tts->update_requested = true;
} else if (event.eEventId == SPEI_WORD_BOUNDARY) { } else if (event.eEventId == SPEI_WORD_BOUNDARY) {
const Char16String &string = tts->ids[stream_num].string; const Char16String &string = tts->ids[stream_num].string;
int pos = 0; int pos = 0;
@@ -60,8 +60,8 @@ void __stdcall TTS_Windows::speech_event_callback(WPARAM wParam, LPARAM lParam)
} }
} }
void TTS_Windows::_update_tts() { void TTS_Windows::process_events() {
if (!is_speaking() && !paused && queue.size() > 0) { if (update_requested && !paused && queue.size() > 0 && !is_speaking()) {
DisplayServer::TTSUtterance &message = queue.front()->get(); DisplayServer::TTSUtterance &message = queue.front()->get();
String text; String text;
@@ -110,6 +110,8 @@ void TTS_Windows::_update_tts() {
ids[(uint32_t)stream_number] = ut; ids[(uint32_t)stream_number] = ut;
queue.pop_front(); queue.pop_front();
update_requested = false;
} }
} }
@@ -207,7 +209,7 @@ void TTS_Windows::speak(const String &p_text, const String &p_voice, int p_volum
if (is_paused()) { if (is_paused()) {
resume(); resume();
} else { } else {
_update_tts(); update_requested = true;
} }
} }

4
platform/windows/tts_windows.h
View File

@@ -55,9 +55,9 @@ class TTS_Windows {
int id; int id;
}; };
HashMap<uint32_t, UTData> ids; HashMap<uint32_t, UTData> ids;
bool update_requested = false;
static void __stdcall speech_event_callback(WPARAM wParam, LPARAM lParam); static void __stdcall speech_event_callback(WPARAM wParam, LPARAM lParam);
void _update_tts();
static TTS_Windows *singleton; static TTS_Windows *singleton;
@@ -73,6 +73,8 @@ public:
void resume(); void resume();
void stop(); void stop();
void process_events();
TTS_Windows(); TTS_Windows();
~TTS_Windows(); ~TTS_Windows();
}; };