scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 04:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

NDI cap.: print NDI version in GitHub build

Browse Source
This commit is contained in:
Martin Pulec
2021-04-19 09:34:16 +02:00
parent c66fa9f7ea
commit 009d85d512
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/scripts/Linux/prepare.sh vendored
View File

@@ -63,6 +63,7 @@ if [ -n "$SDK_URL" -a "$GITHUB_REF" = refs/heads/ndi-build ]; then
tar -C /var/tmp -xzf NDISDK_Linux.tar.gz
yes | PAGER=cat /var/tmp/InstallNDI*sh
sudo cp -r NDI\ SDK\ for\ Linux/include/* /usr/local/include
cat NDI\ SDK\ for\ Linux/Version.txt | sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' | sudo tee /usr/local/include/ndi_version.h
sudo cp -r NDI\ SDK\ for\ Linux/lib/x86_64-linux-gnu/* /usr/local/lib
sudo ldconfig
fi

1
.github/scripts/Windows/prepare_msys.sh vendored
View File

@@ -18,6 +18,7 @@ if test -d /c/Program\ Files/NewTek; then
NDI_D=$(ls -d /c/Program\ Files/NewTek/*SDK)
export CPATH=$CPATH:$NDI_D/Include
export LIBRARY_PATH=$LIBRARY_PATH:$NDI_D/Lib/x64
cat $NDI_D/Version.txt | sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' | tee /usr/local/include/ndi_version.h
fi
JACK_D=/c/Program\ Files\ \(x86\)/Jack

1
.github/scripts/macOS/prepare.sh vendored
View File

@@ -66,6 +66,7 @@ fi
if [ -f /var/tmp/sdks/NDISDK_Apple.pkg ]; then
sudo installer -pkg /var/tmp/sdks/NDISDK_Apple.pkg -target /
sudo mv "/Library/NDI SDK for Apple/" /Library/NDI
cat /Library/NDI/Version.txt | sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' | sudo tee /usr/local/include/ndi_version.h
cd /Library/NDI/lib/x64
sudo ln -s libndi.?.dylib libndi.dylib
export CPATH=${CPATH:+"$CPATH:"}/Library/NDI/include

7
src/video_capture/ndi.cpp
View File

@@ -72,6 +72,10 @@
#include "video.h"
#include "video_capture.h"
#if __has_include(<ndi_version.h>)
#include <ndi_version.h>
#endif
static constexpr double DEFAULT_AUDIO_DIVISOR = 1;
static constexpr const char *MOD_NAME = "[NDI cap.] ";
@@ -164,6 +168,9 @@ static void show_help(const NDIlib_find_create_t *find_create_settings) {
}
cout << "\n";
NDIlib_find_destroy(pNDI_find);
#ifdef NDI_VERSION
cout << NDI_VERSION "\n";
#endif
}
static int vidcap_ndi_init(struct vidcap_params *params, void **state)