diff options
| author | Thomas Herzog <thomas.herzog@mail.com> | 2018-08-13 14:18:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 14:18:29 +0200 |
| commit | e5ce6b728f2af108fd3c183cc7d9d540adda5193 (patch) | |
| tree | dec0f4a180f09712ebcf262d37844581348bf806 /drivers/pulseaudio | |
| parent | 0d96902a0c876373ff508b45c7fa3073b7577aa5 (diff) | |
| parent | eb3ab7cbbd49f2ac844790e442ba772ca09eb7ed (diff) | |
Merge pull request #20933 from marcelofg55/pa_compile_err
Fix compile error with PulseAudio driver and clang
Diffstat (limited to 'drivers/pulseaudio')
| -rw-r--r-- | drivers/pulseaudio/audio_driver_pulseaudio.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp index 987cd9c85f..d1104eec18 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp +++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp @@ -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 { |