From da7fefba1106365a92989fe49bbc530b53dcd1c2 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 3 Apr 2025 09:50:34 +0200 Subject: [PATCH] Revert "[freerdp,codecs] fix deprecation for GCC" This reverts commit 67fabc34dce7aa3543e152f78cb4ea88ac9d1244. The change eliminates the deprecation warnings but produces Wredundant-decl warnings instead... --- client/SDL/SDL3/sdl_freerdp.cpp | 4 ++-- client/SDL/SDL3/sdl_freerdp.hpp | 5 ++--- include/freerdp/codecs.h | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/client/SDL/SDL3/sdl_freerdp.cpp b/client/SDL/SDL3/sdl_freerdp.cpp index e74e47f15..d16d26b5f 100644 --- a/client/SDL/SDL3/sdl_freerdp.cpp +++ b/client/SDL/SDL3/sdl_freerdp.cpp @@ -1790,14 +1790,14 @@ SdlContext::SdlContext(rdpContext* context) WINPR_ASSERT(context); } -bool SdlContext::redraw(bool suppress) +bool SdlContext::redraw(bool suppress) const { if (!connected) return true; auto gdi = context()->gdi; WINPR_ASSERT(gdi); - return gdi_send_suppress_output(gdi, suppress ? TRUE : FALSE); + return gdi_send_suppress_output(gdi, suppress); } void SdlContext::setConnected(bool val) diff --git a/client/SDL/SDL3/sdl_freerdp.hpp b/client/SDL/SDL3/sdl_freerdp.hpp index 71e0ee857..5afd71fd1 100644 --- a/client/SDL/SDL3/sdl_freerdp.hpp +++ b/client/SDL/SDL3/sdl_freerdp.hpp @@ -54,8 +54,7 @@ class SdlContext SdlContext& operator=(const SdlContext& other) = delete; SdlContext& operator=(SdlContext&& other) = delete; - public: - [[nodiscard]] bool redraw(bool suppress = false); + [[nodiscard]] bool redraw(bool suppress = false) const; void setConnected(bool val); [[nodiscard]] bool isConnected() const; @@ -69,6 +68,7 @@ class SdlContext private: rdpContext* _context; + std::atomic connected = false; public: wLog* log; @@ -100,5 +100,4 @@ class SdlContext std::unique_ptr connection_dialog; std::atomic rdp_thread_running; - std::atomic connected = false; }; diff --git a/include/freerdp/codecs.h b/include/freerdp/codecs.h index b51362448..33937f43f 100644 --- a/include/freerdp/codecs.h +++ b/include/freerdp/codecs.h @@ -87,12 +87,12 @@ extern "C" FREERDP_API rdpCodecs* freerdp_client_codecs_new(UINT32 TheadingFlags); #if !defined(WITHOUT_FREERDP_3x_DEPRECATED) - FREERDP_API void codecs_free(rdpCodecs* codecs); + WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_free", + FREERDP_API void codecs_free(rdpCodecs* codecs)); + WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_new", WINPR_ATTR_MALLOC(codecs_free, 1) FREERDP_API rdpCodecs* codecs_new(rdpContext* context)); - WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_free", - FREERDP_API void codecs_free(rdpCodecs* codecs)); #endif #ifdef __cplusplus