From 1cb9d0aea19ec550cc1e858e3358f39a6546429d Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Wed, 7 Feb 2024 10:53:05 +0100
Subject: [PATCH] jack sources: fixed includes+year, enum

- removed config*.h (not needed)
- moved system headers prior user-defined
- fixed copyright year to 2024
- replaced numeric macros with enum (cppcoreguidelines-macro-to-enum)
---
 src/audio/capture/jack.c  | 23 ++++++++++-------------
 src/audio/jack.c          | 10 ++--------
 src/audio/playback/jack.c | 27 ++++++++++++---------------
 src/jack_common.h         |  4 ++++
 4 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/audio/capture/jack.c b/src/audio/capture/jack.c
index 2adcbdffd7..7d27f067a5 100644
--- a/src/audio/capture/jack.c
+++ b/src/audio/capture/jack.c
@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2012-2023 CESNET z.s.p.o.
+ * Copyright (c) 2012-2024 CESNET z.s.p.o.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,11 +35,10 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif
+#include <jack/jack.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "audio/audio_capture.h"
 #include "audio/types.h"
@@ -49,17 +48,15 @@
 #include "host.h"
 #include "jack_common.h"
 #include "lib_common.h"
-#include "utils/ring_buffer.h"
 #include "utils/macros.h"
+#include "utils/ring_buffer.h"
 
-#include <jack/jack.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define MAX_PORTS 64
 #define MOD_NAME "[JACK capture] "
 
+enum {
+        MAX_PORTS = 64,
+};
+
 static int jack_samplerate_changed_callback(jack_nframes_t nframes, void *arg);
 static int jack_process_callback(jack_nframes_t nframes, void *arg);
 
diff --git a/src/audio/jack.c b/src/audio/jack.c
index 767720bd0f..b55043f60c 100644
--- a/src/audio/jack.c
+++ b/src/audio/jack.c
@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2011-2021 CESNET, z. s. p. o.
+ * Copyright (c) 2011-2024 CESNET, z. s. p. o.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,12 +40,6 @@
  * It looks like there is no jack_stop()?
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif
-
 #include <jack/jack.h>
 #include <limits.h>
 #include <stdio.h>
@@ -56,8 +50,8 @@
 #include "audio/types.h"
 #include "jack_common.h"
 #include "pthread.h"
-#include "rtp/rtp.h"
 #include "rtp/pbuf.h"
+#include "rtp/rtp.h"
 
 #define CLIENT_NAME "UltraGrid Transport"
 #define BUFF_ELEM (1<<16)
diff --git a/src/audio/playback/jack.c b/src/audio/playback/jack.c
index 2850b2f65c..ddbfc81ba8 100644
--- a/src/audio/playback/jack.c
+++ b/src/audio/playback/jack.c
@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2012-2023 CESNET z.s.p.o.
+ * Copyright (c) 2012-2024 CESNET z.s.p.o.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,33 +35,30 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif
+#include <jack/jack.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "audio/audio_playback.h"
 #include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"
+#include "jack_common.h"
 #include "lib_common.h"
 #include "utils/audio_buffer.h"
 #include "utils/macros.h"
 #include "utils/ring_buffer.h"
-#include "jack_common.h"
 
-#include <jack/jack.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#define DEFAULT_AUDIO_BUF_LEN_MS 50
-#define MAX_LEN_MS 1000
-#define MAX_PORTS 64
 #define MOD_NAME "[JACK playback] "
 
+enum {
+        DEFAULT_AUDIO_BUF_LEN_MS = 50,
+        MAX_LEN_MS               = 1000,
+        MAX_PORTS                = 64,
+};
+
 struct state_jack_playback {
         struct libjack_connection *libjack;
 
diff --git a/src/jack_common.h b/src/jack_common.h
index ce0a79a099..e0c0060869 100644
--- a/src/jack_common.h
+++ b/src/jack_common.h
@@ -40,8 +40,12 @@
 #define JACK_COMMON_H
 
 #ifdef __cplusplus
+#include <cassert>
+#include <cerrno>
 #include <cstring>
 #else
+#include <assert.h>
+#include <errno.h>
 #include <stdbool.h>
 #include <string.h>
 #endif // ! defined __cplusplus