From 86bff65898178fe6e58e8d02c9b6e588003621bc Mon Sep 17 00:00:00 2001
From: kotontrion <kotontrion@tutanota.de>
Date: Fri, 19 Jul 2024 10:13:44 +0200
Subject: [PATCH] move headers to the correct location

---
 include/astal-wp.h                          | 4 ++++
 include/{ => astal}/wireplumber/audio.h     | 0
 include/{ => astal}/wireplumber/endpoint.h  | 0
 include/{ => astal}/wireplumber/meson.build | 0
 include/{ => astal}/wireplumber/wp.h        | 0
 include/meson.build                         | 8 ++++----
 include/wireplumber.h                       | 4 ----
 src/audio.c                                 | 2 +-
 src/endpoint.c                              | 6 ------
 src/meson.build                             | 2 +-
 src/wireplumber.c                           | 7 ++-----
 11 files changed, 12 insertions(+), 21 deletions(-)
 create mode 100644 include/astal-wp.h
 rename include/{ => astal}/wireplumber/audio.h (100%)
 rename include/{ => astal}/wireplumber/endpoint.h (100%)
 rename include/{ => astal}/wireplumber/meson.build (100%)
 rename include/{ => astal}/wireplumber/wp.h (100%)
 delete mode 100644 include/wireplumber.h

diff --git a/include/astal-wp.h b/include/astal-wp.h
new file mode 100644
index 0000000..6c48211
--- /dev/null
+++ b/include/astal-wp.h
@@ -0,0 +1,4 @@
+
+#include "astal/wireplumber/audio.h"
+#include "astal/wireplumber/endpoint.h"
+#include "astal/wireplumber/wp.h"
diff --git a/include/wireplumber/audio.h b/include/astal/wireplumber/audio.h
similarity index 100%
rename from include/wireplumber/audio.h
rename to include/astal/wireplumber/audio.h
diff --git a/include/wireplumber/endpoint.h b/include/astal/wireplumber/endpoint.h
similarity index 100%
rename from include/wireplumber/endpoint.h
rename to include/astal/wireplumber/endpoint.h
diff --git a/include/wireplumber/meson.build b/include/astal/wireplumber/meson.build
similarity index 100%
rename from include/wireplumber/meson.build
rename to include/astal/wireplumber/meson.build
diff --git a/include/wireplumber/wp.h b/include/astal/wireplumber/wp.h
similarity index 100%
rename from include/wireplumber/wp.h
rename to include/astal/wireplumber/wp.h
diff --git a/include/meson.build b/include/meson.build
index 46fac69..9d32288 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,8 +1,8 @@
-astal_wireplumber_inc = include_directories('.', 'wireplumber')
+astal_wireplumber_inc = include_directories('.', 'astal/wireplumber')
 astal_wireplumber_headers = files(
-    'wireplumber.h',
+    'astal-wp.h',
 )
 
-install_headers(astal_wireplumber_headers, subdir : 'astal')
+install_headers(astal_wireplumber_headers)
 
-subdir('wireplumber')
+subdir('astal/wireplumber')
diff --git a/include/wireplumber.h b/include/wireplumber.h
deleted file mode 100644
index f8799c1..0000000
--- a/include/wireplumber.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "wireplumber/audio.h"
-#include "wireplumber/endpoint.h"
-#include "wireplumber/wp.h"
diff --git a/src/audio.c b/src/audio.c
index 3782b2e..53224a7 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -3,7 +3,7 @@
 #include <wp/wp.h>
 
 #include "endpoint.h"
-#include "wireplumber.h"
+#include "wp.h"
 
 struct _AstalWpAudio {
     GObject parent_instance;
diff --git a/src/endpoint.c b/src/endpoint.c
index 77b3104..7d7a275 100644
--- a/src/endpoint.c
+++ b/src/endpoint.c
@@ -1,12 +1,6 @@
-#include "endpoint.h"
-
-#include <limits.h>
 #include <wp/wp.h>
 
 #include "endpoint-private.h"
-#include "glib-object.h"
-#include "glib.h"
-#include "glibconfig.h"
 #include "wp.h"
 
 struct _AstalWpEndpoint {
diff --git a/src/meson.build b/src/meson.build
index 63415c4..ae56c6f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -46,7 +46,7 @@ if get_option('introspection')
         symbol_prefix : 'astal_wp',
         identifier_prefix : 'AstalWp',
         includes : ['GObject-2.0', 'Gio-2.0'],
-        header : 'astal/wireplumber.h',
+        header : 'astal-wp.h',
         export_packages : pkg_config_name,
         install : true
     )
diff --git a/src/wireplumber.c b/src/wireplumber.c
index 41ba36c..6bf712a 100644
--- a/src/wireplumber.c
+++ b/src/wireplumber.c
@@ -2,9 +2,6 @@
 
 #include "audio.h"
 #include "endpoint-private.h"
-#include "endpoint.h"
-#include "glib-object.h"
-#include "glib.h"
 #include "wp.h"
 
 struct _AstalWpWp {
@@ -315,7 +312,7 @@ static void astal_wp_wp_class_init(AstalWpWpClass *class) {
     astal_wp_wp_properties[ASTAL_WP_WP_PROP_ENDPOINTS] =
         g_param_spec_pointer("endpoints", "endpoints", "endpoints", G_PARAM_READABLE);
     /**
-     * AstalWpAudio:default-speaker:
+     * AstalWpWp:default-speaker:
      *
      * The AstalWndpoint object representing the default speaker
      */
@@ -323,7 +320,7 @@ static void astal_wp_wp_class_init(AstalWpWpClass *class) {
         g_param_spec_object("default-speaker", "default-speaker", "default-speaker",
                             ASTAL_WP_TYPE_ENDPOINT, G_PARAM_READABLE);
     /**
-     * AstalWpAudio:default-microphone:
+     * AstalWpWp:default-microphone:
      *
      * The AstalWndpoint object representing the default speaker
      */