From ee81bb017b65b897dfeb1171095d8be3458a8d20 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 30 Sep 2024 21:54:53 +0200 Subject: [PATCH] [warnings] fix assign enum * add missing value for rdpecam * use an integer for a badly designed API --- channels/rdpsnd/client/pulse/rdpsnd_pulse.c | 7 +++++-- include/freerdp/channels/rdpecam.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index 957948dff..e61d295a9 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -355,7 +355,7 @@ static BOOL rdpsnd_pulse_context_connect(rdpsndDevicePlugin* device) static BOOL rdpsnd_pulse_open_stream(rdpsndDevicePlugin* device) { pa_stream_state_t state = PA_STREAM_FAILED; - pa_stream_flags_t flags = PA_STREAM_NOFLAGS; + int flags = PA_STREAM_NOFLAGS; pa_buffer_attr buffer_attr = { 0 }; char ss[PA_SAMPLE_SPEC_SNPRINT_MAX] = { 0 }; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; @@ -404,8 +404,11 @@ static BOOL rdpsnd_pulse_open_stream(rdpsndDevicePlugin* device) flags |= PA_STREAM_ADJUST_LATENCY; } + // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange) + pa_stream_flags_t eflags = (pa_stream_flags_t)flags; if (pa_stream_connect_playback(pulse->stream, pulse->device_name, - pulse->latency > 0 ? &buffer_attr : NULL, flags, NULL, NULL) < 0) + pulse->latency > 0 ? &buffer_attr : NULL, eflags, NULL, + NULL) < 0) { WLog_ERR(TAG, "error connecting playback stream"); pa_stream_unref(pulse->stream); diff --git a/include/freerdp/channels/rdpecam.h b/include/freerdp/channels/rdpecam.h index 534f3210e..e1ce73172 100644 --- a/include/freerdp/channels/rdpecam.h +++ b/include/freerdp/channels/rdpecam.h @@ -175,6 +175,7 @@ typedef struct typedef enum { + CAM_MEDIA_FORMAT_INVALID = 0x00, CAM_MEDIA_FORMAT_H264 = 0x01, CAM_MEDIA_FORMAT_MJPG = 0x02, CAM_MEDIA_FORMAT_YUY2 = 0x03,