Added NDI branding

This commit is contained in:
Martin Pulec
2022-01-12 11:46:13 +01:00
parent 5772512dd7
commit bbcf9e3e87
4 changed files with 10 additions and 2 deletions

View File

@@ -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.<br><br>"
"More information can be found at <a href='http://www.ultragrid.cz'>http://www.ultragrid.cz</a><br><br>"
"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.<br><br>"
"UltraGrid uses <a href=\"http:://ndi.tv\">NDI&#174;</a>, NDI&#174; is a registered trademark of NewTek, Inc."
);
aboutBox.setStandardButtons(QMessageBox::Ok);
aboutBox.exec();
@@ -490,3 +491,4 @@ QString UltragridWindow::findUltragridExecutable() {
#endif
}
}
// vim: set noet:

View File

@@ -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

View File

@@ -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;

View File

@@ -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));