mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

channels/client: fix alsa/pulse warning and checks

Browse Source 
- pa_stream_writable_size() returns (size_t) -1 on error
- fix missing cast in alsa client sound channel code
This commit is contained in:
Norbert Federa 2018-10-23 09:45:20 +02:00
parent a7022e9a57
commit af992f4ce1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/rdpsnd/client/alsa/rdpsnd_alsa.c
View File

@ -439,8 +439,8 @@ static UINT rdpsnd_alsa_play(rdpsndDevicePlugin* device, const BYTE* data, size_
if (status < 0) if (status < 0)
{ {
WLog_ERR(TAG, "status: %d\n", status); WLog_ERR(TAG, "status: %d\n", status);
rdpsnd_alsa_close(alsa); rdpsnd_alsa_close(device);
rdpsnd_alsa_open((rdpsndDevicePlugin*) alsa, NULL, alsa->latency); rdpsnd_alsa_open(device, NULL, alsa->latency);
break; break;
} }

2
channels/rdpsnd/client/pulse/rdpsnd_pulse.c
View File

@ -483,7 +483,7 @@ static UINT rdpsnd_pulse_play(rdpsndDevicePlugin* device, const BYTE* data, size
while ((length = pa_stream_writable_size(pulse->stream)) == 0) while ((length = pa_stream_writable_size(pulse->stream)) == 0)
pa_threaded_mainloop_wait(pulse->mainloop); pa_threaded_mainloop_wait(pulse->mainloop);
if (length < 0) if (length == (size_t) -1)
break; break;
if (length > size) if (length > size)

4
channels/tsmf/client/pulse/tsmf_pulse.c
View File

@ -317,7 +317,7 @@ static BOOL tsmf_pulse_play(ITSMFAudioDevice* audio, const BYTE* data, UINT32 da
{ {
TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*) audio; TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*) audio;
const BYTE* src; const BYTE* src;
int len; size_t len;
int ret; int ret;
DEBUG_TSMF("data_size %"PRIu32"", data_size); DEBUG_TSMF("data_size %"PRIu32"", data_size);
@ -334,7 +334,7 @@ static BOOL tsmf_pulse_play(ITSMFAudioDevice* audio, const BYTE* data, UINT32 da
pa_threaded_mainloop_wait(pulse->mainloop); pa_threaded_mainloop_wait(pulse->mainloop);
} }
if (len < 0) if (len == (size_t) -1)
break; break;
if (len > data_size) if (len > data_size)