Remove unused includes

Most were left over from moving code out of main.cpp and from replacing
fprintf with gsr_log. Also fixes building without the app_audio option.

26 files changed, 9 insertions, 45 deletions

diff --git a/src/capture/kms.c b/src/capture/kms.c
index 4048a7f..2285fb6 100644
--- a/src/capture/kms.c
+++ b/src/capture/kms.c
@@ -2,13 +2,11 @@
 #include "../../include/log.h"
 #include "../../include/utils.h"
 #include "../../include/color_conversion.h"
-#include "../../include/cursor.h"
 #include "../../include/kde_night_light.h"
 #include "../../include/window/window.h"
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/src/capture/nvfbc.c b/src/capture/nvfbc.c
index 41e2466..8f386d4 100644
--- a/src/capture/nvfbc.c
+++ b/src/capture/nvfbc.c
@@ -9,7 +9,6 @@
 #include <dlfcn.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <math.h>
 #include <assert.h>
 
diff --git a/src/capture/xcomposite.c b/src/capture/xcomposite.c
index af48698..ace04b9 100644
--- a/src/capture/xcomposite.c
+++ b/src/capture/xcomposite.c
@@ -2,14 +2,10 @@
 #include "../../include/log.h"
 #include "../../include/window_texture.h"
 #include "../../include/utils.h"
-#include "../../include/cursor.h"
 #include "../../include/color_conversion.h"
 #include "../../include/window/window.h"
 
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
 
 #include <X11/Xlib.h>
 
diff --git a/src/capture/ximage.c b/src/capture/ximage.c
index becca82..d80cd0b 100644
--- a/src/capture/ximage.c
+++ b/src/capture/ximage.c
@@ -1,14 +1,11 @@
 #include "../../include/capture/ximage.h"
 #include "../../include/log.h"
 #include "../../include/utils.h"
-#include "../../include/cursor.h"
 #include "../../include/color_conversion.h"
 #include "../../include/window/window.h"
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <assert.h>
 
 #include <X11/Xlib.h>
 
diff --git a/src/cli/commands.c b/src/cli/commands.c
index 4eaaf65..38342ec 100644
--- a/src/cli/commands.c
+++ b/src/cli/commands.c
@@ -15,7 +15,6 @@
 #endif
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/wait.h>
diff --git a/src/cli/main.c b/src/cli/main.c
index b74eb1c..563ab19 100644
--- a/src/cli/main.c
+++ b/src/cli/main.c
@@ -305,24 +305,26 @@ static void recording_stopped_callback(const char *filepath, void *userdata) {
 }
 
 #ifdef GSR_APP_AUDIO
+static gsr_pipewire_audio pipewire_audio;
+
 static bool app_audio_name_callback(const char *app_name, void *userdata) {
     gsr_app_audio_names *app_audio_names = userdata;
     gsr_app_audio_names_add(app_audio_names, app_name);
     return true;
 }
 
-static int setup_app_audio(gsr_pipewire_audio *pipewire_audio, gsr_app_audio_names *app_audio_names) {
+static int setup_app_audio(gsr_app_audio_names *app_audio_names) {
     if(!pulseaudio_server_is_pipewire()) {
         gsr_log(GSR_LOG_LEVEL_ERROR, "your sound server is not PipeWire. Application audio is only available when running PipeWire audio server");
         return GSR_ERROR_UNSUPPORTED;
     }
 
-    if(!gsr_pipewire_audio_init(pipewire_audio)) {
+    if(!gsr_pipewire_audio_init(&pipewire_audio)) {
         gsr_log(GSR_LOG_LEVEL_ERROR, "failed to setup PipeWire audio for application audio capture");
         return GSR_ERROR_UNSUPPORTED;
     }
 
-    gsr_pipewire_audio_for_each_app(pipewire_audio, app_audio_name_callback, app_audio_names);
+    gsr_pipewire_audio_for_each_app(&pipewire_audio, app_audio_name_callback, app_audio_names);
     return GSR_ERROR_OK;
 }
 #endif
@@ -364,7 +366,7 @@ static int take_screenshot(args_parser *arg_parser, gsr_windowing *windowing, gs
     return gsr_screenshot_take(&screenshot_params);
 }
 
-static int record(args_parser *arg_parser, gsr_windowing *windowing, gsr_capture_deps *capture_deps, gsr_capture_sources *capture_sources, gsr_audio_input_tracks *audio_input_tracks, gsr_pipewire_audio *pipewire_audio) {
+static int record(args_parser *arg_parser, gsr_windowing *windowing, gsr_capture_deps *capture_deps, gsr_capture_sources *capture_sources, gsr_audio_input_tracks *audio_input_tracks) {
     const Arg *plugin_arg = args_parser_get_arg(arg_parser, "-p");
     assert(plugin_arg);
 
@@ -378,9 +380,7 @@ static int record(args_parser *arg_parser, gsr_windowing *windowing, gsr_capture
     recorder_params.plugin_filepaths = plugin_arg->values;
     recorder_params.num_plugin_filepaths = plugin_arg->num_values;
 #ifdef GSR_APP_AUDIO
-    recorder_params.pipewire_audio = pipewire_audio;
-#else
-    (void)pipewire_audio;
+    recorder_params.pipewire_audio = &pipewire_audio;
 #endif
 
     gsr_recorder_callbacks callbacks;
@@ -473,11 +473,9 @@ int main(int argc, char **argv) {
     gsr_app_audio_names app_audio_names;
     memset(&app_audio_names, 0, sizeof(app_audio_names));
 
-    gsr_pipewire_audio pipewire_audio;
-    memset(&pipewire_audio, 0, sizeof(pipewire_audio));
 #ifdef GSR_APP_AUDIO
     if(uses_app_audio) {
-        const int app_audio_result = setup_app_audio(&pipewire_audio, &app_audio_names);
+        const int app_audio_result = setup_app_audio(&app_audio_names);
         if(app_audio_result != GSR_ERROR_OK)
             _exit(gsr_error_to_exit_code(app_audio_result));
     }
@@ -543,7 +541,7 @@ int main(int argc, char **argv) {
 
         result = take_screenshot(&arg_parser, &windowing, &capture_deps, &capture_sources, image_format);
     } else {
-        result = record(&arg_parser, &windowing, &capture_deps, &capture_sources, &audio_input_tracks, &pipewire_audio);
+        result = record(&arg_parser, &windowing, &capture_deps, &capture_sources, &audio_input_tracks);
     }
 
     gsr_capture_deps_deinit(&capture_deps);
diff --git a/src/codec_query/nvenc.c b/src/codec_query/nvenc.c
index 3f8b442..4416b91 100644
--- a/src/codec_query/nvenc.c
+++ b/src/codec_query/nvenc.c
@@ -4,7 +4,6 @@
 #include "../../external/nvEncodeAPI.h"
 
 #include <dlfcn.h>
-#include <stdio.h>
 #include <string.h>
 
 #define NVENCAPI_MAJOR_VERSION_470 11
diff --git a/src/codec_query/vaapi.c b/src/codec_query/vaapi.c
index 4cc1bab..ca4b3f4 100644
--- a/src/codec_query/vaapi.c
+++ b/src/codec_query/vaapi.c
@@ -3,7 +3,6 @@
 #include "../../include/utils.h"
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/cuda.c b/src/cuda.c
index 55d1f40..54dac63 100644
--- a/src/cuda.c
+++ b/src/cuda.c
@@ -2,9 +2,7 @@
 #include "../include/log.h"
 #include "../include/library_loader.h"
 #include <string.h>
-#include <stdio.h>
 #include <dlfcn.h>
-#include <assert.h>
 
 bool gsr_cuda_load(gsr_cuda *self) {
     memset(self, 0, sizeof(gsr_cuda));
diff --git a/src/cursor.c b/src/cursor.c
index 65d9d4c..e8595aa 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -1,7 +1,6 @@
 #include "../include/cursor.h"
 #include "../include/log.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
diff --git a/src/damage.c b/src/damage.c
index 351f09a..cc122cc 100644
--- a/src/damage.c
+++ b/src/damage.c
@@ -3,7 +3,6 @@
 #include "../include/utils.h"
 #include "../include/window/window.h"
 
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <X11/extensions/Xdamage.h>
diff --git a/src/egl.c b/src/egl.c
index 7e29bbc..933a997 100644
--- a/src/egl.c
+++ b/src/egl.c
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <assert.h>
-#include <unistd.h>
 
 // TODO: rename gsr_egl to something else since this includes both egl and glx and in the future maybe vulkan too
 
diff --git a/src/image_writer.c b/src/image_writer.c
index 5f3fe9e..117c8b8 100644
--- a/src/image_writer.c
+++ b/src/image_writer.c
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <assert.h>
 #include <dlfcn.h>
 
 #define TJPF_RGBA 7
diff --git a/src/kde_night_light.c b/src/kde_night_light.c
index 587e0c8..d3491ef 100644
--- a/src/kde_night_light.c
+++ b/src/kde_night_light.c
@@ -3,7 +3,6 @@
 
 #ifdef GSR_DBUS
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -343,7 +342,6 @@ bool gsr_kde_night_light_get_inverse_matrix(gsr_kde_night_light *self, gsr_night
 
 #else /* GSR_DBUS */
 
-#include <stdio.h>
 #include <stddef.h>
 
 gsr_kde_night_light* gsr_kde_night_light_create(void) {
diff --git a/src/library_loader.c b/src/library_loader.c
index 37a1767..8b2e8a1 100644
--- a/src/library_loader.c
+++ b/src/library_loader.c
@@ -3,7 +3,6 @@
 
 #include <dlfcn.h>
 #include <stdbool.h>
-#include <stdio.h>
 
 void* dlsym_print_fail(void *handle, const char *name, bool required) {
     dlerror();
diff --git a/src/plugins.c b/src/plugins.c
index 7686683..5b9fd8c 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -1,7 +1,6 @@
 #include "../include/plugins.h"
 #include "../include/log.h"
 #include "../include/utils.h"
-#include <stdio.h>
 #include <string.h>
 #include <dlfcn.h>
 #include <assert.h>
diff --git a/src/recorder/audio_codec.c b/src/recorder/audio_codec.c
index 1b2d6db..e8f89e7 100644
--- a/src/recorder/audio_codec.c
+++ b/src/recorder/audio_codec.c
@@ -4,7 +4,6 @@
 
 #include <assert.h>
 #include <math.h>
-#include <stdio.h>
 
 #include <libavutil/opt.h>
 
diff --git a/src/recorder/codec_select.c b/src/recorder/codec_select.c
index d3286ec..48af0b2 100644
--- a/src/recorder/codec_select.c
+++ b/src/recorder/codec_select.c
@@ -12,7 +12,6 @@
 #include <libavformat/avformat.h>
 
 #include <string.h>
-#include <assert.h>
 
 gsr_video_encoder* create_video_encoder(gsr_egl *egl, const gsr_recorder_settings *settings) {
     const gsr_color_depth color_depth = video_codec_to_bit_depth(settings->video_codec);
diff --git a/src/recorder/recording_clock.c b/src/recorder/recording_clock.c
index cb23d56..5c9aabb 100644
--- a/src/recorder/recording_clock.c
+++ b/src/recorder/recording_clock.c
@@ -3,7 +3,6 @@
 #include "../../include/log.h"
 
 #include <stdlib.h>
-#include <string.h>
 #include <stdatomic.h>
 
 struct gsr_recording_clock {
diff --git a/src/recorder/video_codec.c b/src/recorder/video_codec.c
index 1713e77..a21e4ec 100644
--- a/src/recorder/video_codec.c
+++ b/src/recorder/video_codec.c
@@ -3,7 +3,6 @@
 #include "../../include/log.h"
 
 #include <assert.h>
-#include <math.h>
 
 #include <libavutil/opt.h>
 
diff --git a/src/replay_buffer/replay_buffer.c b/src/replay_buffer/replay_buffer.c
index 56549ee..08ed1f1 100644
--- a/src/replay_buffer/replay_buffer.c
+++ b/src/replay_buffer/replay_buffer.c
@@ -3,8 +3,6 @@
 #include "../../include/replay_buffer/replay_buffer_disk.h"
 
 #include <stdlib.h>
-#include <string.h>
-#include <assert.h>
 
 gsr_replay_buffer* gsr_replay_buffer_create(gsr_replay_storage replay_storage, const char *replay_directory, double replay_buffer_time, size_t replay_buffer_num_packets) {
     gsr_replay_buffer *replay_buffer = NULL;
diff --git a/src/replay_buffer/replay_buffer_disk.c b/src/replay_buffer/replay_buffer_disk.c
index 9a0d247..ffc59cc 100644
--- a/src/replay_buffer/replay_buffer_disk.c
+++ b/src/replay_buffer/replay_buffer_disk.c
@@ -3,7 +3,6 @@
 #include "../../include/utils.h"
 
 #include <stdlib.h>
-#include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/replay_buffer/replay_buffer_ram.c b/src/replay_buffer/replay_buffer_ram.c
index c5df328..5508a12 100644
--- a/src/replay_buffer/replay_buffer_ram.c
+++ b/src/replay_buffer/replay_buffer_ram.c
@@ -2,7 +2,6 @@
 #include "../../include/utils.h"
 
 #include <stdlib.h>
-#include <string.h>
 #include <assert.h>
 
 #include <libavutil/mem.h>
diff --git a/src/shader.c b/src/shader.c
index 17315dc..47e152a 100644
--- a/src/shader.c
+++ b/src/shader.c
@@ -1,7 +1,6 @@
 #include "../include/shader.h"
 #include "../include/log.h"
 #include "../include/egl.h"
-#include <stdio.h>
 #include <assert.h>
 
 static bool print_compile_errors = false;
diff --git a/src/sound.c b/src/sound.c
index a01718b..2d5d4c2 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <time.h>
 #include <assert.h>
 #include <pthread.h>
 
diff --git a/src/window/x11.c b/src/window/x11.c
index b9b6cbf..2ae62c8 100644
--- a/src/window/x11.c
+++ b/src/window/x11.c
@@ -5,7 +5,6 @@
 #include "../../include/defs.h"
 #include "../../include/utils.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>