diff --git a/.github/scripts/Linux/install_others.sh b/.github/scripts/Linux/install_others.sh index 0524dafd9..dd5dc6fa0 100755 --- a/.github/scripts/Linux/install_others.sh +++ b/.github/scripts/Linux/install_others.sh @@ -37,7 +37,6 @@ install_ndi() {( installer=./Install*NDI*sh yes | PAGER="cat" $installer sudo cp -r NDI\ SDK\ for\ Linux/include/* /usr/local/include/ - sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' < 'NDI SDK for Linux/Version.txt' | sudo tee /usr/local/include/ndi_version.h )} # TODO: needed only for U20.04, remove after upgrading to U22.04 diff --git a/.github/scripts/macOS/install_others.sh b/.github/scripts/macOS/install_others.sh index 1735c5ce9..1b07c8e97 100755 --- a/.github/scripts/macOS/install_others.sh +++ b/.github/scripts/macOS/install_others.sh @@ -59,8 +59,6 @@ install_ndi() {( installer=/private/var/tmp/Install_NDI_SDK_Apple.pkg sudo installer -pkg $installer -target / sudo mv /Library/NDI\ SDK\ for\ * /Library/NDI - sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' < /Library/NDI/Version.txt | - sudo tee /usr/local/include/ndi_version.h ) NDI_LIB=/Library/NDI/lib/macOS export CPATH=${CPATH:+"$CPATH:"}/Library/NDI/include diff --git a/src/video_capture/ndi.cpp b/src/video_capture/ndi.cpp index c8d9eaa6c..cda6c1561 100644 --- a/src/video_capture/ndi.cpp +++ b/src/video_capture/ndi.cpp @@ -67,10 +67,6 @@ #include "video.h" #include "video_capture.h" -#if __has_include() -#include -#endif - static constexpr double DEFAULT_AUDIO_DIVISOR = 1; static constexpr const char *MOD_NAME = "[NDI cap.] "; @@ -172,11 +168,7 @@ static void show_help(struct vidcap_state_ndi *s) { } cout << "\n"; s->NDIlib->find_destroy(pNDI_find); -#ifdef NDI_VERSION - cout << NDI_VERSION "\n"; -#elif defined USE_NDI_VERSION - cout << "NDI version " << USE_NDI_VERSION << "\n"; -#endif + printf("NDI version %s\n", s->NDIlib->version()); } static int vidcap_ndi_init(struct vidcap_params *params, void **state)