vcap/delta: another compat with SDK 6.21+

Author: MartinPulec

src/deltacast_common.hpp

@@ -122,16 +122,20 @@
         #ifdef VHD_CORE_BP_BYPASS_RELAY_0
 // enum membber until 6.20, macro since 6.21
                 #define VHD_MIN_6_21 1
-#endif
-#if !defined VHD_MIN_6_21 && !defined VHD_IS_6_20 // 6.19 or 6.20
+        #endif
+        #if !defined VHD_MIN_6_21 && !defined VHD_IS_6_20 // 6.19 or 6.20
                 #warning cannot determine if VideoMaster is 6.19 or 6.20 - \
                         assuming 6.20. Pass -DVHD_IS_6_19 (or 6_20) to enforce \
                         specific version.
-#endif
+        #endif
         #define VHD_MIN_6_20 1
         #define VHD_MIN_6_19 1
 #endif
 
+#ifdef HAVE_VHD_STRING
+        #define VHD_MIN_6_30 1
+#endif
+
 // compat
 #ifdef DELTA_DVI_DEPRECATED
 #define VHD_BOARDTYPE_DVI VHD_BOARDTYPE_DVI_DEPRECATED

src/video_capture/deltacast.cpp

@@ -187,7 +187,7 @@ static bool wait_for_channel(struct vidcap_deltacast_state *s)
 
         /* Wait for channel locked */
         Result =
-#ifdef VHD_MIN_6_21
+#ifdef VHD_MIN_6_30
             /* Check Dual and Link A status */
             VHD_GetChannelProperty(s->BoardHandle, VHD_RX_CHANNEL, s->channel,
                                    VHD_CORE_CP_STATUS, &Status);
@@ -212,7 +212,7 @@ static bool wait_for_channel(struct vidcap_deltacast_state *s)
 
         /* Auto-detect clock system */
         Result =
-#ifdef VHD_MIN_6_21
+#ifdef VHD_MIN_6_30
             VHD_GetChannelProperty(s->BoardHandle, VHD_RX_CHANNEL, s->channel,
                                    VHD_SDI_CP_CLOCK_DIVISOR, &s->ClockSystem);
 #else
@@ -524,7 +524,7 @@ vidcap_deltacast_init(struct vidcap_params *params, void **state)
 
         for (ULONG i = s->channel; i < s->channel + (s->quad_channel ? 4 : 1);
              i++) {
-#ifdef VHD_MIN_6_21
+#ifdef VHD_MIN_6_30
                 /*Channel mode Setup*/
                 if ((ChnType == VHD_CHNTYPE_3GSDI_ASI) ||
                     (ChnType == VHD_CHNTYPE_12GSDI_ASI)) {