[Bf-blender-cvs] [a8809e3] temp-decklink: Decklink: remove old versions headers
Benoit Bolsee
noreply at git.blender.org
Fri Jun 10 13:44:47 CEST 2016
Commit: a8809e3ab54f8d19dc0ee72021fcdf894442249e
Author: Benoit Bolsee
Date: Fri Jun 10 13:44:19 2016 +0200
Branches: temp-decklink
https://developer.blender.org/rBa8809e3ab54f8d19dc0ee72021fcdf894442249e
Decklink: remove old versions headers
===================================================================
D intern/decklink/linux/DeckLinkAPIConfiguration_v10_2.h
D intern/decklink/linux/DeckLinkAPIDispatch_v7_6.cpp
D intern/decklink/linux/DeckLinkAPIDispatch_v8_0.cpp
D intern/decklink/linux/DeckLinkAPI_v10_2.h
D intern/decklink/linux/DeckLinkAPI_v7_1.h
D intern/decklink/linux/DeckLinkAPI_v7_3.h
D intern/decklink/linux/DeckLinkAPI_v7_6.h
D intern/decklink/linux/DeckLinkAPI_v7_9.h
D intern/decklink/linux/DeckLinkAPI_v8_0.h
D intern/decklink/linux/DeckLinkAPI_v8_1.h
D intern/decklink/linux/DeckLinkAPI_v9_2.h
D intern/decklink/linux/DeckLinkAPI_v9_9.h
===================================================================
diff --git a/intern/decklink/linux/DeckLinkAPIConfiguration_v10_2.h b/intern/decklink/linux/DeckLinkAPIConfiguration_v10_2.h
deleted file mode 100644
index 583bf92..0000000
--- a/intern/decklink/linux/DeckLinkAPIConfiguration_v10_2.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -LICENSE-START-
-** Copyright (c) 2014 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
-** this license (the "Software") to use, reproduce, display, distribute,
-** execute, and transmit the Software, and to prepare derivative works of the
-** Software, and to permit third-parties to whom the Software is furnished to
-** do so, all subject to the following:
-**
-** The copyright notices in the Software and this entire statement, including
-** the above license grant, this restriction and the following disclaimer,
-** must be included in all copies of the Software, in whole or in part, and
-** all derivative works of the Software, unless such copies or derivative
-** works are solely in the form of machine-executable object code generated by
-** a source language processor.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-** DEALINGS IN THE SOFTWARE.
-** -LICENSE-END-
-*/
-
-#ifndef BMD_DECKLINKAPICONFIGURATION_v10_2_H
-#define BMD_DECKLINKAPICONFIGURATION_v10_2_H
-
-#include "DeckLinkAPIConfiguration.h"
-
-// Interface ID Declarations
-
-BMD_CONST REFIID IID_IDeckLinkConfiguration_v10_2 = /* C679A35B-610C-4D09-B748-1D0478100FC0 */ {0xC6,0x79,0xA3,0x5B,0x61,0x0C,0x4D,0x09,0xB7,0x48,0x1D,0x04,0x78,0x10,0x0F,0xC0};
-
-// Forward Declarations
-
-class IDeckLinkConfiguration_v10_2;
-
-/* Interface IDeckLinkConfiguration_v10_2 - DeckLink Configuration interface */
-
-class IDeckLinkConfiguration_v10_2 : public IUnknown
-{
-public:
- virtual HRESULT SetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ bool value) = 0;
- virtual HRESULT GetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ bool *value) = 0;
- virtual HRESULT SetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ int64_t value) = 0;
- virtual HRESULT GetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ int64_t *value) = 0;
- virtual HRESULT SetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ double value) = 0;
- virtual HRESULT GetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ double *value) = 0;
- virtual HRESULT SetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ const char *value) = 0;
- virtual HRESULT GetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ const char **value) = 0;
- virtual HRESULT WriteConfigurationToPreferences (void) = 0;
-
-protected:
- virtual ~IDeckLinkConfiguration_v10_2 () {} // call Release method to drop reference count
-};
-
-#endif /* defined(BMD_DECKLINKAPICONFIGURATION_v10_2_H) */
diff --git a/intern/decklink/linux/DeckLinkAPIDispatch_v7_6.cpp b/intern/decklink/linux/DeckLinkAPIDispatch_v7_6.cpp
deleted file mode 100644
index 9ec157f..0000000
--- a/intern/decklink/linux/DeckLinkAPIDispatch_v7_6.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -LICENSE-START-
-** Copyright (c) 2009 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
-** this license (the "Software") to use, reproduce, display, distribute,
-** execute, and transmit the Software, and to prepare derivative works of the
-** Software, and to permit third-parties to whom the Software is furnished to
-** do so, all subject to the following:
-**
-** The copyright notices in the Software and this entire statement, including
-** the above license grant, this restriction and the following disclaimer,
-** must be included in all copies of the Software, in whole or in part, and
-** all derivative works of the Software, unless such copies or derivative
-** works are solely in the form of machine-executable object code generated by
-** a source language processor.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-** DEALINGS IN THE SOFTWARE.
-** -LICENSE-END-
-**/
-
-#include <stdio.h>
-#include <pthread.h>
-#include <dlfcn.h>
-
-#include "DeckLinkAPI_v7_6.h"
-
-#define kDeckLinkAPI_Name "libDeckLinkAPI.so"
-#define KDeckLinkPreviewAPI_Name "libDeckLinkPreviewAPI.so"
-
-typedef IDeckLinkIterator* (*CreateIteratorFunc_v7_6)(void);
-typedef IDeckLinkGLScreenPreviewHelper_v7_6* (*CreateOpenGLScreenPreviewHelperFunc_v7_6)(void);
-typedef IDeckLinkVideoConversion_v7_6* (*CreateVideoConversionInstanceFunc_v7_6)(void);
-
-static pthread_once_t gDeckLinkOnceControl = PTHREAD_ONCE_INIT;
-static pthread_once_t gPreviewOnceControl = PTHREAD_ONCE_INIT;
-
-static CreateIteratorFunc_v7_6 gCreateIteratorFunc = NULL;
-static CreateOpenGLScreenPreviewHelperFunc_v7_6 gCreateOpenGLPreviewFunc = NULL;
-static CreateVideoConversionInstanceFunc_v7_6 gCreateVideoConversionFunc = NULL;
-
-void InitDeckLinkAPI_v7_6 (void)
-{
- void *libraryHandle;
-
- libraryHandle = dlopen(kDeckLinkAPI_Name, RTLD_NOW|RTLD_GLOBAL);
- if (!libraryHandle)
- {
- fprintf(stderr, "%s\n", dlerror());
- return;
- }
-
- gCreateIteratorFunc = (CreateIteratorFunc_v7_6)dlsym(libraryHandle, "CreateDeckLinkIteratorInstance");
- if (!gCreateIteratorFunc)
- fprintf(stderr, "%s\n", dlerror());
- gCreateVideoConversionFunc = (CreateVideoConversionInstanceFunc_v7_6)dlsym(libraryHandle, "CreateVideoConversionInstance");
- if (!gCreateVideoConversionFunc)
- fprintf(stderr, "%s\n", dlerror());
-}
-
-void InitDeckLinkPreviewAPI_v7_6 (void)
-{
- void *libraryHandle;
-
- libraryHandle = dlopen(KDeckLinkPreviewAPI_Name, RTLD_NOW|RTLD_GLOBAL);
- if (!libraryHandle)
- {
- fprintf(stderr, "%s\n", dlerror());
- return;
- }
- gCreateOpenGLPreviewFunc = (CreateOpenGLScreenPreviewHelperFunc_v7_6)dlsym(libraryHandle, "CreateOpenGLScreenPreviewHelper");
- if (!gCreateOpenGLPreviewFunc)
- fprintf(stderr, "%s\n", dlerror());
-}
-
-IDeckLinkIterator* CreateDeckLinkIteratorInstance_v7_6 (void)
-{
- pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI_v7_6);
-
- if (gCreateIteratorFunc == NULL)
- return NULL;
- return gCreateIteratorFunc();
-}
-
-IDeckLinkGLScreenPreviewHelper_v7_6* CreateOpenGLScreenPreviewHelper_v7_6 (void)
-{
- pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI_v7_6);
- pthread_once(&gPreviewOnceControl, InitDeckLinkPreviewAPI_v7_6);
-
- if (gCreateOpenGLPreviewFunc == NULL)
- return NULL;
- return gCreateOpenGLPreviewFunc();
-}
-
-IDeckLinkVideoConversion_v7_6* CreateVideoConversionInstance_v7_6 (void)
-{
- pthread_once(&gDeckLinkOnceControl, InitDeckLinkAPI_v7_6);
-
- if (gCreateVideoConversionFunc == NULL)
- return NULL;
- return gCreateVideoConversionFunc();
-}
-
diff --git a/intern/decklink/linux/DeckLinkAPIDispatch_v8_0.cpp b/intern/decklink/linux/DeckLinkAPIDispatch_v8_0.cpp
deleted file mode 100644
index 686fd67..0000000
--- a/intern/decklink/linux/DeckLinkAPIDispatch_v8_0.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -LICENSE-START-
-** Copyright (c) 2011 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
-** this license (the "Software") to use, reproduce, display, distribute,
-** execute, and transmit the Software, and to prepare derivative works of the
-** Software, and to permit third-parties to whom the Software is furnished to
-** do so, all subject to the following:
-**
-** The copyright notices in the Software and this entire statement, including
-** the above license grant, this restriction and the following disclaimer,
-** must be included in all copies of the Software, in whole or in part, and
-** all derivative works of the Software, unless such copies or derivative
-** works are solely in the form of machine-executable object code generated by
-** a source language processor.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-** DEALINGS IN THE SOFTWARE.
-** -LICENSE-END-
-**/
-
-#include <stdio.h>
-#include <pthread.h>
-#include <dlfcn.h>
-
-#include "DeckLinkAPI_v8_0.h"
-
-#define kDeckLinkAPI_Name "libDeckLinkAPI.so"
-#define KDeckLinkPreviewAPI_Name "libDeckLinkPreviewAPI.so"
-
-typedef IDeckLinkIterator_v8_0* (*CreateIteratorFunc)(void);
-typedef IDeckLinkAPIInformation* (*CreateAPIInformationFunc)(void);
-typedef IDeckLinkGLScreenPreviewHelper* (*CreateOpenGLScreenPreviewHelperFunc)(void);
-typedef IDeckLinkVideoConversion* (*CreateVideoConversionInstanceFunc)(void);
-
-static pthread_once_t gDeckLinkOnceControl = PTHREAD_ONCE_INIT;
-static pthread_once_t gPreviewOnceControl = PTHREAD_ONCE_INIT;
-
-static bool gLoadedDeckLinkAPI = false;
-
-static CreateIteratorFunc gCreateIteratorFunc = NULL;
-static CreateAPIInformationFunc gCreateAPIInformationFunc = NULL;
-static
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list