From cec50e76561eeaa13b01bc270f045fbe5d265e01 Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Tue, 14 May 2024 08:58:40 +0200
Subject: [PATCH] portaudio: fixed including

- removed config*.h included
- optimized with include-what-you-use
---
 src/audio/capture/portaudio.c  | 19 +++++++------------
 src/audio/playback/portaudio.c | 25 +++++++++++--------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/audio/capture/portaudio.c b/src/audio/capture/portaudio.c
index 636af40cc..e77fb7c10 100644
--- a/src/audio/capture/portaudio.c
+++ b/src/audio/capture/portaudio.c
@@ -9,7 +9,7 @@
  *          Ian Wesley-Smith <iwsmith@cct.lsu.edu>
  *          Martin Pulec     <pulec@cesnet.cz>
  *
- * Copyright (c) 2005-2023 CESNET, z. s. p. o.
+ * Copyright (c) 2005-2024 CESNET
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, is permitted provided that the following conditions
@@ -46,24 +46,19 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif
-
+#include <ctype.h>                   // for isdigit
+#include <portaudio.h> /* from PortAudio API */
+#include <pthread.h>
 #include <stdio.h>
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
-
-#include <portaudio.h> /* from PortAudio API */
+struct device_info;
+struct module;
 
 #include "audio/audio_capture.h"
 #include "audio/portaudio_common.h"
 #include "audio/types.h"
-#include "compat/misc.h"
+#include "compat/misc.h" // strdupa
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
diff --git a/src/audio/playback/portaudio.c b/src/audio/playback/portaudio.c
index 0fa1108b2..dde255700 100644
--- a/src/audio/playback/portaudio.c
+++ b/src/audio/playback/portaudio.c
@@ -9,7 +9,7 @@
  *          Martin Pulec     <martin.pulec@cesnet.cz>
  *          Ian Wesley-Smith <iwsmith@cct.lsu.edu>
  *
- * Copyright (c) 2005-2023 CESNET z.s.p.o.
+ * Copyright (c) 2005-2024 CESNET
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, is permitted provided that the following conditions
@@ -46,31 +46,27 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif
-
-#include <stdio.h>
 #include <assert.h>
+#include <ctype.h>                   // for isdigit
+#include <portaudio.h> /* from PortAudio */
 #include <stdbool.h>
+#include <stdio.h>
+#include <stdint.h>                  // for int8_t
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
-
-#include <portaudio.h> /* from PortAudio */
+struct device_info;
 
 #include "audio/audio_playback.h"
 #include "audio/portaudio_common.h"
 #include "audio/types.h"
 #include "compat/misc.h" // strdupa
 #include "debug.h"
+#include "host.h"                    // for get_commandline_param, INIT_NOERR
 #include "lib_common.h"
+#include "tv.h"
 #include "utils/audio_buffer.h"
 #include "utils/color_out.h"
 #include "utils/macros.h"
-#include "tv.h"
 
 #define MOD_NAME "[Portaudio playback] "
 #define BUFFER_LEN_SEC 1
@@ -419,8 +415,9 @@ static int callback( const void *inputBuffer, void *outputBuffer,
         UNUSED(timeInfo);
         UNUSED(statusFlags);
 
-        ssize_t req_bytes = framesPerBuffer * s->desc.ch_count * s->desc.bps;
-        ssize_t bytes_read = audio_buffer_read(s->data, (char *) outputBuffer, req_bytes);
+        int req_bytes = framesPerBuffer * s->desc.ch_count * s->desc.bps;
+        int bytes_read =
+            audio_buffer_read(s->data, (char *) outputBuffer, req_bytes);
 
         if (bytes_read < req_bytes) {
                 if (!s->quiet)