diff --git a/gui/QT/window/ultragrid_window.cpp b/gui/QT/window/ultragrid_window.cpp index 79c195d26..d4b10039d 100644 --- a/gui/QT/window/ultragrid_window.cpp +++ b/gui/QT/window/ultragrid_window.cpp @@ -183,7 +183,8 @@ void UltragridWindow::about(){ aboutBox.setText( "UltraGrid from CESNET is a software " "implementation of high-quality low-latency video and audio transmissions using commodity PC and Mac hardware.

" "More information can be found at http://www.ultragrid.cz

" - "Please read documents distributed with the product to find out current and former developers." + "Please read documents distributed with the product to find out current and former developers.

" + "UltraGrid uses NDI®, NDI® is a registered trademark of NewTek, Inc." ); aboutBox.setStandardButtons(QMessageBox::Ok); aboutBox.exec(); @@ -490,3 +491,4 @@ QString UltragridWindow::findUltragridExecutable() { #endif } } +// vim: set noet: diff --git a/src/ndi_common.h b/src/ndi_common.h index 3dc66c17c..7b2e7d822 100644 --- a/src/ndi_common.h +++ b/src/ndi_common.h @@ -156,5 +156,9 @@ static void close_ndi_library(LIB_HANDLE hNDILib) { dlclose(hNDILib); } +#define NDI_PRINT_COPYRIGHT \ + color_out(COLOR_OUT_BOLD | COLOR_OUT_BLUE, "This application uses NDI® available from http://ndi.tv/\n" \ + "NDI®is a registered trademark of NewTek, Inc.\n\n"); + #endif // defined NDI_COMMON_H_1A76D048_695C_4247_A24A_583C29010FC4 diff --git a/src/video_capture/ndi.cpp b/src/video_capture/ndi.cpp index dd0112993..dda52ae8b 100644 --- a/src/video_capture/ndi.cpp +++ b/src/video_capture/ndi.cpp @@ -176,9 +176,9 @@ static void show_help(struct vidcap_state_ndi *s) { static int vidcap_ndi_init(struct vidcap_params *params, void **state) { + NDI_PRINT_COPYRIGHT using namespace std::string_literals; using std::stoi; - // Not required, but "correct" (see the SDK documentation) auto s = new vidcap_state_ndi(); s->NDIlib = NDIlib_load(&s->lib); if (s->NDIlib == NULL) { @@ -186,6 +186,7 @@ static int vidcap_ndi_init(struct vidcap_params *params, void **state) delete s; return VIDCAP_INIT_FAIL; } + // Not required, but "correct" (see the SDK documentation) if (!s->NDIlib->initialize()) { LOG(LOG_LEVEL_ERROR) << MOD_NAME << "Cannot initialize NDI!\n"; delete s; diff --git a/src/video_display/ndi.c b/src/video_display/ndi.c index fd098f60a..dca4f3ab1 100644 --- a/src/video_display/ndi.c +++ b/src/video_display/ndi.c @@ -127,6 +127,7 @@ static void *display_ndi_init(struct module *parent, const char *fmt, unsigned i { UNUSED(flags); UNUSED(parent); + NDI_PRINT_COPYRIGHT char *fmt_copy = NULL; struct display_ndi *s = calloc(1, sizeof(struct display_ndi));