Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Oct 27, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions platform/linuxbsd/tts_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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);
}
}

Expand All @@ -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)) {
Expand Down Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions platform/linuxbsd/tts_linux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading