diff --git a/plugins/decklink/linux/decklink-sdk/DeckLinkAPI.h b/plugins/decklink/linux/decklink-sdk/DeckLinkAPI.h index d9f532da7..35240c0f5 100644 --- a/plugins/decklink/linux/decklink-sdk/DeckLinkAPI.h +++ b/plugins/decklink/linux/decklink-sdk/DeckLinkAPI.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIConfiguration.h b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIConfiguration.h index bf1015baa..0fc68cf92 100644 --- a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIConfiguration.h +++ b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIConfiguration.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDeckControl.h b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDeckControl.h index 79e90f96f..9e1c6d769 100644 --- a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDeckControl.h +++ b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDeckControl.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDiscovery.h b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDiscovery.h index e8f1a7b4f..613c02002 100644 --- a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDiscovery.h +++ b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIDiscovery.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIModes.h b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIModes.h index a7d14ee61..240bc9de7 100644 --- a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIModes.h +++ b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIModes.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/linux/decklink-sdk/DeckLinkAPITypes.h b/plugins/decklink/linux/decklink-sdk/DeckLinkAPITypes.h index 1dbab7427..850c7223c 100644 --- a/plugins/decklink/linux/decklink-sdk/DeckLinkAPITypes.h +++ b/plugins/decklink/linux/decklink-sdk/DeckLinkAPITypes.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVersion.h b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVersion.h index dcdeeb1ca..6187cc7b2 100644 --- a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVersion.h +++ b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVersion.h @@ -30,8 +30,8 @@ #ifndef __DeckLink_API_Version_h__ #define __DeckLink_API_Version_h__ -#define BLACKMAGIC_DECKLINK_API_VERSION 0x0b060000 -#define BLACKMAGIC_DECKLINK_API_VERSION_STRING "11.6" +#define BLACKMAGIC_DECKLINK_API_VERSION 0x0c000000 +#define BLACKMAGIC_DECKLINK_API_VERSION_STRING "12.0" #endif // __DeckLink_API_Version_h__ diff --git a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVideoInput_v10_11.h b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVideoInput_v10_11.h index a1e4753f3..d8e286f2b 100644 --- a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVideoInput_v10_11.h +++ b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVideoInput_v10_11.h @@ -30,6 +30,7 @@ #include "DeckLinkAPI.h" #include "DeckLinkAPI_v10_11.h" +#include "DeckLinkAPIVideoInput_v11_5_1.h" // Type Declarations BMD_CONST REFIID IID_IDeckLinkInput_v10_11 = /* AF22762B-DFAC-4846-AA79-FA8883560995 */ {0xAF,0x22,0x76,0x2B,0xDF,0xAC,0x48,0x46,0xAA,0x79,0xFA,0x88,0x83,0x56,0x09,0x95}; @@ -63,7 +64,7 @@ public: virtual HRESULT StopStreams (void) = 0; virtual HRESULT PauseStreams (void) = 0; virtual HRESULT FlushStreams (void) = 0; - virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0; + virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1 *theCallback) = 0; /* Hardware Timing */ diff --git a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVideoInput_v11_4.h b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVideoInput_v11_4.h index daa61bded..2b411ff97 100644 --- a/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVideoInput_v11_4.h +++ b/plugins/decklink/linux/decklink-sdk/DeckLinkAPIVideoInput_v11_4.h @@ -29,6 +29,7 @@ #define BMD_DECKLINKAPIVIDEOINPUT_v11_4_H #include "DeckLinkAPI.h" +#include "DeckLinkAPIVideoInput_v11_5_1.h" // Type Declarations BMD_CONST REFIID IID_IDeckLinkInput_v11_4 = /* 2A88CF76-F494-4216-A7EF-DC74EEB83882 */ { 0x2A,0x88,0xCF,0x76,0xF4,0x94,0x42,0x16,0xA7,0xEF,0xDC,0x74,0xEE,0xB8,0x38,0x82 }; @@ -62,7 +63,7 @@ public: virtual HRESULT StopStreams (void) = 0; virtual HRESULT PauseStreams (void) = 0; virtual HRESULT FlushStreams (void) = 0; - virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback* theCallback) = 0; + virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1* theCallback) = 0; /* Hardware Timing */ diff --git a/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v9_2.h b/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v9_2.h index cb2d3d3fa..2b6a395ae 100644 --- a/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v9_2.h +++ b/plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v9_2.h @@ -30,6 +30,7 @@ #include "DeckLinkAPI.h" #include "DeckLinkAPI_v10_11.h" +#include "DeckLinkAPIVideoInput_v11_5_1.h" // Interface ID Declarations @@ -67,7 +68,7 @@ public: virtual HRESULT StopStreams (void) = 0; virtual HRESULT PauseStreams (void) = 0; virtual HRESULT FlushStreams (void) = 0; - virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0; + virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1 *theCallback) = 0; /* Hardware Timing */ diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPI.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPI.h index 98e43f5a7..f874e1e07 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPI.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPI.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIConfiguration.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIConfiguration.h index cd115bd32..d96872727 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIConfiguration.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIConfiguration.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDeckControl.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDeckControl.h index fa9c17ea0..a81fd1f3f 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDeckControl.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDeckControl.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDiscovery.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDiscovery.h index e03a29dfc..c323d4747 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDiscovery.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIDiscovery.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIModes.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIModes.h index 97fd4b0c5..46416891c 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIModes.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIModes.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIStreaming.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIStreaming.h index 15faf083c..9343bcf07 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIStreaming.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIStreaming.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPITypes.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPITypes.h index 552e0c1bb..285738e65 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPITypes.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPITypes.h @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVersion.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVersion.h index dcdeeb1ca..6187cc7b2 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVersion.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVersion.h @@ -30,8 +30,8 @@ #ifndef __DeckLink_API_Version_h__ #define __DeckLink_API_Version_h__ -#define BLACKMAGIC_DECKLINK_API_VERSION 0x0b060000 -#define BLACKMAGIC_DECKLINK_API_VERSION_STRING "11.6" +#define BLACKMAGIC_DECKLINK_API_VERSION 0x0c000000 +#define BLACKMAGIC_DECKLINK_API_VERSION_STRING "12.0" #endif // __DeckLink_API_Version_h__ diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVideoInput_v10_11.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVideoInput_v10_11.h index 375137857..b8268ddd4 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVideoInput_v10_11.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVideoInput_v10_11.h @@ -30,6 +30,7 @@ #include "DeckLinkAPI.h" #include "DeckLinkAPI_v10_11.h" +#include "DeckLinkAPIVideoInput_v11_5_1.h" // Type Declarations @@ -64,7 +65,7 @@ public: virtual HRESULT StopStreams (void) = 0; virtual HRESULT PauseStreams (void) = 0; virtual HRESULT FlushStreams (void) = 0; - virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0; + virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1 *theCallback) = 0; /* Hardware Timing */ diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVideoInput_v11_4.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVideoInput_v11_4.h index 785302a68..e7bba7832 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVideoInput_v11_4.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPIVideoInput_v11_4.h @@ -29,6 +29,7 @@ #define BMD_DECKLINKAPIVIDEOINPUT_v11_4_H #include "DeckLinkAPI.h" +#include "DeckLinkAPIVideoInput_v11_5_1.h" // Type Declarations @@ -63,7 +64,7 @@ public: virtual HRESULT StopStreams (void) = 0; virtual HRESULT PauseStreams (void) = 0; virtual HRESULT FlushStreams (void) = 0; - virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback* theCallback) = 0; + virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1* theCallback) = 0; /* Hardware Timing */ diff --git a/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v9_2.h b/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v9_2.h index e1c93022d..22630b956 100644 --- a/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v9_2.h +++ b/plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v9_2.h @@ -30,6 +30,7 @@ #include "DeckLinkAPI.h" #include "DeckLinkAPI_v10_11.h" +#include "DeckLinkAPIVideoInput_v11_5_1.h" // Interface ID Declarations @@ -67,7 +68,7 @@ public: virtual HRESULT StopStreams (void) = 0; virtual HRESULT PauseStreams (void) = 0; virtual HRESULT FlushStreams (void) = 0; - virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0; + virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1 *theCallback) = 0; /* Hardware Timing */ diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPI.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPI.idl index 726dd8ba9..0cdcb9401 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPI.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPI.idl @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by @@ -1305,17 +1305,18 @@ importlib("stdole2.tlb"); }; // import deprecated interfaces -#include "DeckLinkAPI_v11_4.idl" -#include "DeckLinkAPI_v10_11.idl" + #include "DeckLinkAPI_v11_5_1.idl" -#include "DeckLinkAPI_v11_5.idl" +#include "DeckLinkAPI_v10_11.idl" #include "DeckLinkAPI_v10_9.idl" #include "DeckLinkAPIStreaming_v10_8.idl" +#include "DeckLinkAPI_v10_4.idl" +#include "DeckLinkAPI_v10_2.idl" +#include "DeckLinkAPI_v11_5.idl" +#include "DeckLinkAPI_v11_4.idl" #include "DeckLinkAPI_v10_8.idl" #include "DeckLinkAPI_v10_6.idl" #include "DeckLinkAPI_v10_5.idl" -#include "DeckLinkAPI_v10_4.idl" -#include "DeckLinkAPI_v10_2.idl" #include "DeckLinkAPI_v9_9.idl" #include "DeckLinkAPI_v9_2.idl" #include "DeckLinkAPI_v8_1.idl" diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPIConfiguration.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPIConfiguration.idl index e829d9661..0cc3e37f0 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPIConfiguration.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPIConfiguration.idl @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPIDeckControl.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPIDeckControl.idl index 464de8ecc..3a63b2554 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPIDeckControl.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPIDeckControl.idl @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPIDiscovery.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPIDiscovery.idl index 419857a89..94e98fe00 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPIDiscovery.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPIDiscovery.idl @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPIModes.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPIModes.idl index cd7347402..8a475d2c1 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPIModes.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPIModes.idl @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPIStreaming.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPIStreaming.idl index 056e999ab..83ae8de1e 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPIStreaming.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPIStreaming.idl @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPITypes.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPITypes.idl index 527980d95..40f909f36 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPITypes.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPITypes.idl @@ -1,5 +1,5 @@ /* -LICENSE-START- -** Copyright (c) 2020 Blackmagic Design +** Copyright (c) 2021 Blackmagic Design ** ** Permission is hereby granted, free of charge, to any person or organization ** obtaining a copy of the software and accompanying documentation covered by diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPIVersion.h b/plugins/decklink/win/decklink-sdk/DeckLinkAPIVersion.h index dcdeeb1ca..6187cc7b2 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPIVersion.h +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPIVersion.h @@ -30,8 +30,8 @@ #ifndef __DeckLink_API_Version_h__ #define __DeckLink_API_Version_h__ -#define BLACKMAGIC_DECKLINK_API_VERSION 0x0b060000 -#define BLACKMAGIC_DECKLINK_API_VERSION_STRING "11.6" +#define BLACKMAGIC_DECKLINK_API_VERSION 0x0c000000 +#define BLACKMAGIC_DECKLINK_API_VERSION_STRING "12.0" #endif // __DeckLink_API_Version_h__ diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v10_11.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v10_11.idl index a3c0cb35c..dd7f730d1 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v10_11.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v10_11.idl @@ -213,7 +213,7 @@ interface IDeckLinkNotification_v10_11; HRESULT StopStreams(void); HRESULT PauseStreams(void); HRESULT FlushStreams(void); - HRESULT SetCallback([in] IDeckLinkInputCallback *theCallback); + HRESULT SetCallback([in] IDeckLinkInputCallback_v11_5_1 *theCallback); /* Hardware Timing */ diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v11_4.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v11_4.idl index 9db01b884..34fab9154 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v11_4.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v11_4.idl @@ -112,7 +112,7 @@ HRESULT StopStreams (void); HRESULT PauseStreams (void); HRESULT FlushStreams (void); - HRESULT SetCallback ([in] IDeckLinkInputCallback* theCallback); + HRESULT SetCallback ([in] IDeckLinkInputCallback_v11_5_1* theCallback); /* Hardware Timing */ diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v11_5_1.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v11_5_1.idl index 485a73dee..03aa23ad5 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v11_5_1.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v11_5_1.idl @@ -87,4 +87,5 @@ typedef [v1_enum] enum _BMDDeckLinkStatusID_v11_5_1 { /* Hardware Timing */ HRESULT GetHardwareReferenceClock ([in] BMDTimeScale desiredTimeScale, [out] BMDTimeValue* hardwareTime, [out] BMDTimeValue* timeInFrame, [out] BMDTimeValue* ticksPerFrame); -}; \ No newline at end of file +}; + diff --git a/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v9_2.idl b/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v9_2.idl index a607d8559..cc37f34ac 100644 --- a/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v9_2.idl +++ b/plugins/decklink/win/decklink-sdk/DeckLinkAPI_v9_2.idl @@ -59,7 +59,7 @@ HRESULT StopStreams(void); HRESULT PauseStreams(void); HRESULT FlushStreams(void); - HRESULT SetCallback([in] IDeckLinkInputCallback *theCallback); + HRESULT SetCallback([in] IDeckLinkInputCallback_v11_5_1 *theCallback); /* Hardware Timing */