godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TTS_Linux: Fix size_t template issue on OpenBSD by using int consistently 

(cherry picked from commit a0253e593c)
This commit is contained in:
thfrwn 2023-10-26 14:37:15 -04:00 committed by Yuri Sizov
parent f247ffef54
commit 204f3bd58d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/linuxbsd/tts_linux.cpp
View File

@ -82,11 +82,11 @@ void TTS_Linux::speech_init_thread_func(void *p_userdata) {
void TTS_Linux::speech_event_index_mark(size_t p_msg_id, size_t p_client_id, SPDNotificationType p_type, char *p_index_mark) { void TTS_Linux::speech_event_index_mark(size_t p_msg_id, size_t p_client_id, SPDNotificationType p_type, char *p_index_mark) {
TTS_Linux *tts = TTS_Linux::get_singleton(); TTS_Linux *tts = TTS_Linux::get_singleton();
if (tts) { if (tts) {
callable_mp(tts, &TTS_Linux::_speech_index_mark).call_deferred(p_msg_id, p_client_id, (int)p_type, String::utf8(p_index_mark)); callable_mp(tts, &TTS_Linux::_speech_index_mark).call_deferred((int)p_msg_id, (int)p_type, String::utf8(p_index_mark));
} }
} }
void TTS_Linux::_speech_index_mark(size_t p_msg_id, size_t p_client_id, int p_type, const String &p_index_mark) { void TTS_Linux::_speech_index_mark(int p_msg_id, int p_type, const String &p_index_mark) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
if (ids.has(p_msg_id)) { if (ids.has(p_msg_id)) {
@ -97,7 +97,7 @@ void TTS_Linux::_speech_index_mark(size_t p_msg_id, size_t p_client_id, int p_ty
void TTS_Linux::speech_event_callback(size_t p_msg_id, size_t p_client_id, SPDNotificationType p_type) { void TTS_Linux::speech_event_callback(size_t p_msg_id, size_t p_client_id, SPDNotificationType p_type) {
TTS_Linux *tts = TTS_Linux::get_singleton(); TTS_Linux *tts = TTS_Linux::get_singleton();
if (tts) { if (tts) {
callable_mp(tts, &TTS_Linux::_speech_event).call_deferred(p_msg_id, p_client_id, (int)p_type); callable_mp(tts, &TTS_Linux::_speech_event).call_deferred((int)p_msg_id, (int)p_type);
} }
} }
@ -119,7 +119,7 @@ void TTS_Linux::_load_voices() {
} }
} }
void TTS_Linux::_speech_event(size_t p_msg_id, size_t p_client_id, int p_type) { void TTS_Linux::_speech_event(int p_msg_id, int p_type) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
if (!paused && ids.has(p_msg_id)) { if (!paused && ids.has(p_msg_id)) {
@ -226,7 +226,7 @@ void TTS_Linux::speak(const String &p_text, const String &p_voice, int p_volume,
if (is_paused()) { if (is_paused()) {
resume(); resume();
} else { } else {
_speech_event(0, 0, (int)SPD_EVENT_BEGIN); _speech_event(0, (int)SPD_EVENT_BEGIN);
} }
} }

4
platform/linuxbsd/tts_linux.h
View File

@ -72,8 +72,8 @@ class TTS_Linux : public Object {
protected: protected:
void _load_voices(); void _load_voices();
void _speech_event(size_t p_msg_id, size_t p_client_id, int p_type); void _speech_event(int p_msg_id, int p_type);
void _speech_index_mark(size_t p_msg_id, size_t p_client_id, int p_type, const String &p_index_mark); void _speech_index_mark(int p_msg_id, int p_type, const String &p_index_mark);
public: public:
static TTS_Linux *get_singleton(); static TTS_Linux *get_singleton();