From d8ce230304e886ff7e89b4bbdd0dca88d4696fcc Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Fri, 7 Oct 2022 12:01:17 +0200 Subject: [PATCH] Deltacast: VideoMaster 6.20 compat But breaks compatibility with 6.19, 6.18 and earlier works (see note in code). --- src/deltacast_common.hpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/deltacast_common.hpp b/src/deltacast_common.hpp index 53c11cdf0..11a5a2b41 100644 --- a/src/deltacast_common.hpp +++ b/src/deltacast_common.hpp @@ -79,11 +79,29 @@ #define DELTA_DVI_DEPRECATED 1 #endif +#ifdef HAVE_MACOSX +#include +#else +#include +#endif +#if defined VHD_IP_FILTER_UDP_PORT_DEST +#define VHD_MIN_6_19 1 +#endif + // compat #ifdef DELTA_DVI_DEPRECATED #define VHD_BOARDTYPE_DVI VHD_BOARDTYPE_DVI_DEPRECATED #define VHD_BOARDTYPE_HDKEY VHD_BOARDTYPE_HDKEY_DEPRECATED #endif +// Following items have been actually deprecated in 6.20. But 6.20 doesn't +// bring any new define and thus it is undistinguishable from 6.19. As a +// consequence, it won't compile with 6.19. +#if defined VHD_MIN_6_19 +#define VHD_BOARDTYPE_SD VHD_BOARDTYPE_SD_DEPRECATED +#define VHD_BOARDTYPE_SDKEY VHD_BOARDTYPE_SDKEY_DEPRECATED +#define VHD_BOARDTYPE_HDMI VHD_BOARDTYPE_HDMI_DEPRECATED +#define VHD_CHNTYPE_SDSDI VHD_CHNTYPE_SDSDI_DEPRECATED +#endif struct deltacast_frame_mode_t { int mode;