diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index a3c496402..b450a9229 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -9,7 +9,7 @@ * Martin Pulec * Ian Wesley-Smith * - * Copyright (c) 2005-2025 CESNET + * Copyright (c) 2005-2026 CESNET, zájmové sdružení právnických osob * * Redistribution and use in source and binary forms, with or without * modification, is permitted provided that the following conditions @@ -90,6 +90,7 @@ #include "ug_runtime_error.hpp" #include "utils/color_out.h" #include "utils/net.h" +#include "utils/macros.h" // for STR_LEN, snprintf_ch #include "utils/misc.h" // for get_stat_color #include "utils/sdp.h" #include "utils/string_view_utils.hpp" diff --git a/src/audio/playback/alsa.c b/src/audio/playback/alsa.c index ec5f732b6..c0f42abd0 100644 --- a/src/audio/playback/alsa.c +++ b/src/audio/playback/alsa.c @@ -3,7 +3,7 @@ * @author Martin Pulec */ /* - * Copyright (c) 2011-2025 CESNET, zájmové sdružení právnických osob + * Copyright (c) 2011-2026 CESNET, zájmové sdružení právnických osob * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -68,6 +68,7 @@ #include "tv.h" #include "types.h" // for device_info #include "utils/color_out.h" +#include "utils/macros.h" // for STR_LEN, snprintf_ch #define BUF_LEN_DEFAULT_MS 60 #define BUF_LEN_DEFAULT_SYNC_MS 200 // default buffer len for sync API diff --git a/src/audio/portaudio_common.c b/src/audio/portaudio_common.c index e67346371..7263cf7eb 100644 --- a/src/audio/portaudio_common.c +++ b/src/audio/portaudio_common.c @@ -3,7 +3,7 @@ * @author Martin Pulec */ /* - * Copyright (c) 2018-2025 CESNET + * Copyright (c) 2018-2026 CESNET, zájmové sdružení právnických osob * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,6 +48,7 @@ #include "portaudio_common.h" #include "types.h" #include "utils/color_out.h" +#include "utils/macros.h" // for snprintf_ch #define MOD_NAME "[PortAudio] " diff --git a/src/blackmagic_common.cpp b/src/blackmagic_common.cpp index 44d061c2b..052d5e4bc 100644 --- a/src/blackmagic_common.cpp +++ b/src/blackmagic_common.cpp @@ -66,6 +66,7 @@ #include "tv.h" #include "utils/color_out.h" #include "utils/debug.h" // for DEBUG_TIMER_* +#include "utils/macros.h" // for STR_LEN, snprintf_ch, IS_FCC #include "utils/string.h" // for DELDEL #include "utils/windows.h" #include "utils/worker.h" diff --git a/src/debug.cpp b/src/debug.cpp index cbe12afae..85e7e3f08 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -8,7 +8,7 @@ * Jerry Isdale * * Copyright (c) 1995-2000 University College London - * Copyright (c) 2005-2023 CESNET, z. s. p. o. + * Copyright (c) 2005-2026 CESNET, zájmové sdružení právnických osob * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -58,6 +58,7 @@ #include "host.h" #include "utils/color_out.h" #include "utils/string_view_utils.hpp" +#include "utils/macros.h" // for STR_LEN, snprintf_ch #include "utils/misc.h" // ug_strerror using std::atomic; diff --git a/src/deltacast_common.cpp b/src/deltacast_common.cpp index f9f052bc4..2e7ff04ca 100644 --- a/src/deltacast_common.cpp +++ b/src/deltacast_common.cpp @@ -49,6 +49,7 @@ #include "debug.h" #include "types.h" #include "utils/color_out.h" +#include "utils/macros.h" // for snprintf_ch #include "video_frame.h" // for get_interlacing_suffix #if !defined VHD_MIN_6_19 diff --git a/src/export.c b/src/export.c index a8d7af8c9..62f6d0153 100644 --- a/src/export.c +++ b/src/export.c @@ -3,7 +3,7 @@ * @author Martin Pulec */ /* - * Copyright (c) 2017-2024 CESNET + * Copyright (c) 2017-2026 CESNET, zájmové sdružení právnickych osob * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,6 +56,7 @@ #include "module.h" #include "utils/color_out.h" #include "utils/fs.h" // MAX_PATH_SIZE +#include "utils/macros.h" // for STR_LEN #include "utils/misc.h" #include "video_export.h" diff --git a/src/host.cpp b/src/host.cpp index 3f7a22686..f55b49597 100644 --- a/src/host.cpp +++ b/src/host.cpp @@ -100,6 +100,7 @@ #include "types.h" // for device_info, device_option #include "utils/color_out.h" #include "utils/fs.h" // for MAX_PATH_SIZE +#include "utils/macros.h" // for STR_LEN #include "utils/misc.h" // ug_strerror #include "utils/random.h" #include "utils/string.h" diff --git a/src/utils/color_out.h b/src/utils/color_out.h index 5e15d1961..62e12e782 100644 --- a/src/utils/color_out.h +++ b/src/utils/color_out.h @@ -3,7 +3,7 @@ * @author Martin Pulec */ /* - * Copyright (c) 2018-2024 CESNET + * Copyright (c) 2018-2026 CESNET, zájmové sdružení právnických osob * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include #endif -#include "utils/macros.h" // for STRINGIFY +#define COLOR_OUT_STRINGIFY(A) #A #define TERM_RESET "\033[0m" #define TERM_BOLD "\033[1m" @@ -63,7 +63,7 @@ #define T_SADDLE_BROWN 130 // (3,1,0) #define T_ARCTIC_LIME 190 // (4,5,0) #define T_TOMATO 209 // (5,2,1) -#define T256_FG_SYM(col) "\033[38;5;" STRINGIFY(col) "m" +#define T256_FG_SYM(col) "\033[38;5;" COLOR_OUT_STRINGIFY(col) "m" #define T256_FG(col, x) T256_FG_SYM(col) x TERM_FG_RESET #define S256_FG(col, x) T256_FG(col, << x <<) diff --git a/src/utils/net.h b/src/utils/net.h index 5c2c2c609..d4e56b579 100644 --- a/src/utils/net.h +++ b/src/utils/net.h @@ -3,7 +3,7 @@ * @author Martin Pulec */ /* - * Copyright (c) 2016-2024 CESNET + * Copyright (c) 2016-2026 CESNET, zájmové sdružení právnickych osob * All rights reserved. * * Redistribution and use in source and binary forms, with or without