mirror of
https://github.com/godotengine/godot
synced 2024-09-04 21:48:31 +00:00
TTS_Linux: Fix size_t template issue on OpenBSD by using int consistently
This commit is contained in:
parent
5664f09f78
commit
a0253e593c
|
@ -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) {
|
||||
TTS_Linux *tts = TTS_Linux::get_singleton();
|
||||
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_
|
||||
|
||||
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) {
|
||||
TTS_Linux *tts = TTS_Linux::get_singleton();
|
||||
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_
|
||||
|
||||
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()) {
|
||||
resume();
|
||||
} else {
|
||||
_speech_event(0, 0, (int)SPD_EVENT_BEGIN);
|
||||
_speech_event(0, (int)SPD_EVENT_BEGIN);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -72,8 +72,8 @@ class TTS_Linux : public Object {
|
|||
|
||||
protected:
|
||||
void _load_voices();
|
||||
void _speech_event(size_t p_msg_id, size_t p_client_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_event(int p_msg_id, int p_type);
|
||||
void _speech_index_mark(int p_msg_id, int p_type, const String &p_index_mark);
|
||||
|
||||
public:
|
||||
static TTS_Linux *get_singleton();
|
||||
|
|
Loading…
Reference in a new issue