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

Merge pull request #20933 from marcelofg55/pa_compile_err 

Fix compile error with PulseAudio driver and clang
This commit is contained in:
Thomas Herzog 2018-08-13 14:18:29 +02:00 committed by GitHub
parent 0d96902a0c eb3ab7cbbd
commit e5ce6b728f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pulseaudio/audio_driver_pulseaudio.cpp
View File

@ -349,7 +349,7 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) {
}
uint32_t l = ad->samples_in[in_idx++];
uint32_t r = ad->samples_in[in_idx++];
ad->samples_out.write[out_idx++] = (l >> 1 + r >> 1) >> 16;
ad->samples_out.write[out_idx++] = ((l >> 1) + (r >> 1)) >> 16;
}
}
}
@ -373,7 +373,7 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) {
if (bytes > 0) {
size_t bytes_to_write = MIN(bytes, avail_bytes);
const void *ptr = ad->samples_out.ptr();
ret = pa_stream_write(ad->pa_str, ptr + write_ofs, bytes_to_write, NULL, 0LL, PA_SEEK_RELATIVE);
ret = pa_stream_write(ad->pa_str, (char *)ptr + write_ofs, bytes_to_write, NULL, 0LL, PA_SEEK_RELATIVE);
if (ret != 0) {
ERR_PRINT("pa_stream_write error");
} else {